Merge pull request #128 from domaframework/fix/static-field-reference-log

Added a condition to output logs only when references are resolved

Author: xterao

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

@@ -29,12 +29,15 @@ class SqlElClassExprReference(
     ): PsiElement? {
         val variableName = element.text
         val psiStaticElement = PsiStaticElement(variableName, file)
-        PluginLoggerUtil.countLogging(
-            this::class.java.simpleName,
-            "ReferenceStaticClass",
-            "Reference",
-            startTime,
-        )
-        return psiStaticElement.getRefClazz()
+        val reference = psiStaticElement.getRefClazz()
+        if (reference == null) {
+            PluginLoggerUtil.countLogging(
+                this::class.java.simpleName,
+                "ReferenceStaticClass",
+                "Reference",
+                startTime,
+            )
+        }
+        return reference
     }
 }

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

@@ -31,12 +31,14 @@ class SqlElForDirectiveIdExprReference(
         file: PsiFile,
     ): PsiElement? {
         val declarationItem = getDeclarationItem()
-        PluginLoggerUtil.countLogging(
-            this::class.java.simpleName,
-            "ReferenceForDirectiveItem",
-            "Reference",
-            startTime,
-        )
+        if (declarationItem != null) {
+            PluginLoggerUtil.countLogging(
+                this::class.java.simpleName,
+                "ReferenceForDirectiveItem",
+                "Reference",
+                startTime,
+            )
+        }
         return declarationItem
     }
 

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

@@ -28,7 +28,6 @@ import org.domaframework.doma.intellij.common.sql.validator.result.ValidationCom
 import org.domaframework.doma.intellij.extension.psi.findParameter
 import org.domaframework.doma.intellij.extension.psi.getDomaAnnotationType
 import org.domaframework.doma.intellij.extension.psi.getIterableClazz
-import org.domaframework.doma.intellij.extension.psi.methodParameters
 import org.domaframework.doma.intellij.inspection.ForDirectiveInspection
 import org.domaframework.doma.intellij.psi.SqlElFieldAccessExpr
 import org.domaframework.doma.intellij.psi.SqlTypes
@@ -73,12 +72,14 @@ class SqlElIdExprReference(
                 val targetParent = targetReferenceClass.parentClass
                 val reference =
                     targetParent.findField(searchText) ?: targetParent.findMethod(searchText)
-                PluginLoggerUtil.countLogging(
-                    this::class.java.simpleName,
-                    "ReferenceEntityProperty",
-                    "Reference",
-                    startTime,
-                )
+                if (reference != null) {
+                    PluginLoggerUtil.countLogging(
+                        this::class.java.simpleName,
+                        "ReferenceEntityProperty",
+                        "Reference",
+                        startTime,
+                    )
+                }
                 return reference
             }
         }
@@ -106,31 +107,36 @@ class SqlElIdExprReference(
         bindElement: PsiElement,
         startTime: Long,
     ): PsiElement? {
-        daoMethod
-            .let { method ->
-                method.methodParameters.firstOrNull { param ->
-                    param.name == bindElement.text
-                }
-            }?.let { originalElm ->
-                PluginLoggerUtil.countLogging(
-                    this::class.java.simpleName,
-                    "ReferenceDaoMethodParameter",
-                    "Reference",
-                    startTime,
-                )
-                psiClassType = originalElm.type
-                return originalElm.originalElement
-            } ?: return null
+        daoMethod.findParameter(bindElement.text)?.let { originalElm ->
+            PluginLoggerUtil.countLogging(
+                this::class.java.simpleName,
+                "ReferenceDaoMethodParameter",
+                "Reference",
+                startTime,
+            )
+            psiClassType = originalElm.type
+            return originalElm.originalElement
+        } ?: return null
     }
 
     private fun getReferenceEntity(
         topParentClass: PsiParentClass,
         targetElement: List<PsiElement>,
         startTime: Long,
     ): PsiElement? {
+        val searchText = cleanString(targetElement.lastOrNull()?.text ?: "")
         if (targetElement.size <= 2) {
-            val searchText = targetElement.lastOrNull()?.text ?: ""
-            return topParentClass.findField(searchText) ?: topParentClass.findMethod(searchText)
+            val reference =
+                topParentClass.findField(searchText) ?: topParentClass.findMethod(searchText)
+            if (reference != null) {
+                PluginLoggerUtil.countLogging(
+                    this::class.java.simpleName,
+                    "ReferenceEntityProperty",
+                    "Reference",
+                    startTime,
+                )
+            }
+            return reference
         }
 
         val validator =
@@ -141,14 +147,15 @@ class SqlElIdExprReference(
         val validateResult = validator.validateChildren()
         if (validateResult != null) {
             val targetClass = validateResult.parentClass ?: return null
-            val searchText = targetElement.lastOrNull()?.text ?: ""
             val reference = targetClass.findField(searchText) ?: targetClass.findMethod(searchText)
-            PluginLoggerUtil.countLogging(
-                this::class.java.simpleName,
-                "ReferenceEntityProperty",
-                "Reference",
-                startTime,
-            )
+            if (reference != null) {
+                PluginLoggerUtil.countLogging(
+                    this::class.java.simpleName,
+                    "ReferenceEntityProperty",
+                    "Reference",
+                    startTime,
+                )
+            }
             return reference
         }
         return null

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

@@ -18,6 +18,7 @@ package org.domaframework.doma.intellij.reference
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.util.PsiTreeUtil
+import org.domaframework.doma.intellij.common.PluginLoggerUtil
 import org.domaframework.doma.intellij.common.sql.validator.SqlElStaticFieldAccessorChildElementValidator
 import org.domaframework.doma.intellij.common.sql.validator.result.ValidationCompleteResult
 import org.domaframework.doma.intellij.psi.SqlElStaticFieldAccessExpr
@@ -33,7 +34,8 @@ class SqlElStaticFieldReference(
             PsiTreeUtil.getParentOfType(element, SqlElStaticFieldAccessExpr::class.java)
         if (staticAccessParent == null) return null
 
-        val targetElements = getBlockCommentElements(element, SqlElStaticFieldAccessExpr::class.java)
+        val targetElements =
+            getBlockCommentElements(element, SqlElStaticFieldAccessExpr::class.java)
         val validator =
             SqlElStaticFieldAccessorChildElementValidator(
                 targetElements,
@@ -53,7 +55,16 @@ class SqlElStaticFieldReference(
         if (fieldAccessLastParentResult is ValidationCompleteResult) {
             val searchText = element.text ?: ""
             val parent = fieldAccessLastParentResult.parentClass
-            return parent.findField(searchText) ?: parent.findMethod(searchText)
+            val reference = parent.findField(searchText) ?: parent.findMethod(searchText)
+            if (reference != null) {
+                PluginLoggerUtil.countLogging(
+                    this::class.java.simpleName,
+                    "ReferenceStaticProperty",
+                    "Reference",
+                    startTime,
+                )
+            }
+            return reference
         }
 
         return null