Refactor properties and method parameters.

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/common/util/TypeUtil.kt

@@ -102,7 +102,7 @@ object TypeUtil {
      */
     fun isExpectedClassType(
         expectedClasses: List<KClass<*>>,
-        childBlock: SqlBlock,
+        childBlock: SqlBlock?,
     ): Boolean =
         expectedClasses.any { clazz ->
             clazz.isInstance(childBlock)

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.domaframework.doma.intellij.formatter.block.group.column
+package org.domaframework.doma.intellij.formatter.block
 
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock

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

@@ -39,8 +39,6 @@ open class SqlOtherBlock(
             0,
         )
 
-    override val isNeedWhiteSpace: Boolean = false
-
     override fun setParentGroupBlock(lastGroup: SqlBlock?) {
         super.setParentGroupBlock(lastGroup)
         indent.indentLevel = IndentType.NONE

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

@@ -28,8 +28,6 @@ class SqlTableBlock(
         node,
         context,
     ) {
-    override val isNeedWhiteSpace = false
-
     override fun setParentGroupBlock(lastGroup: SqlBlock?) {
         super.setParentGroupBlock(lastGroup)
     }

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

@@ -34,7 +34,7 @@ abstract class SqlExprBlock(
         context.formatMode,
     ) {
     override fun getSpacing(
-        p0: Block?,
-        p1: Block,
+        child1: Block?,
+        child2: Block,
     ): Spacing? = null
 }

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

@@ -75,9 +75,9 @@ open class SqlKeywordGroupBlock(
 
     open fun getBaseIndentLen(
         preChildBlock: SqlBlock?,
-        block: SqlBlock?,
+        lastGroup: SqlBlock?,
     ): Int {
-        if (block == null) {
+        if (lastGroup == null) {
             return createBlockIndentLen(preChildBlock)
         }
         if (preChildBlock == null) return createBlockIndentLen(preChildBlock)
@@ -130,17 +130,16 @@ open class SqlKeywordGroupBlock(
     open fun createBlockIndentLen(preChildBlock: SqlBlock?): Int {
         when (indentLevel) {
             IndentType.TOP -> {
-                parentBlock?.let {
-                    val groupLen = it.indent.groupIndentLen
+                parentBlock?.let { parent ->
                     if (SqlKeywordUtil.isSetLineKeyword(getNodeText(), preChildBlock?.getNodeText() ?: "")) {
                         val prevBlockIndent = preChildBlock?.indent?.indentLen ?: 0
                         val prevBlockLen = preChildBlock?.getNodeText()?.length ?: 0
                         return prevBlockIndent.plus(prevBlockLen).plus(1)
                     }
-                    return if (it.indent.indentLevel == IndentType.FILE) {
+                    return if (parent.indent.indentLevel == IndentType.FILE) {
                         0
                     } else {
-                        groupLen
+                        parent.indent.groupIndentLen
                     }
                 } ?: return 0
             }

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

@@ -79,8 +79,8 @@ abstract class SqlSubGroupBlock(
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
     override fun getSpacing(
-        p0: Block?,
-        p1: Block,
+        child1: Block?,
+        child2: Block,
     ): Spacing? = null
 
     override fun isLeaf(): Boolean = true

src/main/kotlin/org/domaframework/doma/intellij/formatter/builder/SqlCustomSpacingBuilder.kt

@@ -20,6 +20,7 @@ import com.intellij.formatting.Block
 import com.intellij.formatting.Spacing
 import com.intellij.psi.tree.IElementType
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
+import org.domaframework.doma.intellij.formatter.block.SqlRightPatternBlock
 import org.domaframework.doma.intellij.formatter.block.SqlWhitespaceBlock
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnBlock
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnDefinitionRawGroupBlock
@@ -29,7 +30,6 @@ import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlU
 import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlUpdateValueGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlDataTypeParamBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlParallelListBlock
-import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlRightPatternBlock
 
 class SqlCustomSpacingBuilder {
     companion object {

src/main/kotlin/org/domaframework/doma/intellij/formatter/processor/SqlSetParentGroupProcessor.kt

@@ -96,31 +96,79 @@ class SqlSetParentGroupProcessor(
                 blockBuilder,
             )
 
+        val currentIndentLevel = childBlock.indent.indentLevel
+        if (currentIndentLevel == IndentType.TOP) {
+            var parentBlock: SqlBlock? = null
+            val exceptionalTypes =
+                listOf(
+                    SqlSubGroupBlock::class,
+                    SqlCreateViewGroupBlock::class,
+                )
+            if (isExpectedClassType(exceptionalTypes, lastGroupBlock)) {
+                parentBlock = lastGroupBlock
+            } else {
+                when (childBlock) {
+                    is SqlUpdateQueryGroupBlock -> {
+                        UpdateClauseUtil
+                            .getParentGroupBlock(blockBuilder, childBlock)
+                            ?.let { parentBlock = it }
+                    }
+
+                    else -> {
+                        val topKeywordIndex =
+                            blockBuilder.getGroupTopNodeIndex { block ->
+                                block.indent.indentLevel == IndentType.TOP
+                            }
+                        val subGroupIndex =
+                            blockBuilder.getGroupTopNodeIndex { block ->
+                                block is SqlSubGroupBlock
+                            }
+
+                        var deleteIndex = topKeywordIndex
+                        if (topKeywordIndex >= 0 && subGroupIndex < 0) {
+                            val copyParentBlock =
+                                blockBuilder.getGroupTopNodeIndexHistory()[topKeywordIndex]
+                            parentBlock = copyParentBlock.parentBlock
+                        } else if (topKeywordIndex > subGroupIndex) {
+                            val copyParentBlock =
+                                blockBuilder.getGroupTopNodeIndexHistory()[subGroupIndex]
+                            parentBlock = copyParentBlock
+                        }
+                        if (deleteIndex >= 0) {
+                            blockBuilder.clearSubListGroupTopNodeIndexHistory(deleteIndex)
+                        }
+                    }
+                }
+            }
+            setParentGroups(context) { history ->
+                return@setParentGroups parentBlock
+            }
+            return
+        }
+
         if (lastGroupBlock.indent.indentLevel == IndentType.SUB) {
             setParentGroups(context) { history ->
                 return@setParentGroups lastGroupBlock
             }
-        } else if (lastIndentLevel == childBlock.indent.indentLevel) {
+        } else if (lastIndentLevel == currentIndentLevel) {
             blockBuilder.removeLastGroupTopNodeIndexHistory()
             updateGroupBlockLastGroupParentAddGroup(
                 lastGroupBlock,
                 childBlock,
             )
-        } else if (lastIndentLevel < childBlock.indent.indentLevel) {
+        } else if (lastIndentLevel < currentIndentLevel) {
+            updateGroupBlockParentAndAddGroup(
+                childBlock,
+            )
+        } else if (lastIndentLevel == IndentType.JOIN &&
+            SqlKeywordUtil.isSecondOptionKeyword(childBlock.getNodeText())
+        ) {
+            // left,right < inner,outer < join
             updateGroupBlockParentAndAddGroup(
                 childBlock,
             )
+            return
         } else {
-            if (lastIndentLevel == IndentType.JOIN &&
-                SqlKeywordUtil.Companion.isSecondOptionKeyword(childBlock.getNodeText())
-            ) {
-                // left,right < inner,outer < join
-                updateGroupBlockParentAndAddGroup(
-                    childBlock,
-                )
-                return
-            }
-
             setParentGroups(context) { history ->
                 return@setParentGroups history
                     .lastOrNull { it.indent.indentLevel < childBlock.indent.indentLevel }
@@ -152,7 +200,11 @@ class SqlSetParentGroupProcessor(
         lastGroupBlock: SqlBlock,
         childBlock: SqlColumnRawGroupBlock,
     ) {
-        if (lastGroupBlock is SqlColumnRawGroupBlock) {
+        val exceptionTypes =
+            listOf(
+                SqlColumnRawGroupBlock::class,
+            )
+        if (isExpectedClassType(exceptionTypes, lastGroupBlock)) {
             blockBuilder.removeLastGroupTopNodeIndexHistory()
         }
         updateGroupBlockParentAndAddGroup(childBlock)
@@ -200,7 +252,12 @@ class SqlSetParentGroupProcessor(
         lastGroupBlock: SqlBlock,
         childBlock: SqlElConditionLoopCommentBlock,
     ) {
-        if (lastGroupBlock is SqlCommaBlock || lastGroupBlock is SqlElConditionLoopCommentBlock) {
+        val exceptionalTypes =
+            listOf(
+                SqlCommaBlock::class,
+                SqlElConditionLoopCommentBlock::class,
+            )
+        if (isExpectedClassType(exceptionalTypes, lastGroupBlock)) {
             blockBuilder.removeLastGroupTopNodeIndexHistory()
         }
         setParentGroups(
@@ -251,7 +308,7 @@ class SqlSetParentGroupProcessor(
         val parentGroup =
             getParentGroup(context.blockBuilder.getGroupTopNodeIndexHistory() as MutableList<SqlBlock>)
 
-        // // The parent block for SqlElConditionLoopCommentBlock will be set later
+        // The parent block for SqlElConditionLoopCommentBlock will be set later
         if (context.childBlock !is SqlElConditionLoopCommentBlock ||
             context.childBlock.conditionType.isEnd()
         ) {

src/main/kotlin/org/domaframework/doma/intellij/formatter/util/InsertClauseUtil.kt

@@ -17,7 +17,7 @@ package org.domaframework.doma.intellij.formatter.util
 
 import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
-import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlValuesGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.insert.SqlInsertColumnGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.insert.SqlInsertQueryGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.insert.SqlInsertValueGroupBlock
@@ -32,7 +32,7 @@ object InsertClauseUtil {
         if (lastGroup is SqlInsertQueryGroupBlock) {
             return SqlInsertColumnGroupBlock(child, sqlBlockFormattingCtx)
         }
-        if (lastGroup is SqlKeywordGroupBlock && lastGroup.getNodeText() == "values") {
+        if (lastGroup is SqlValuesGroupBlock) {
             return SqlInsertValueGroupBlock(child, sqlBlockFormattingCtx)
         }
         return null