Refactor function resolution logic and improve SQL validation reporting

xterao · xterao · commit 1b6db0bfd7b7 · 2025-05-19T16:10:41.000+09:00
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/sql/directive/collector/StaticBuildFunctionCollector.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/sql/directive/collector/StaticBuildFunctionCollector.kt
@@ -21,11 +21,8 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiModifier
 import org.domaframework.doma.intellij.common.helper.ExpressionFunctionsHelper
-import org.domaframework.doma.intellij.common.psi.PsiParentClass
 import org.domaframework.doma.intellij.extension.getJavaClazz
-import org.domaframework.doma.intellij.extension.psi.psiClassType
 import org.domaframework.doma.intellij.setting.state.DomaToolsCustomFunctionSettings
-import kotlin.collections.mutableSetOf
 
 class StaticBuildFunctionCollector(
     private val project: Project,
@@ -46,14 +43,12 @@ class StaticBuildFunctionCollector(
             if (expressionClazz != null &&
                 ExpressionFunctionsHelper.isInheritor(expressionClazz)
             ) {
-                val psiParent = PsiParentClass(expressionClazz.psiClassType)
-                psiParent.searchMethod("")?.let { methods ->
-                    functions.addAll(
-                        methods.filter {
-                            isPublicFunction(it)
-                        },
-                    )
-                }
+                val methods = expressionClazz.allMethods
+                functions.addAll(
+                    methods.filter {
+                        isPublicFunction(it)
+                    },
+                )
             }
         }
 
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationClassPathResult.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationClassPathResult.kt
@@ -16,7 +16,6 @@
 package org.domaframework.doma.intellij.common.sql.validator.result
 
 import com.intellij.codeInspection.ProblemsHolder
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import org.domaframework.doma.intellij.bundle.MessageBundle
@@ -34,7 +33,6 @@ open class ValidationClassPathResult(
         identify: PsiElement,
         holder: ProblemsHolder,
         parent: PsiParentClass?,
-        project: Project,
     ) {
         val project = identify.project
         holder.registerProblem(
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationCompleteResult.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationCompleteResult.kt
@@ -16,7 +16,6 @@
 package org.domaframework.doma.intellij.common.sql.validator.result
 
 import com.intellij.codeInspection.ProblemsHolder
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import org.domaframework.doma.intellij.common.psi.PsiParentClass
@@ -33,7 +32,6 @@ class ValidationCompleteResult(
         identify: PsiElement,
         holder: ProblemsHolder,
         parent: PsiParentClass?,
-        project: Project,
     ) {
     }
 }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationDaoParamResult.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationDaoParamResult.kt
@@ -16,7 +16,6 @@
 package org.domaframework.doma.intellij.common.sql.validator.result
 
 import com.intellij.codeInspection.ProblemsHolder
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import org.domaframework.doma.intellij.bundle.MessageBundle
@@ -35,7 +34,6 @@ open class ValidationDaoParamResult(
         identify: PsiElement,
         holder: ProblemsHolder,
         parent: PsiParentClass?,
-        project: Project,
     ) {
         val project = identify.project
         holder.registerProblem(
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationForDirectiveItemTypeResult.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationForDirectiveItemTypeResult.kt
@@ -16,7 +16,6 @@
 package org.domaframework.doma.intellij.common.sql.validator.result
 
 import com.intellij.codeInspection.ProblemsHolder
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import org.domaframework.doma.intellij.bundle.MessageBundle
@@ -31,7 +30,6 @@ class ValidationForDirectiveItemTypeResult(
         identify: PsiElement,
         holder: ProblemsHolder,
         parent: PsiParentClass?,
-        project: Project,
     ) {
         val project = identify.project
         holder.registerProblem(
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationInvalidFunctionCallResult.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationInvalidFunctionCallResult.kt
@@ -16,14 +16,13 @@
 package org.domaframework.doma.intellij.common.sql.validator.result
 
 import com.intellij.codeInspection.ProblemsHolder
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import org.domaframework.doma.intellij.bundle.MessageBundle
 import org.domaframework.doma.intellij.common.psi.PsiParentClass
 
 /**
- * Non-existent package name or class
+ * Reports invalid function calls in SQL validation.
  */
 open class ValidationInvalidFunctionCallResult(
     override val identify: PsiElement,
@@ -34,7 +33,6 @@ open class ValidationInvalidFunctionCallResult(
         identify: PsiElement,
         holder: ProblemsHolder,
         parent: PsiParentClass?,
-        project: Project,
     ) {
         val project = identify.project
         holder.registerProblem(
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationNotFoundStaticPropertyResult.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationNotFoundStaticPropertyResult.kt
@@ -16,7 +16,6 @@
 package org.domaframework.doma.intellij.common.sql.validator.result
 
 import com.intellij.codeInspection.ProblemsHolder
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import org.domaframework.doma.intellij.bundle.MessageBundle
@@ -33,7 +32,6 @@ class ValidationNotFoundStaticPropertyResult(
         identify: PsiElement,
         holder: ProblemsHolder,
         parent: PsiParentClass?,
-        project: Project,
     ) {
         val project = identify.project
         holder.registerProblem(
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationNotFoundTopTypeResult.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationNotFoundTopTypeResult.kt
@@ -16,7 +16,6 @@
 package org.domaframework.doma.intellij.common.sql.validator.result
 
 import com.intellij.codeInspection.ProblemsHolder
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import org.domaframework.doma.intellij.bundle.MessageBundle
@@ -31,7 +30,6 @@ class ValidationNotFoundTopTypeResult(
         identify: PsiElement,
         holder: ProblemsHolder,
         parent: PsiParentClass?,
-        project: Project,
     ) {
         val project = identify.project
         holder.registerProblem(
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationPropertyResult.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationPropertyResult.kt
@@ -16,7 +16,6 @@
 package org.domaframework.doma.intellij.common.sql.validator.result
 
 import com.intellij.codeInspection.ProblemsHolder
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiClassType
 import com.intellij.psi.PsiElement
@@ -36,7 +35,6 @@ class ValidationPropertyResult(
         identify: PsiElement,
         holder: ProblemsHolder,
         parent: PsiParentClass?,
-        project: Project,
     ) {
         val project = identify.project
         val parentName =
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationResult.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationResult.kt
@@ -35,7 +35,6 @@ abstract class ValidationResult(
         val element = identify ?: return
         if (identify is PsiErrorElement) return
 
-        val project = element.project
         val highlightElm = element.originalElement
         val highlightRange =
             TextRange(0, element.textRange.length)
@@ -45,7 +44,6 @@ abstract class ValidationResult(
             highlightElm,
             holder,
             parentClass,
-            project,
         )
     }
 
@@ -54,7 +52,6 @@ abstract class ValidationResult(
         identify: PsiElement,
         holder: ProblemsHolder,
         parent: PsiParentClass?,
-        project: Project,
     )
 
     /**
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationTestDataResult.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationTestDataResult.kt
@@ -16,7 +16,6 @@
 package org.domaframework.doma.intellij.common.sql.validator.result
 
 import com.intellij.codeInspection.ProblemsHolder
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import org.domaframework.doma.intellij.bundle.MessageBundle
@@ -31,7 +30,6 @@ class ValidationTestDataResult(
         identify: PsiElement,
         holder: ProblemsHolder,
         parent: PsiParentClass?,
-        project: Project,
     ) {
         val project = identify.project
         holder.registerProblem(
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/util/DomaToolsSettingUtil.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/util/DomaToolsSettingUtil.kt
@@ -0,0 +1,33 @@
+/*
+ * 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.common.util
+
+import com.intellij.openapi.project.Project
+import org.domaframework.doma.intellij.setting.state.DomaToolsFormatEnableSettings
+
+object DomaToolsSettingUtil {
+    /**
+     * Checks if SQL formatting is enabled in the project settings.
+     *
+     * @param project The project to check.
+     * @return `true` if SQL formatting is enabled, `false` otherwise.
+     */
+    fun isEnableFormat(project: Project): Boolean {
+        val setting = DomaToolsFormatEnableSettings.getInstance(project)
+        val isEnableFormat = setting.state.isEnableSqlFormat
+        return isEnableFormat
+    }
+}
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatPreProcessor.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatPreProcessor.kt
@@ -17,7 +17,6 @@ package org.domaframework.doma.intellij.formatter
 
 import com.intellij.lang.ASTNode
 import com.intellij.openapi.editor.Document
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiElement
@@ -29,13 +28,13 @@ import com.intellij.psi.impl.source.codeStyle.PreFormatProcessor
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.elementType
 import com.intellij.psi.util.prevLeafs
+import org.domaframework.doma.intellij.common.util.DomaToolsSettingUtil
 import org.domaframework.doma.intellij.common.util.PluginLoggerUtil
 import org.domaframework.doma.intellij.extension.expr.isConditionOrLoopDirective
 import org.domaframework.doma.intellij.psi.SqlBlockComment
 import org.domaframework.doma.intellij.psi.SqlCustomElCommentExpr
 import org.domaframework.doma.intellij.psi.SqlTypes
 import org.domaframework.doma.intellij.setting.SqlLanguage
-import org.domaframework.doma.intellij.setting.state.DomaToolsFormatEnableSettings
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
 class SqlFormatPreProcessor : PreFormatProcessor {
@@ -48,7 +47,7 @@ class SqlFormatPreProcessor : PreFormatProcessor {
         source: PsiFile,
         rangeToReformat: TextRange,
     ): TextRange {
-        if (!isEnableFormat(source.project)) return rangeToReformat
+        if (!DomaToolsSettingUtil.isEnableFormat(source.project)) return rangeToReformat
         if (source.language != SqlLanguage.INSTANCE) return rangeToReformat
 
         logging()
@@ -158,12 +157,6 @@ class SqlFormatPreProcessor : PreFormatProcessor {
         return rangeToReformat.grown(visitor.replaces.size)
     }
 
-    private fun isEnableFormat(project: Project): Boolean {
-        val setting = DomaToolsFormatEnableSettings.getInstance(project)
-        val isEnableFormat = setting.state.isEnableSqlFormat
-        return isEnableFormat
-    }
-
     private fun removeSpacesAroundNewline(
         document: Document,
         range: TextRange,
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/SqlPostProcessor.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/SqlPostProcessor.kt
@@ -24,8 +24,8 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.impl.source.codeStyle.PostFormatProcessor
+import org.domaframework.doma.intellij.common.util.DomaToolsSettingUtil
 import org.domaframework.doma.intellij.setting.SqlLanguage
-import org.domaframework.doma.intellij.setting.state.DomaToolsFormatEnableSettings
 
 class SqlPostProcessor : PostFormatProcessor {
     override fun processElement(
@@ -38,7 +38,7 @@ class SqlPostProcessor : PostFormatProcessor {
         rangeToReformat: TextRange,
         settings: CodeStyleSettings,
     ): TextRange {
-        if (!isEnableFormat(source.project)) return rangeToReformat
+        if (!DomaToolsSettingUtil.isEnableFormat(source.project)) return rangeToReformat
         if (source.language != SqlLanguage.INSTANCE) return rangeToReformat
 
         val project: Project = source.project
@@ -60,10 +60,4 @@ class SqlPostProcessor : PostFormatProcessor {
         }
         return TextRange(0, finalText.length)
     }
-
-    private fun isEnableFormat(project: Project): Boolean {
-        val setting = DomaToolsFormatEnableSettings.getInstance(project)
-        val isEnableFormat = setting.state.isEnableSqlFormat
-        return isEnableFormat
-    }
 }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/inspection/sql/processor/InspectionFunctionCallVisitorProcessor.kt b/src/main/kotlin/org/domaframework/doma/intellij/inspection/sql/processor/InspectionFunctionCallVisitorProcessor.kt
@@ -37,12 +37,14 @@ class InspectionFunctionCallVisitorProcessor(
         val customFunctionClassNames = expressionFunctionSetting.state.customFunctionClassNames
 
         var methods: Array<out PsiMethod?> = emptyArray()
-        customFunctionClassNames.takeWhile { clazz ->
+        for (clazz in customFunctionClassNames) {
             val expressionClazz = project.getJavaClazz(clazz)
             if (expressionClazz != null && expressionHelper.isInheritor(expressionClazz)) {
                 methods = expressionClazz.findMethodsByName(functionName.text, true)
+                if (methods.isNotEmpty()) {
+                    break
+                }
             }
-            methods.isEmpty()
         }
 
         if (methods.isEmpty()) {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`package org.domaframework.doma.intellij.common.sql.validator.result`
`17`	`17`
`18`	`18`	`import com.intellij.codeInspection.ProblemsHolder`
`19`		`-import com.intellij.openapi.project.Project`
`20`	`19`	`import com.intellij.openapi.util.TextRange`
`21`	`20`	`import com.intellij.psi.PsiElement`
`22`	`21`	`import org.domaframework.doma.intellij.common.psi.PsiParentClass`
`@@ -33,7 +32,6 @@ class ValidationCompleteResult(`
`33`	`32`	`identify: PsiElement,`
`34`	`33`	`holder: ProblemsHolder,`
`35`	`34`	`parent: PsiParentClass?,`
`36`		`- project: Project,`
`37`	`35`	`) {`
`38`	`36`	`}`
`39`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ abstract class ValidationResult(`
`35`	`35`	`val element = identify ?: return`
`36`	`36`	`if (identify is PsiErrorElement) return`
`37`	`37`
`38`		`- val project = element.project`
`39`	`38`	`val highlightElm = element.originalElement`
`40`	`39`	`val highlightRange =`
`41`	`40`	`TextRange(0, element.textRange.length)`
`@@ -45,7 +44,6 @@ abstract class ValidationResult(`
`45`	`44`	`highlightElm,`
`46`	`45`	`holder,`
`47`	`46`	`parentClass,`
`48`		`- project,`
`49`	`47`	`)`
`50`	`48`	`}`
`51`	`49`
`@@ -54,7 +52,6 @@ abstract class ValidationResult(`
`54`	`52`	`identify: PsiElement,`
`55`	`53`	`holder: ProblemsHolder,`
`56`	`54`	`parent: PsiParentClass?,`
`57`		`- project: Project,`
`58`	`55`	`)`
`59`	`56`
`60`	`57`	`/**`