Deleted the indented override method and corrected the variable name and comment.

xterao · xterao · commit c356bb2fa411 · 2025-07-10T11:21:38.000+09:00
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/CommonPathParameter.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/CommonPathParameter.kt
@@ -22,8 +22,7 @@ import org.jetbrains.jps.model.java.JavaResourceRootType
 import org.jetbrains.jps.model.java.JavaSourceRootType
 import java.util.concurrent.ConcurrentHashMap
 
-val RESOURCES_META_INF_PATH: String
-    get() = "META-INF"
+const val RESOURCES_META_INF_PATH: String = "META-INF"
 
 /**
  * A utility for caching directory information on a per-module basis.
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlOtherBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlOtherBlock.kt
@@ -42,13 +42,11 @@ open class SqlOtherBlock(
     override fun setParentGroupBlock(lastGroup: SqlBlock?) {
         super.setParentGroupBlock(lastGroup)
         indent.indentLevel = IndentType.NONE
-        indent.indentLen = createIndentLen()
+        indent.indentLen = 1
         indent.groupIndentLen = 0
     }
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
-    private fun createIndentLen(): Int = 1
-
     override fun isLeaf(): Boolean = true
 }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlWhitespaceBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlWhitespaceBlock.kt
@@ -18,7 +18,6 @@ package org.domaframework.doma.intellij.formatter.block
 import com.intellij.formatting.Alignment
 import com.intellij.formatting.Block
 import com.intellij.formatting.FormattingMode
-import com.intellij.formatting.Indent
 import com.intellij.formatting.Spacing
 import com.intellij.formatting.SpacingBuilder
 import com.intellij.formatting.Wrap
@@ -42,8 +41,6 @@ class SqlWhitespaceBlock(
     ) {
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
-    override fun getIndent(): Indent? = Indent.getNoneIndent()
-
     override fun isLeaf(): Boolean = true
 
     override fun getSpacing(
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlInlineGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlInlineGroupBlock.kt
@@ -15,7 +15,6 @@
  */
 package org.domaframework.doma.intellij.formatter.block.group.keyword
 
