Fix SQL formatting logic for parameter blocks and update static field access handling

Author: xterao

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

@@ -63,14 +63,16 @@ class SqlElParametersBlock(
         val childBlock1 = child1 as? SqlBlock
         val childBlock2 = child2 as? SqlBlock
 
-        if (childBlock1 == null) return SqlCustomSpacingBuilder.nonSpacing
+        if (childBlock1 == null || childBlock1.node.elementType == SqlTypes.LEFT_PAREN) {
+            return SqlCustomSpacingBuilder.nonSpacing
+        }
         if (childBlock2 != null) {
             if (childBlock2.node.elementType == SqlTypes.RIGHT_PAREN) {
                 return SqlCustomSpacingBuilder.nonSpacing
             }
             return when (childBlock1) {
-                is SqlElSymbolBlock -> SqlCustomSpacingBuilder.nonSpacing
                 is SqlElCommaBlock -> SqlCustomSpacingBuilder.normalSpacing
+                is SqlElSymbolBlock -> SqlCustomSpacingBuilder.nonSpacing
                 else -> SqlCustomSpacingBuilder.nonSpacing
             }
         }

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

@@ -22,7 +22,6 @@ import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.util.PsiTreeUtil
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
 import org.domaframework.doma.intellij.formatter.block.SqlUnknownBlock
-import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlParallelListBlock
 import org.domaframework.doma.intellij.formatter.builder.SqlCustomSpacingBuilder
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 import org.domaframework.doma.intellij.psi.SqlElClass
@@ -56,7 +55,7 @@ class SqlElStaticFieldAccessBlock(
                 SqlElIdentifierBlock(child, context)
 
             SqlTypes.EL_PARAMETERS ->
-                SqlParallelListBlock(child, context)
+                SqlElParametersBlock(child, context)
 
             else -> SqlUnknownBlock(child, context)
         }

src/test/testData/sql/formatter/Select.sql

@@ -26,7 +26,7 @@ AS nearest
           WHERE p.TYPE = 'Star'
              -- Line3
              OR ( p.flags & FPHOTOFLAGS('EDGE') = 0 AND (p.psfmag_g - p.extinction_g) BETWEEN 15 AND 20)
-            /*%if status == 2 */
+            /*%if status == 2 && employee.employeeParams(1,null, true ,"A") */
             -- Line4
             and u.propermotion > 2.0
             /** And  Group */

src/test/testData/sql/formatter/Select_format.sql

@@ -30,7 +30,7 @@ SELECT COUNT(DISTINCT x) AS count_x
              -- Line3
              OR (p.flags & FPHOTOFLAGS('EDGE') = 0
                  AND (p.psfmag_g - p.extinction_g) BETWEEN 15 AND 20)
-            /*%if status == 2 */
+            /*%if status == 2 && employee.employeeParams(1, null, true, "A") */
             -- Line4
             AND u.propermotion > 2.0
             /** And  Group */

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 , "x") */'30'
+  AND value = /*@ com.example.Utils @ util. getDefaultValue (0,null,true , "0") */'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, "x") */'30'
+   AND value = /* @[email protected](0, null, true, "0") */'30'