Remove duplicate conditions

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/expr/SqlElParametersBlock.kt

@@ -71,7 +71,7 @@ class SqlElParametersBlock(
             return when (childBlock1) {
                 is SqlElSymbolBlock -> SqlCustomSpacingBuilder.nonSpacing
                 is SqlElCommaBlock -> SqlCustomSpacingBuilder.normalSpacing
-                else -> return SqlCustomSpacingBuilder.normalSpacing
+                else -> return SqlCustomSpacingBuilder.nonSpacing
             }
         }
 

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/expr/SqlElPrimaryBlock.kt

@@ -19,6 +19,7 @@ import com.intellij.formatting.Block
 import com.intellij.formatting.Spacing
 import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
+import org.domaframework.doma.intellij.formatter.block.SqlLiteralBlock
 import org.domaframework.doma.intellij.formatter.block.SqlUnknownBlock
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 import org.domaframework.doma.intellij.psi.SqlTypes
@@ -41,8 +42,8 @@ class SqlElPrimaryBlock(
             SqlTypes.COMMA ->
                 SqlElCommaBlock(child, context)
 
-            SqlTypes.EL_PRIMARY_EXPR, SqlTypes.EL_NUMBER, SqlTypes.EL_STRING, SqlTypes.BOOLEAN, SqlTypes.EL_NULL ->
-                SqlElPrimaryBlock(child, context)
+            SqlTypes.EL_NUMBER, SqlTypes.EL_STRING, SqlTypes.BOOLEAN, SqlTypes.EL_NULL ->
+                SqlLiteralBlock(child, context)
 
             else -> SqlUnknownBlock(child, context)
         }

src/test/testData/sql/formatter/StaticFieldAccess.sql

@@ -2,4 +2,4 @@ SELECT *
 FROM configurations
 WHERE
 config_key = /*@ com.example.Constants @CONFIG_KEY */'system.timeout'
-  AND value = /*@ com.example.Utils @ util. getDefaultValue (0) */'30'
+  AND value = /*@ com.example.Utils @ util. getDefaultValue (0 , "x") */'30'

src/test/testData/sql/formatter/StaticFieldAccess_format.sql

@@ -1,4 +1,4 @@
 SELECT *
   FROM configurations
  WHERE config_key = /* @com.example.Constants@CONFIG_KEY */'system.timeout'
-   AND value = /* @[email protected](0) */'30'
+   AND value = /* @[email protected](0, "x") */'30'