Remove unused methods and improve code readability in SQL-related classes

Author: xterao

src/main/java/org/domaframework/doma/intellij/psi/SqlElCommentExprImpl.java

@@ -41,11 +41,6 @@ public SqlElCommentExprImpl(@NotNull ASTNode node) {
     super(node);
   }
 
-  @Override
-  public @NotNull ASTNode getNode() {
-    return super.getNode();
-  }
-
   @Override
   public @NotNull IElementType getTokenType() {
     return getNode().getElementType();

src/main/kotlin/org/domaframework/doma/intellij/action/sql/BindVariableElement.kt

@@ -60,26 +60,21 @@ class CommonPathParameter(
             entry.sourceFolders.map { folder ->
                 val file = folder.file
                 if (file != null) {
-                    println("file:${file.name}")
                     when (folder.rootType) {
                         JavaSourceRootType.SOURCE -> {
                             moduleSourceDirectories.add(file)
-                            println("moduleSourceDirectory:$file")
                         }
 
                         JavaSourceRootType.TEST_SOURCE -> {
                             moduleTestSourceDirectories.add(file)
-                            println("moduleTestSourceDirectory:$file")
                         }
 
                         JavaResourceRootType.RESOURCE -> {
                             moduleResourceDirectories.add(file)
-                            println("moduleResourceDirectory:$file")
                         }
 
                         JavaResourceRootType.TEST_RESOURCE -> {
                             moduleTestResourceDirectories.add(file)
-                            println("moduleTestResourceDirectory:$file")
                         }
                     }
                 }

src/main/kotlin/org/domaframework/doma/intellij/common/CommonPathParameter.kt

@@ -67,15 +67,6 @@ class PsiParentClass(
                 m.hasModifierProperty(PsiModifier.PUBLIC)
         }
 
-    fun findStaticField(fieldName: String): PsiField? =
-        fields
-            ?.filter { f ->
-                f.hasModifierProperty(PsiModifier.STATIC) &&
-                    PropertyModifyUtil.filterPrivateField(f, type)
-            }?.firstOrNull { f ->
-                f.name == fieldName
-            }
-
     fun searchStaticField(fieldName: String): List<PsiField>? =
         fields
             ?.filter { f ->
@@ -84,15 +75,6 @@ class PsiParentClass(
                     PropertyModifyUtil.filterPrivateField(f, type)
             }
 
-    fun findStaticMethod(methodName: String): PsiMethod? =
-        methods
-            ?.filter { m ->
-                m.hasModifierProperty(PsiModifier.STATIC) &&
-                    m.hasModifierProperty(PsiModifier.PUBLIC)
-            }?.firstOrNull { m ->
-                m.name == methodName
-            }
-
     fun searchStaticMethod(methodName: String): List<PsiMethod>? =
         methods?.filter { m ->
             m.hasModifierProperty(PsiModifier.STATIC) &&

src/main/kotlin/org/domaframework/doma/intellij/common/psi/PsiParentClass.kt

@@ -22,18 +22,6 @@ import com.intellij.psi.search.GlobalSearchScope
 
 class PsiClassTypeUtil {
     companion object {
-        fun getPsiTypeByList(
-            classType: PsiClassType,
-            project: Project,
-            useListParam: Boolean,
-        ): PsiType? {
-            val isIterableType = isIterableType(classType, project)
-            if (isIterableType && useListParam) {
-                return classType.parameters.firstOrNull()
-            }
-            return classType
-        }
-
         fun isIterableType(
             type: PsiClassType,
             project: Project,

src/main/kotlin/org/domaframework/doma/intellij/common/sql/PsiClassTypeUtil.kt

@@ -15,7 +15,6 @@
  */
 package org.domaframework.doma.intellij.extension.psi
 
-import com.intellij.codeInsight.AnnotationUtil
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiParameter
 
@@ -25,13 +24,3 @@ val PsiMethod.methodParameters: List<PsiParameter>
     get() = this.parameterList.parameters.toList()
 
 fun PsiMethod.searchParameter(searchName: String): List<PsiParameter> = this.methodParameters.filter { it.name.startsWith(searchName) }
-
-@OptIn(ExperimentalStdlibApi::class)
-fun PsiMethod.getDomaAnnotationType(): DomaAnnotationType {
-    DomaAnnotationType.entries.forEach {
-        if (AnnotationUtil.findAnnotation(this, it.fqdn) != null) {
-            return it
-        }
-    }
-    return DomaAnnotationType.Unknown
-}

src/main/kotlin/org/domaframework/doma/intellij/extension/psi/PsiMethodExtension.kt

@@ -51,7 +51,7 @@ import org.domaframework.doma.intellij.psi.SqlCustomElCommentExpr
 import org.domaframework.doma.intellij.psi.SqlTypes
 
 class SqlBlockUtil(
-    private val sqlBlock: SqlBlock,
+    sqlBlock: SqlBlock,
 ) {
     val wrap = sqlBlock.wrap
     val alignment = sqlBlock.alignment

src/main/kotlin/org/domaframework/doma/intellij/formatter/SqlBlockUtil.kt

@@ -16,7 +16,6 @@
 package org.domaframework.doma.intellij.formatter.block
 
 import com.intellij.formatting.Alignment
-import com.intellij.formatting.Indent
 import com.intellij.formatting.SpacingBuilder
 import com.intellij.formatting.Wrap
 import com.intellij.lang.ASTNode
@@ -41,8 +40,6 @@ open class SqlLineCommentBlock(
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
-    override fun getIndent(): Indent? = super.getIndent()
-
     override fun isLeaf(): Boolean = true
 
     override fun createBlockIndentLen(): Int {

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

@@ -23,7 +23,6 @@ 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.group.keyword.SqlUpdateKeywordGroupBlock
-import org.domaframework.doma.intellij.psi.SqlTypes
 
 /**
  * In an UPDATE statement using the row value constructor,
@@ -53,10 +52,6 @@ class SqlUpdateValueGroupBlock(
     override fun createBlockIndentLen(): Int {
         parentBlock?.let { parent ->
             if (parent is SqlUpdateKeywordGroupBlock) {
-                val keywords =
-                    parent.childBlocks
-                        .dropLast(1)
-                        .takeWhile { parent.node.elementType == SqlTypes.KEYWORD }
                 return parent.indent.indentLen
                     .plus(parent.getNodeText().length)
                     .plus(3)