Enhance the implementation of spacing rules within field blocks.

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/comment/SqlElBlockCommentBlock.kt

@@ -106,7 +106,6 @@ open class SqlElBlockCommentBlock(
                 SqlElFieldAccessBlock(
                     child,
                     context,
-                    createFieldAccessSpacingBuilder(),
                 )
 
             SqlTypes.BLOCK_COMMENT_START -> SqlCommentStartBlock(child, context)
@@ -131,26 +130,6 @@ open class SqlElBlockCommentBlock(
             else -> SqlUnknownBlock(child, context)
         }
 
-    private fun createFieldAccessSpacingBuilder(): SqlCustomSpacingBuilder =
-        SqlCustomSpacingBuilder()
-            .withSpacing(
-                SqlTypes.EL_PRIMARY_EXPR,
-                SqlTypes.DOT,
-                Spacing.createSpacing(0, 0, 0, false, 0),
-            ).withSpacing(
-                SqlTypes.DOT,
-                SqlTypes.EL_IDENTIFIER,
-                Spacing.createSpacing(0, 0, 0, false, 0),
-            ).withSpacing(
-                SqlTypes.EL_IDENTIFIER,
-                SqlTypes.DOT,
-                Spacing.createSpacing(0, 0, 0, false, 0),
-            ).withSpacing(
-                SqlTypes.EL_IDENTIFIER,
-                SqlTypes.EL_PARAMETERS,
-                Spacing.createSpacing(0, 0, 0, false, 0),
-            )
-
     protected fun createBlockCommentSpacingBuilder(): SqlCustomSpacingBuilder =
         SqlCustomSpacingBuilder()
             .withSpacing(

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/comment/SqlElConditionLoopCommentBlock.kt

@@ -168,7 +168,6 @@ class SqlElConditionLoopCommentBlock(
                 SqlElFieldAccessBlock(
                     child,
                     context,
-                    createFieldAccessSpacingBuilder(),
                 )
 
             SqlTypes.EL_STATIC_FIELD_ACCESS_EXPR ->
@@ -186,26 +185,6 @@ class SqlElConditionLoopCommentBlock(
             else -> SqlUnknownBlock(child, context)
         }
 
-    private fun createFieldAccessSpacingBuilder(): SqlCustomSpacingBuilder =
-        SqlCustomSpacingBuilder()
-            .withSpacing(
-                SqlTypes.EL_PRIMARY_EXPR,
-                SqlTypes.DOT,
-                Spacing.createSpacing(0, 0, 0, false, 0),
-            ).withSpacing(
-                SqlTypes.DOT,
-                SqlTypes.EL_IDENTIFIER,
-                Spacing.createSpacing(0, 0, 0, false, 0),
-            ).withSpacing(
-                SqlTypes.EL_IDENTIFIER,
-                SqlTypes.DOT,
-                Spacing.createSpacing(0, 0, 0, false, 0),
-            ).withSpacing(
-                SqlTypes.EL_IDENTIFIER,
-                SqlTypes.EL_PARAMETERS,
-                Spacing.createSpacing(0, 0, 0, false, 0),
-            )
-
     override fun getSpacing(
         child1: Block?,
         child2: Block,

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

@@ -21,14 +21,14 @@ import com.intellij.lang.ASTNode
 import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
+import org.domaframework.doma.intellij.formatter.block.SqlUnknownBlock
 import org.domaframework.doma.intellij.formatter.builder.SqlCustomSpacingBuilder
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 import org.domaframework.doma.intellij.psi.SqlTypes
 
 class SqlElFieldAccessBlock(
     node: ASTNode,
     private val context: SqlBlockFormattingContext,
-    private val customSpacingBuilder: SqlCustomSpacingBuilder?,
 ) : SqlExprBlock(
         node,
         context,
@@ -48,6 +48,8 @@ class SqlElFieldAccessBlock(
 
     override fun getBlock(child: ASTNode): SqlBlock =
         when (child.elementType) {
+            SqlTypes.EL_IDENTIFIER, SqlTypes.EL_ID_EXPR -> SqlElIdentifierBlock(child, context)
+
             SqlTypes.EL_PRIMARY_EXPR -> {
                 SqlElPrimaryBlock(child, context)
             }
@@ -62,20 +64,13 @@ class SqlElFieldAccessBlock(
                 SqlElParametersBlock(child, context)
 
             else ->
-                SqlBlock(
-                    child,
-                    context.wrap,
-                    context.alignment,
-                    context.spacingBuilder,
-                    context.enableFormat,
-                    context.formatMode,
-                )
+                SqlUnknownBlock(child, context)
         }
 
     override fun getSpacing(
         child1: Block?,
         child2: Block,
-    ): Spacing? = customSpacingBuilder?.getCustomSpacing(child1, child2) ?: spacingBuilder.getSpacing(this, child1, child2)
+    ): Spacing? = SqlCustomSpacingBuilder.nonSpacing
 
     override fun isLeaf(): Boolean = false
 }

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

@@ -15,12 +15,14 @@
  */
 package org.domaframework.doma.intellij.formatter.block.expr
 
+import com.intellij.formatting.Block
 import com.intellij.formatting.Spacing
 import com.intellij.lang.ASTNode
 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
@@ -50,12 +52,20 @@ class SqlElStaticFieldAccessBlock(
             SqlTypes.EL_CLASS ->
                 SqlElClassBlock(child, context, null)
 
-            SqlTypes.EL_IDENTIFIER ->
+            SqlTypes.EL_IDENTIFIER, SqlTypes.EL_ID_EXPR, SqlTypes.EL_PRIMARY_EXPR ->
                 SqlElIdentifierBlock(child, context)
 
+            SqlTypes.EL_PARAMETERS ->
+                SqlParallelListBlock(child, context)
+
             else -> SqlUnknownBlock(child, context)
         }
 
+    override fun getSpacing(
+        child1: Block?,
+        child2: Block,
+    ): Spacing? = SqlCustomSpacingBuilder.nonSpacing
+
     override fun createSpacingBuilder(): SqlCustomSpacingBuilder =
         SqlCustomSpacingBuilder()
             .withSpacing(

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

@@ -18,6 +18,8 @@ package org.domaframework.doma.intellij.formatter.block.expr
 import com.intellij.formatting.Block
 import com.intellij.formatting.Spacing
 import com.intellij.lang.ASTNode
+import com.intellij.psi.PsiWhiteSpace
+import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 
@@ -32,6 +34,19 @@ abstract class SqlExprBlock(
         context.enableFormat,
         context.formatMode,
     ) {
+    override fun buildChildren(): MutableList<AbstractBlock> {
+        val blocks = mutableListOf<AbstractBlock>()
+        var child = node.firstChildNode
+        while (child != null) {
+            if (child !is PsiWhiteSpace) {
+                val block = getBlock(child)
+                blocks.add(block)
+            }
+            child = child.treeNext
+        }
+        return blocks
+    }
+
     override fun getSpacing(
         child1: Block?,
         child2: Block,

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/update/SqlUpdateValueGroupBlock.kt

@@ -32,7 +32,7 @@ class SqlUpdateValueGroupBlock(
         node,
         context,
     ) {
-    // TODO:Customize indentation
+    // TODO Customize indentation
     override val offset = 2
 
     override fun setParentGroupBlock(lastGroup: SqlBlock?) {

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlSubGroupBlock.kt

@@ -21,6 +21,7 @@ import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.common.util.TypeUtil
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
+import org.domaframework.doma.intellij.formatter.block.SqlKeywordBlock
 import org.domaframework.doma.intellij.formatter.block.SqlRightPatternBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlCommentBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlSubQueryGroupBlock.kt

@@ -56,15 +56,21 @@ open class SqlSubQueryGroupBlock(
                 is SqlJoinGroupBlock -> return parent.indent.groupIndentLen.plus(1)
                 else -> {
                     val children = prevChildren?.filter { it !is SqlDefaultCommentBlock }
-                    return children
-                        ?.dropLast(1)
-                        ?.sumOf { prev ->
+                    // Retrieve the list of child blocks excluding the conditional directive that appears immediately before this block,
+                    // as it is already included as a child block.
+                    val sumChildren =
+                        if (children?.firstOrNull() is SqlElConditionLoopCommentBlock) {
+                            children.drop(1).dropLast(1)
+                        } else {
+                            children?.dropLast(1) ?: emptyList()
+                        }
+                    return sumChildren
+                        .sumOf { prev ->
                             prev
                                 .getChildrenTextLen()
                                 .plus(prev.getNodeText().length.plus(1))
-                        }?.plus(parent.indent.groupIndentLen)
-                        ?.plus(1)
-                        ?: offset
+                        }.plus(parent.indent.groupIndentLen)
+                        .plus(1)
                 }
             }
         } ?: offset