Fixed the indent adjustment method for normal comments

xterao · xterao · commit 193f5708dcf0 · 2025-07-18T18:39:10.000+09:00
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlBlock.kt
@@ -24,16 +24,15 @@ import com.intellij.formatting.SpacingBuilder
 import com.intellij.formatting.Wrap
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
-import org.domaframework.doma.intellij.formatter.block.comment.SqlBlockCommentBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlCommentBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlDefaultCommentBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
-import org.domaframework.doma.intellij.formatter.block.comment.SqlLineCommentBlock
 import org.domaframework.doma.intellij.formatter.block.group.SqlNewGroupBlock
 import org.domaframework.doma.intellij.formatter.builder.SqlCustomSpacingBuilder
 import org.domaframework.doma.intellij.formatter.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlKeywordUtil
 import org.domaframework.doma.intellij.psi.SqlTypes
+import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
 open class SqlBlock(
     node: ASTNode,
@@ -69,7 +68,7 @@ open class SqlBlock(
     fun getChildrenTextLen(): Int =
         childBlocks.sumOf { child ->
             val children =
-                child.childBlocks.filter { it !is SqlLineCommentBlock && it !is SqlBlockCommentBlock }
+                child.childBlocks.filter { it !is SqlDefaultCommentBlock }
             if (children.isNotEmpty()) {
                 child
                     .getChildrenTextLen()
@@ -90,7 +89,7 @@ open class SqlBlock(
     ): List<SqlBlock> {
         val children = childBlocks.dropLast(dropIndex)
         if (skipCommentBlock) {
-            return children.filter { it !is SqlLineCommentBlock && it !is SqlBlockCommentBlock }
+            return children.filter { it !is SqlDefaultCommentBlock }
         }
         return children
     }
@@ -132,15 +131,22 @@ open class SqlBlock(
                     (prevBlock.conditionType.isElse() || prevBlock.conditionType.isEnd()) ||
                     parent.childBlocks.dropLast(1).isEmpty()
             }
+            // Checks for non-breaking keyword combinations, ignoring comment blocks
             if (parent is SqlNewGroupBlock) {
                 val prevWord = prevBlocks.lastOrNull { it !is SqlCommentBlock }
                 if (SqlKeywordUtil.isSetLineKeyword(getNodeText(), parent.getNodeText()) ||
                     SqlKeywordUtil.isSetLineKeyword(getNodeText(), prevWord?.getNodeText() ?: "")
                 ) {
                     return false
                 }
+                // Breaks a line if it is a child of itself or preceded by a condition/loop directive
                 return childBlocks.lastOrNull() is SqlElConditionLoopCommentBlock ||
-                    prevBlocks.lastOrNull() is SqlElConditionLoopCommentBlock
+                    (
+                        prevBlocks.lastOrNull() is SqlElConditionLoopCommentBlock &&
+                            prevBlocks
+                                .last()
+                                .node.psi.startOffset > parent.node.psi.startOffset
+                    )
             }
         }
         return false
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlFileBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlFileBlock.kt
@@ -51,7 +51,9 @@ import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubGrou
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubQueryGroupBlock
 import org.domaframework.doma.intellij.formatter.block.other.SqlEscapeBlock
 import org.domaframework.doma.intellij.formatter.block.other.SqlOtherBlock
+import org.domaframework.doma.intellij.formatter.block.word.SqlAliasBlock
 import org.domaframework.doma.intellij.formatter.block.word.SqlFunctionGroupBlock
+import org.domaframework.doma.intellij.formatter.block.word.SqlTableBlock
 import org.domaframework.doma.intellij.formatter.block.word.SqlWordBlock
 import org.domaframework.doma.intellij.formatter.builder.SqlBlockBuilder
 import org.domaframework.doma.intellij.formatter.builder.SqlCustomSpacingBuilder
@@ -314,6 +316,8 @@ class SqlFileBlock(
             return
         }
 
+        if (childBlock is SqlDefaultCommentBlock) return
+
         when (childBlock) {
             is SqlKeywordGroupBlock -> {
                 parentSetProcessor.updateKeywordGroupBlockParentAndAddGroup(
@@ -364,7 +368,7 @@ class SqlFileBlock(
                 )
             }
 
-            is SqlWordBlock, is SqlOtherBlock, is SqlDefaultCommentBlock -> {
+            is SqlWordBlock, is SqlOtherBlock -> {
                 parentSetProcessor.updateGroupBlockParentAndAddGroup(
                     childBlock,
                 )
@@ -546,7 +550,7 @@ class SqlFileBlock(
 
                 is SqlDataTypeParamBlock, is SqlFunctionParamBlock -> return SqlCustomSpacingBuilder.nonSpacing
 
-                else -> return SqlCustomSpacingBuilder.normalSpacing
+                // else -> return SqlCustomSpacingBuilder.normalSpacing
             }
         }
 
@@ -586,6 +590,10 @@ class SqlFileBlock(
             }
         }
 
+        if (childBlock1 is SqlTableBlock || childBlock1 is SqlAliasBlock) {
+            return SqlCustomSpacingBuilder.normalSpacing
+        }
+
         val spacing: Spacing? = customSpacingBuilder?.getCustomSpacing(childBlock1, childBlock2)
         return spacing ?: spacingBuilder.getSpacing(this, childBlock1, childBlock2)
     }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlRightPatternBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlRightPatternBlock.kt
@@ -110,7 +110,7 @@ open class SqlRightPatternBlock(
                     INDENT_EXPECTED_TYPES,
                     parent,
                 ) ||
-                parent.childBlocks.firstOrNull() is SqlValuesGroupBlock
+                parent.childBlocks.any { it is SqlValuesGroupBlock }
             ) {
                 preSpaceRight = true
                 return
@@ -179,7 +179,7 @@ open class SqlRightPatternBlock(
     override fun isSaveSpace(lastGroup: SqlBlock?): Boolean {
         parentBlock?.let { parent ->
             if (isExpectedClassType(NEW_LINE_EXPECTED_TYPES, parent) ||
-                parent.childBlocks.firstOrNull() is SqlValuesGroupBlock
+                parent.childBlocks.any { it is SqlValuesGroupBlock }
             ) {
                 lineBreakAndSpacingType =
                     if (preSpaceRight) {
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/comment/SqlDefaultCommentBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/comment/SqlDefaultCommentBlock.kt
@@ -19,24 +19,42 @@ import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import com.intellij.psi.util.PsiTreeUtil
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
-import org.domaframework.doma.intellij.formatter.block.SqlFileBlock
+import org.domaframework.doma.intellij.formatter.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 
 abstract class SqlDefaultCommentBlock(
     node: ASTNode,
     context: SqlBlockFormattingContext,
 ) : SqlCommentBlock(node, context) {
+    /**
+     * If this block is the last element, the indentation update process is not called,
+     * so set the default indentation to 1.
+     */
+    override val indent =
+        ElementIndent(
+            IndentType.NONE,
+            1,
+            1,
+        )
+
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
     override fun isLeaf(): Boolean = true
 
     /**
-     * When the next element block is determined, update the indent to align it with the element below.
+     * When the next element block is determined,
+     * update the indent to align it with the element below.
      */
-    fun updateIndentLen(baseBlock: SqlBlock) {
+    fun updateIndentLen(
+        baseBlock: SqlBlock,
+        groupBlockCount: Int,
+    ) {
         indent.indentLen =
-            if (parentBlock is SqlFileBlock || isSaveSpace(parentBlock)) {
+            if (isSaveSpace(parentBlock)) {
                 baseBlock.indent.indentLen
+            } else if (groupBlockCount <= 2) {
+                // If it is the top of the file, the indent number should be 0.
+                0
             } else {
                 1
             }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/comment/SqlElConditionLoopCommentBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/comment/SqlElConditionLoopCommentBlock.kt
@@ -25,7 +25,6 @@ import com.intellij.psi.util.elementType
 import org.domaframework.doma.intellij.common.util.TypeUtil
 import org.domaframework.doma.intellij.extension.expr.isConditionOrLoopDirective
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
-import org.domaframework.doma.intellij.formatter.block.SqlKeywordBlock
 import org.domaframework.doma.intellij.formatter.block.SqlOperationBlock
 import org.domaframework.doma.intellij.formatter.block.SqlRightPatternBlock
 import org.domaframework.doma.intellij.formatter.block.SqlUnknownBlock
@@ -204,7 +203,7 @@ class SqlElConditionLoopCommentBlock(
         if (lastGroup is SqlSubGroupBlock) {
             return lastGroup.childBlocks.dropLast(1).isNotEmpty()
         }
-        return lastGroup?.childBlocks?.any { it !is SqlKeywordBlock && it !is SqlKeywordGroupBlock } == true
+        return true
     }
 
     /**
@@ -275,7 +274,7 @@ class SqlElConditionLoopCommentBlock(
         val conditionLoopDirectives: List<SqlElConditionLoopCommentBlock> =
             parent
                 .childBlocks
-                .mapNotNull { it as? SqlElConditionLoopCommentBlock }
+                .filterIsInstance<SqlElConditionLoopCommentBlock>()
                 .filter { it.conditionEnd == null }
         val startDirectives =
             conditionLoopDirectives.count { it.conditionType.isStartDirective() }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlFunctionParamBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlFunctionParamBlock.kt
@@ -17,9 +17,8 @@ package org.domaframework.doma.intellij.formatter.block.group.subgroup
 
 import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
-import org.domaframework.doma.intellij.formatter.block.comment.SqlBlockCommentBlock
+import org.domaframework.doma.intellij.formatter.block.comment.SqlDefaultCommentBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
-import org.domaframework.doma.intellij.formatter.block.comment.SqlLineCommentBlock
 import org.domaframework.doma.intellij.formatter.block.word.SqlFunctionGroupBlock
 import org.domaframework.doma.intellij.formatter.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
@@ -65,9 +64,8 @@ class SqlFunctionParamBlock(
 
             val children =
                 prevChildren?.dropLast(1)?.filter {
-                    it !is SqlLineCommentBlock &&
-                        it !is SqlBlockCommentBlock &&
-                        it.node != SqlTypes.DOT
+                    it !is SqlDefaultCommentBlock
+                    it.node != SqlTypes.DOT
                 }
             children?.let { prevList ->
                 return prevList
@@ -89,8 +87,7 @@ class SqlFunctionParamBlock(
 
         val prevChildrenDropLast =
             prevChildren?.dropLast(1)?.filter {
-                it !is SqlLineCommentBlock &&
-                    it !is SqlBlockCommentBlock &&
+                it !is SqlDefaultCommentBlock &&
                     it.node.elementType != SqlTypes.DOT
             }
                 ?: emptyList()
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlSubGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlSubGroupBlock.kt
@@ -102,8 +102,6 @@ abstract class SqlSubGroupBlock(
 
     override fun isLeaf(): Boolean = true
 
-    open fun endGroup() {}
-
     override fun createBlockIndentLen(): Int {
         parentBlock?.let { parent ->
             if (parent is SqlElConditionLoopCommentBlock) return parent.indent.groupIndentLen
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlSubQueryGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlSubQueryGroupBlock.kt
@@ -18,9 +18,8 @@ package org.domaframework.doma.intellij.formatter.block.group.subgroup
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
-import org.domaframework.doma.intellij.formatter.block.comment.SqlBlockCommentBlock
+import org.domaframework.doma.intellij.formatter.block.comment.SqlDefaultCommentBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
-import org.domaframework.doma.intellij.formatter.block.comment.SqlLineCommentBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlJoinGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.condition.SqlConditionalExpressionGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.top.SqlJoinQueriesGroupBlock
@@ -56,7 +55,7 @@ open class SqlSubQueryGroupBlock(
                 is SqlJoinQueriesGroupBlock -> return parent.indent.indentLen
                 is SqlJoinGroupBlock -> return parent.indent.groupIndentLen.plus(1)
                 else -> {
-                    val children = prevChildren?.filter { it !is SqlLineCommentBlock && it !is SqlBlockCommentBlock }
+                    val children = prevChildren?.filter { it !is SqlDefaultCommentBlock }
                     return children
                         ?.dropLast(1)
                         ?.sumOf { prev ->
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/word/SqlFunctionGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/word/SqlFunctionGroupBlock.kt
@@ -17,8 +17,7 @@ package org.domaframework.doma.intellij.formatter.block.word
 
 import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
-import org.domaframework.doma.intellij.formatter.block.comment.SqlBlockCommentBlock
-import org.domaframework.doma.intellij.formatter.block.comment.SqlLineCommentBlock
+import org.domaframework.doma.intellij.formatter.block.comment.SqlDefaultCommentBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlFunctionParamBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubGroupBlock
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
@@ -40,7 +39,7 @@ class SqlFunctionGroupBlock(
 
     override fun createBlockIndentLen(): Int {
         parentBlock?.let { parent ->
-            val children = prevChildren.dropLast(1).filter { it !is SqlLineCommentBlock && it !is SqlBlockCommentBlock }
+            val children = prevChildren.dropLast(1).filter { it !is SqlDefaultCommentBlock }
             val prevBlocksLength =
                 children
                     .sumOf { prev ->
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/builder/SqlBlockBuilder.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/builder/SqlBlockBuilder.kt
@@ -17,18 +17,15 @@ package org.domaframework.doma.intellij.formatter.builder
 
 import org.domaframework.doma.intellij.common.util.TypeUtil.isExpectedClassType
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
-import org.domaframework.doma.intellij.formatter.block.comment.SqlBlockCommentBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlDefaultCommentBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
-import org.domaframework.doma.intellij.formatter.block.comment.SqlLineCommentBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubGroupBlock
 
 open class SqlBlockBuilder {
     private val updateDirectiveParentTypes =
         listOf(
-            SqlLineCommentBlock::class,
-            SqlBlockCommentBlock::class,
+            SqlDefaultCommentBlock::class,
         )
 
     private val originalConditionLoopDirectiveParentType =
@@ -58,11 +55,14 @@ open class SqlBlockBuilder {
      * but the indentation is aligned with the next block.
      */
     fun updateCommentBlockIndent(nextBlock: SqlBlock) {
-        if (commentBlocks.isNotEmpty()) {
+        if (commentBlocks.isNotEmpty() &&
+            nextBlock.parentBlock != null ||
+            groupTopNodeIndexHistory.size <= 2
+        ) {
             var index = 0
             commentBlocks
                 .forEach { block ->
-                    block.updateIndentLen(nextBlock)
+                    block.updateIndentLen(nextBlock, groupTopNodeIndexHistory.size)
                     index++
                 }
             commentBlocks.clear()
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/processor/SqlSetParentGroupProcessor.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/processor/SqlSetParentGroupProcessor.kt
@@ -19,6 +19,7 @@ import org.domaframework.doma.intellij.common.util.TypeUtil.isExpectedClassType
 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.SqlDefaultCommentBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
 import org.domaframework.doma.intellij.formatter.block.conflict.SqlDoGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnDefinitionRawGroupBlock
@@ -426,10 +427,6 @@ class SqlSetParentGroupProcessor(
                 return@setParentGroups history[paramIndex]
             }
 
-            if (childBlock.parentBlock is SqlSubGroupBlock) {
-                (childBlock.parentBlock as SqlSubGroupBlock).endGroup()
-            }
-
             if (blockBuilder.getGroupTopNodeIndexHistory()[paramIndex] is SqlWithQuerySubGroupBlock) {
                 val withCommonBlockIndex =
                     blockBuilder.getGroupTopNodeIndex { block ->
@@ -475,6 +472,8 @@ class SqlSetParentGroupProcessor(
 
         val targetChildBlock = context.childBlock
 
+        if (targetChildBlock is SqlDefaultCommentBlock) return
+
         // The parent block for SqlElConditionLoopCommentBlock will be set later
         if (targetChildBlock is SqlElConditionLoopCommentBlock && targetChildBlock.conditionType.isStartDirective()) {
             targetChildBlock.tempParentBlock = parentGroup
@@ -492,9 +491,9 @@ class SqlSetParentGroupProcessor(
             )
         ) {
             context.blockBuilder.addGroupTopNodeIndexHistory(targetChildBlock)
-            context.blockBuilder.updateCommentBlockIndent(targetChildBlock)
         }
 
+        context.blockBuilder.updateCommentBlockIndent(targetChildBlock)
         // Set parent-child relationship and indent for preceding comment at beginning of block group
         context.blockBuilder.updateConditionLoopBlockIndent(targetChildBlock)
     }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/util/CommaRawUtil.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/util/CommaRawUtil.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright Doma Tools Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.domaframework.doma.intellij.formatter.util
 
 import com.intellij.lang.ASTNode

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,9 @@ import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubGrou`
`51`	`51`	`import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubQueryGroupBlock`
`52`	`52`	`import org.domaframework.doma.intellij.formatter.block.other.SqlEscapeBlock`
`53`	`53`	`import org.domaframework.doma.intellij.formatter.block.other.SqlOtherBlock`
	`54`	`+import org.domaframework.doma.intellij.formatter.block.word.SqlAliasBlock`
`54`	`55`	`import org.domaframework.doma.intellij.formatter.block.word.SqlFunctionGroupBlock`
	`56`	`+import org.domaframework.doma.intellij.formatter.block.word.SqlTableBlock`
`55`	`57`	`import org.domaframework.doma.intellij.formatter.block.word.SqlWordBlock`
`56`	`58`	`import org.domaframework.doma.intellij.formatter.builder.SqlBlockBuilder`
`57`	`59`	`import org.domaframework.doma.intellij.formatter.builder.SqlCustomSpacingBuilder`
`@@ -314,6 +316,8 @@ class SqlFileBlock(`
`314`	`316`	`return`
`315`	`317`	`}`
`316`	`318`
	`319`	`+ if (childBlock is SqlDefaultCommentBlock) return`
	`320`	`+`
`317`	`321`	`when (childBlock) {`
`318`	`322`	`is SqlKeywordGroupBlock -> {`
`319`	`323`	`parentSetProcessor.updateKeywordGroupBlockParentAndAddGroup(`
`@@ -364,7 +368,7 @@ class SqlFileBlock(`
`364`	`368`	`)`
`365`	`369`	`}`
`366`	`370`
`367`		`- is SqlWordBlock, is SqlOtherBlock, is SqlDefaultCommentBlock -> {`
	`371`	`+ is SqlWordBlock, is SqlOtherBlock -> {`
`368`	`372`	`parentSetProcessor.updateGroupBlockParentAndAddGroup(`
`369`	`373`	`childBlock,`
`370`	`374`	`)`
`@@ -546,7 +550,7 @@ class SqlFileBlock(`
`546`	`550`
`547`	`551`	`is SqlDataTypeParamBlock, is SqlFunctionParamBlock -> return SqlCustomSpacingBuilder.nonSpacing`
`548`	`552`
`549`		`- else -> return SqlCustomSpacingBuilder.normalSpacing`
	`553`	`+ // else -> return SqlCustomSpacingBuilder.normalSpacing`
`550`	`554`	`}`
`551`	`555`	`}`
`552`	`556`
`@@ -586,6 +590,10 @@ class SqlFileBlock(`
`586`	`590`	`}`
`587`	`591`	`}`
`588`	`592`
	`593`	`+ if (childBlock1 is SqlTableBlock \|\| childBlock1 is SqlAliasBlock) {`
	`594`	`+ return SqlCustomSpacingBuilder.normalSpacing`
	`595`	`+ }`
	`596`	`+`
`589`	`597`	`val spacing: Spacing? = customSpacingBuilder?.getCustomSpacing(childBlock1, childBlock2)`
`590`	`598`	`return spacing ?: spacingBuilder.getSpacing(this, childBlock1, childBlock2)`
`591`	`599`	`}`