Fixed reference resolution logic for SqlElStaticField

Author: xterao

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

@@ -15,6 +15,7 @@
  */
 package org.domaframework.doma.intellij.common.sql.validator
 
+import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiClassType
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiType
@@ -42,33 +43,34 @@ abstract class SqlElChildElementValidator(
     ): ValidationResult? = null
 
     fun validateFieldAccess(
+        project: Project,
         topParent: PsiParentClass,
         dropLastIndex: Int = 0,
         findFieldMethod: ((PsiType) -> PsiParentClass)? = { type -> PsiParentClass(type) },
         complete: ((PsiParentClass) -> Unit) = { parent: PsiParentClass? -> },
     ): ValidationResult? =
         getFieldAccessParentClass(
+            project,
             topParent,
             dropLastIndex,
             findFieldMethod = findFieldMethod,
             complete = complete,
         )
 
     protected fun getFieldAccessParentClass(
+        project: Project,
         topParent: PsiParentClass,
         dropLastIndex: Int = 0,
         findFieldMethod: ((PsiType) -> PsiParentClass)? = { type -> PsiParentClass(type) },
         complete: ((PsiParentClass) -> Unit) = { parent: PsiParentClass? -> },
     ): ValidationResult? {
-        val project = blocks.firstOrNull()?.project ?: return null
-
         var parent = topParent
         val parentType = parent.type
         val classType = parentType as? PsiClassType ?: return null
 
         var competeResult: ValidationCompleteResult? = null
 
-        if (dropLastIndex > 0 && blocks.drop(1).dropLast(dropLastIndex).isEmpty()) {
+        if (dropLastIndex > 0 && blocks.size <= dropLastIndex + 1) {
             return ValidationCompleteResult(
                 blocks.last(),
                 parent,

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

@@ -34,6 +34,8 @@ class SqlElFieldAccessorChildElementValidator(
     override val shorName: String = "",
     private val topDaoParameter: PsiParameter? = null,
 ) : SqlElChildElementValidator(blocks, shorName) {
+    val project = file.project
+
     override fun validateChildren(
         dropIndex: Int,
         findFieldMethod: (PsiType) -> PsiParentClass,
@@ -43,6 +45,7 @@ class SqlElFieldAccessorChildElementValidator(
         val parentClass = parentClassResult?.parentClass
         if (parentClassResult is ValidationCompleteResult && parentClass != null) {
             return validateFieldAccess(
+                project,
                 parentClass,
                 complete = complete,
             )
@@ -55,7 +58,7 @@ class SqlElFieldAccessorChildElementValidator(
         val parentClassResult = getParentClass()
         val parentClass = parentClassResult?.parentClass
         if (parentClassResult is ValidationCompleteResult && parentClass != null) {
-            return validateFieldAccess(parentClass)
+            return validateFieldAccess(project, parentClass)
         }
 
         return parentClassResult

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

@@ -25,16 +25,21 @@ class SqlElForItemFieldAccessorChildElementValidator(
     private val declarationType: PsiParentClass,
     override val shorName: String = "",
 ) : SqlElChildElementValidator(blocks, shorName) {
+    val project = blocks.firstOrNull()?.project
+
     override fun validateChildren(
         dropIndex: Int,
         findFieldMethod: (PsiType) -> PsiParentClass,
         complete: (PsiParentClass) -> Unit,
     ): ValidationResult? =
-        validateFieldAccess(
-            declarationType,
-            dropIndex,
-            complete = complete,
-        )
+        project?.let {
+            validateFieldAccess(
+                it,
+                declarationType,
+                dropIndex,
+                complete = complete,
+            )
+        }
 
-    override fun validateChildren(dropIndex: Int): ValidationResult? = validateFieldAccess(declarationType, dropIndex)
+    override fun validateChildren(dropIndex: Int): ValidationResult? = project?.let { validateFieldAccess(it, declarationType, dropIndex) }
 }

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

@@ -33,6 +33,8 @@ class SqlElStaticFieldAccessorChildElementValidator(
     private val staticAccuser: SqlElStaticFieldAccessExpr,
     override val shorName: String = "",
 ) : SqlElChildElementValidator(blocks, shorName) {
+    val project = staticAccuser.containingFile.project
+
     override fun validateChildren(
         dropIndex: Int,
         findFieldMethod: (PsiType) -> PsiParentClass,
@@ -43,6 +45,7 @@ class SqlElStaticFieldAccessorChildElementValidator(
             is ValidationCompleteResult -> {
                 val parent = getParentResult.parentClass
                 return validateFieldAccess(
+                    project,
                     parent,
                     dropLastIndex = dropIndex,
                     complete = complete,
@@ -57,31 +60,28 @@ class SqlElStaticFieldAccessorChildElementValidator(
         val getParentResult = getFieldTopParent()
         when (getParentResult) {
             is ValidationCompleteResult -> {
-                if (blocks.size == 1) {
-                    return getParentResult
-                }
                 val parent = getParentResult.parentClass
-                return validateFieldAccess(parent, dropLastIndex = dropIndex)
+                return validateFieldAccess(project, parent, dropLastIndex = dropIndex)
             }
             is ValidationIgnoreResult -> return null
             else -> return getParentResult
         }
     }
 
-    private fun getFieldTopParent(): ValidationResult {
-        val staticTopElement =
-            blocks.firstOrNull()
-                ?: return ValidationIgnoreResult(blocks.firstOrNull())
+    fun getClassType(): PsiParentClass? {
         val fqdn = staticAccuser.fqdn
         val file = staticAccuser.containingFile
         val psiStaticElement = PsiStaticElement(fqdn, file)
-        val clazz = psiStaticElement.getRefClazz() ?: return ValidationIgnoreResult(staticTopElement)
+        val clazz = psiStaticElement.getRefClazz() ?: return null
 
-        var parent = PsiParentClass(clazz.psiClassType)
-        if (blocks.size == 1) {
-            return ValidationCompleteResult(blocks.first(), parent)
-        }
+        return PsiParentClass(clazz.psiClassType)
+    }
 
+    private fun getFieldTopParent(): ValidationResult? {
+        var parent = getClassType() ?: return ValidationIgnoreResult(null)
+        val staticTopElement =
+            blocks.firstOrNull()
+                ?: return ValidationCompleteResult(staticAccuser.elClass, parent)
         val nextSibling = staticTopElement.nextSibling
         val topField =
             if (nextSibling !is SqlElParameters) {

src/main/kotlin/org/domaframework/doma/intellij/inspection/ForDirectiveInspection.kt

@@ -118,6 +118,17 @@ class ForDirectiveInspection(
 
         for ((i, targetForDirective) in forDirectives.withIndex()) {
             if (nestClassType == null) break
+            val targetDirectiveParent =
+                PsiTreeUtil.getParentOfType(
+                    targetForDirective.item,
+                    SqlElForDirective::class.java,
+                )
+            val targetElementParent =
+                PsiTreeUtil.getParentOfType(
+                    topElm,
+                    SqlElForDirective::class.java,
+                )
+            if (targetDirectiveParent == targetElementParent) continue
 
             val currentForItem = ForItem(targetForDirective.item)
             val currentDeclaration = currentForItem.getParentForDirectiveExpr()?.getForItemDeclaration() ?: continue

src/main/kotlin/org/domaframework/doma/intellij/inspection/sql/SqlInspectionVisitor.kt

@@ -26,6 +26,7 @@ import com.intellij.psi.util.elementType
 import org.domaframework.doma.intellij.common.dao.findDaoMethod
 import org.domaframework.doma.intellij.common.isInjectionSqlFile
 import org.domaframework.doma.intellij.common.isJavaOrKotlinFileType
+import org.domaframework.doma.intellij.common.sql.foritem.ForItem
 import org.domaframework.doma.intellij.common.sql.validator.SqlElFieldAccessorChildElementValidator
 import org.domaframework.doma.intellij.common.sql.validator.SqlElForItemFieldAccessorChildElementValidator
 import org.domaframework.doma.intellij.common.sql.validator.SqlElStaticFieldAccessorChildElementValidator
@@ -35,6 +36,7 @@ import org.domaframework.doma.intellij.common.sql.validator.result.ValidationPro
 import org.domaframework.doma.intellij.common.sql.validator.result.ValidationResult
 import org.domaframework.doma.intellij.extension.expr.accessElements
 import org.domaframework.doma.intellij.extension.psi.findParameter
+import org.domaframework.doma.intellij.extension.psi.getForItem
 import org.domaframework.doma.intellij.extension.psi.isFirstElement
 import org.domaframework.doma.intellij.inspection.ForDirectiveInspection
 import org.domaframework.doma.intellij.psi.SqlElFieldAccessExpr
@@ -107,6 +109,10 @@ class SqlInspectionVisitor(
             ForDirectiveInspection(daoMethod, this.shortName)
 
         if (PsiTreeUtil.getParentOfType(element, SqlElForDirective::class.java) != null) {
+            val currentForItem = ForItem(element)
+            val leftSideForItem = currentForItem.getParentForDirectiveExpr()?.getForItem()
+            if (leftSideForItem == element) return
+
             val forDirectivesSize = forDirectiveInspection.getForDirectiveBlockSize(element)
             if (forDirectivesSize == 0) return
         }

src/main/kotlin/org/domaframework/doma/intellij/reference/SqlElStaticFieldReference.kt

@@ -40,10 +40,19 @@ class SqlElStaticFieldReference(
                 staticAccessParent,
             )
 
-        val errorElement = validator.validateChildren(dropIndex = 1)
-        if (errorElement is ValidationCompleteResult) {
+        val initialPsiParentClass = validator.getClassType() ?: return null
+        val project = file.project
+        val fieldAccessLastParentResult =
+            if (targetElements.size == 1) {
+                validator.validateFieldAccess(project, initialPsiParentClass, dropLastIndex = 1)
+            } else if (targetElements.size >= 2) {
+                validator.validateChildren(1)
+            } else {
+                null
+            }
+        if (fieldAccessLastParentResult is ValidationCompleteResult) {
             val searchText = element.text ?: ""
-            val parent = errorElement.parentClass
+            val parent = fieldAccessLastParentResult.parentClass
             return parent.findField(searchText) ?: parent.findMethod(searchText)
         }