-import com.intellij.formatting.Indent
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
@@ -46,13 +45,6 @@ open class SqlInlineGroupBlock(
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
-    override fun getIndent(): Indent? {
-        if (!isAdjustIndentOnEnter() && parentBlock?.indent?.indentLevel == IndentType.SUB) {
-            return Indent.getSpaceIndent(0)
-        }
-        return Indent.getNoneIndent()
-    }
-
     override fun createBlockIndentLen(): Int =
         parentBlock?.let {
             it.indent.groupIndentLen
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlInlineSecondGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlInlineSecondGroupBlock.kt
@@ -15,7 +15,6 @@
  */
 package org.domaframework.doma.intellij.formatter.block.group.keyword
 
-import com.intellij.formatting.Indent
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
@@ -48,13 +47,6 @@ open class SqlInlineSecondGroupBlock(
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
-    override fun getIndent(): Indent? =
-        if (isAdjustIndentOnEnter()) {
-            null
-        } else {
-            Indent.getSpaceIndent(indent.indentLen)
-        }
-
     override fun createBlockIndentLen(): Int =
         parentBlock?.let {
             // TODO:Customize indentation within an inline group
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlJoinGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlJoinGroupBlock.kt
@@ -15,7 +15,6 @@
  */
 package org.domaframework.doma.intellij.formatter.block.group.keyword
 
-import com.intellij.formatting.Indent
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
@@ -47,14 +46,7 @@ open class SqlJoinGroupBlock(
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
-    override fun getIndent(): Indent? =
-        if (isAdjustIndentOnEnter()) {
-            null
-        } else {
-            Indent.getSpaceIndent(indent.indentLen)
-        }
-
-    override fun createBlockIndentLen(preChildBlock: SqlBlock?): Int =
+    override fun createBlockIndentLen(): Int =
         parentBlock
             ?.indent
             ?.groupIndentLen
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlKeywordGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlKeywordGroupBlock.kt
@@ -15,7 +15,6 @@
  */
 package org.domaframework.doma.intellij.formatter.block.group.keyword
 
-import com.intellij.formatting.Indent
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.common.util.TypeUtil
@@ -113,13 +112,6 @@ open class SqlKeywordGroupBlock(
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
-    override fun getIndent(): Indent? {
-        if (!isAdjustIndentOnEnter() && parentBlock?.indent?.indentLevel == IndentType.SUB) {
-            return Indent.getSpaceIndent(0)
-        }
-        return Indent.getNoneIndent()
-    }
-
     /**
      * Adjust the indent position of the subgroup block element itself if it has a comment
      */
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/condition/SqlConditionKeywordGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/condition/SqlConditionKeywordGroupBlock.kt
@@ -22,7 +22,7 @@ import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubGrou
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 
 /**
- * Keywords representing conditions such as AND or OR
+ * Keywords representing conditions such as `AND` or `OR`
  */
 class SqlConditionKeywordGroupBlock(
     node: ASTNode,
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/condition/SqlConditionalExpressionGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/condition/SqlConditionalExpressionGroupBlock.kt
@@ -22,7 +22,7 @@ import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubGrou
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 
 /**
- * A grouped conditional expression following keywords such as AND or OR
+ * A grouped conditional expression following keywords such as `AND` or `OR`
  */
 class SqlConditionalExpressionGroupBlock(
     node: ASTNode,
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/create/SqlCreateKeywordGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/create/SqlCreateKeywordGroupBlock.kt
@@ -15,7 +15,6 @@
  */
 package org.domaframework.doma.intellij.formatter.block.group.keyword.create
 
-import com.intellij.formatting.Indent
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
@@ -45,13 +44,6 @@ open class SqlCreateKeywordGroupBlock(
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
-    override fun getIndent(): Indent? {
-        if (!isAdjustIndentOnEnter() && parentBlock?.indent?.indentLevel == IndentType.SUB) {
-            return Indent.getSpaceIndent(0)
-        }
-        return Indent.getNoneIndent()
-    }
-
     override fun createBlockIndentLen(preChildBlock: SqlBlock?): Int =
         parentBlock?.let {
             if (it.indent.indentLevel == IndentType.SUB) {
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/create/SqlCreateViewGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/create/SqlCreateViewGroupBlock.kt
@@ -15,7 +15,6 @@
  */
 package org.domaframework.doma.intellij.formatter.block.group.keyword.create
 
-import com.intellij.formatting.Indent
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
@@ -47,13 +46,6 @@ open class SqlCreateViewGroupBlock(
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
-    override fun getIndent(): Indent? =
-        if (isAdjustIndentOnEnter()) {
-            null
-        } else {
-            Indent.getSpaceIndent(indent.indentLen)
-        }
-
     override fun createBlockIndentLen(preChildBlock: SqlBlock?): Int = 0
 
     override fun createGroupIndentLen(): Int = getNodeText().length
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/top/SqlTopQueryGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/top/SqlTopQueryGroupBlock.kt
@@ -15,7 +15,6 @@
  */
 package org.domaframework.doma.intellij.formatter.block.group.keyword.top
 
-import com.intellij.formatting.Indent
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.common.util.TypeUtil
@@ -43,13 +42,6 @@ abstract class SqlTopQueryGroupBlock(
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
-    override fun getIndent(): Indent? =
-        if (isAdjustIndentOnEnter()) {
-            Indent.getSpaceIndent(indent.indentLen)
-        } else {
-            null
-        }
-
     override fun createBlockIndentLen(): Int {
         parentBlock?.let { parent ->
             if (parent.indent.indentLevel == IndentType.FILE) return 0
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/update/SqlUpdateSetGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/update/SqlUpdateSetGroupBlock.kt
@@ -15,7 +15,6 @@
  */
 package org.domaframework.doma.intellij.formatter.block.group.keyword.update
 
-import com.intellij.formatting.Indent
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
@@ -50,19 +49,7 @@ open class SqlUpdateSetGroupBlock(
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
-    override fun getIndent(): Indent? =
-        if (isAdjustIndentOnEnter()) {
-            Indent.getSpaceIndent(indent.indentLen)
-        } else {
-            Indent.getNoneIndent()
-        }
-
-    override fun createBlockIndentLen(preChildBlock: SqlBlock?): Int =
-        if (isAdjustIndentOnEnter()) {
-            0
-        } else {
-            parentBlock?.indent?.groupIndentLen?.minus(getNodeText().length) ?: 0
-        }
+    override fun createBlockIndentLen(preChildBlock: SqlBlock?): Int = parentBlock?.indent?.groupIndentLen?.minus(getNodeText().length) ?: 0
 
     override fun isSaveSpace(lastGroup: SqlBlock?): Boolean = true
 }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/with/SqlWithCommonTableGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/with/SqlWithCommonTableGroupBlock.kt
@@ -44,12 +44,12 @@ class SqlWithCommonTableGroupBlock(
 
     private fun getCommonTableName(): SqlBlock? {
         if (getNodeText() == ",") return null
-        val exceptionalTypes =
+        val expectedTypes =
             listOf(
                 SqlBlockCommentBlock::class,
                 SqlWordBlock::class,
             )
-        if (TypeUtil.isExpectedClassType(exceptionalTypes, this)) return this
+        if (TypeUtil.isExpectedClassType(expectedTypes, this)) return this
         return null
     }
 
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/builder/SqlFormattingModelBuilder.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/builder/SqlFormattingModelBuilder.kt
@@ -33,7 +33,7 @@ import org.domaframework.doma.intellij.setting.state.DomaToolsFormatEnableSettin
 /***
  * Because the code formatter (which runs only when explicitly invoked by the user) is enabled by default,
  * the block-generation routine for formatting should always run.
- * Automatic indentation on line breaks, however, is executed only when the corresponding configuration flag is set.
+ * Automatic indentation on Line breaks, however, is executed only when the corresponding configuration flag is set.
  */
 class SqlFormattingModelBuilder : FormattingModelBuilder {
     override fun createModel(formattingContext: FormattingContext): FormattingModel {

Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,11 @@ open class SqlOtherBlock(`
`42`	`42`	`override fun setParentGroupBlock(lastGroup: SqlBlock?) {`
`43`	`43`	`super.setParentGroupBlock(lastGroup)`
`44`	`44`	`indent.indentLevel = IndentType.NONE`
`45`		`- indent.indentLen = createIndentLen()`
	`45`	`+ indent.indentLen = 1`
`46`	`46`	`indent.groupIndentLen = 0`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()`
`50`	`50`
`51`		`- private fun createIndentLen(): Int = 1`
`52`		`-`
`53`	`51`	`override fun isLeaf(): Boolean = true`
`54`	`52`	`}`