Renaming the validation result object

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/contributor/sql/provider/SqlParameterCompletionProvider.kt

@@ -229,9 +229,9 @@ class SqlParameterCompletionProvider : CompletionProvider<CompletionParameters>(
                             ) != null
                         }
                 if (parameterParent != null) {
-                    val errorElement = targetElement.prevLeafs.firstOrNull { it is PsiErrorElement }
-                    if (errorElement != null) {
-                        parameterParent = (errorElement.parent as? SqlElParameters)
+                    val validateResult = targetElement.prevLeafs.firstOrNull { it is PsiErrorElement }
+                    if (validateResult != null) {
+                        parameterParent = (validateResult.parent as? SqlElParameters)
                         val children = mutableListOf<PsiElement>()
                         parameterParent
                             ?.children
@@ -310,7 +310,7 @@ class SqlParameterCompletionProvider : CompletionProvider<CompletionParameters>(
         var parentProperties: Array<PsiField> = psiParentClass.clazz?.allFields ?: emptyArray()
         var parentMethods: Array<PsiMethod> = psiParentClass.clazz?.allMethods ?: emptyArray()
 
-        val errorElement =
+        val validateResult =
             fieldAccessorChildElementValidator.validateChildren(
                 complete = { parent ->
                     parentProperties =
@@ -324,8 +324,8 @@ class SqlParameterCompletionProvider : CompletionProvider<CompletionParameters>(
                 },
             )
 
-        if (errorElement is ValidationPropertyResult) {
-            val parent = errorElement.parentClass ?: return
+        if (validateResult is ValidationPropertyResult) {
+            val parent = validateResult.parentClass ?: return
             parent.searchField(searchText)?.let {
                 parentProperties = it.toTypedArray()
             } ?: { parentProperties = emptyArray() }
@@ -439,12 +439,12 @@ class SqlParameterCompletionProvider : CompletionProvider<CompletionParameters>(
         val forDeclaration = ForDirectiveInspection(daoMethod)
         val forItem = forDeclaration.getForItem(top)
         if (forItem != null) {
-            val errorElement = forDeclaration.validateFieldAccessByForItem(elements)
-            if (errorElement is ValidationCompleteResult) {
+            val validateResult = forDeclaration.validateFieldAccessByForItem(elements)
+            if (validateResult is ValidationCompleteResult) {
                 val validator =
                     SqlElForItemFieldAccessorChildElementValidator(
                         elements,
-                        errorElement.parentClass,
+                        validateResult.parentClass,
                     )
                 val forValidationResult = validator.validateChildren(1)?.parentClass ?: return false
 

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

@@ -125,13 +125,13 @@ class SqlInspectionVisitor(
 
         val validDaoParam = daoMethod.findParameter(element.text)
         if (validDaoParam == null) {
-            val errorElement =
+            val validateResult =
                 ValidationDaoParamResult(
                     element,
                     daoMethod.name,
                     shortName,
                 )
-            errorElement.highlightElement(holder)
+            validateResult.highlightElement(holder)
         }
     }
 
@@ -183,20 +183,20 @@ class SqlInspectionVisitor(
     ) {
         val daoMethod = findDaoMethod(file) ?: return
         val forDirectiveInspection = ForDirectiveInspection(daoMethod, this.shortName)
-        var errorElement: ValidationResult? =
+        var validateResult: ValidationResult? =
             forDirectiveInspection.validateFieldAccessByForItem(blockElement.toList())
-        if (errorElement is ValidationCompleteResult) {
+        if (validateResult is ValidationCompleteResult) {
             val currentFieldAccessValidator =
                 SqlElForItemFieldAccessorChildElementValidator(
                     blockElement,
-                    errorElement.parentClass,
+                    validateResult.parentClass,
                     this.shortName,
                 )
-            errorElement = currentFieldAccessValidator.validateChildren()
-            if (errorElement is ValidationCompleteResult) return
+            validateResult = currentFieldAccessValidator.validateChildren()
+            if (validateResult is ValidationCompleteResult) return
         }
-        if (errorElement is ValidationPropertyResult) {
-            errorElement.highlightElement(holder)
+        if (validateResult is ValidationPropertyResult) {
+            validateResult.highlightElement(holder)
             return
         }
 
@@ -206,8 +206,8 @@ class SqlInspectionVisitor(
                 file,
                 this.shortName,
             )
-        errorElement = validator.validateChildren()
-        errorElement?.highlightElement(holder)
+        validateResult = validator.validateChildren()
+        validateResult?.highlightElement(holder)
     }
 
     /**
@@ -224,7 +224,7 @@ class SqlInspectionVisitor(
                 staticAccuser,
                 this.shortName,
             )
-        val errorElement: ValidationResult? = validator.validateChildren()
-        errorElement?.highlightElement(holder)
+        val validateResult: ValidationResult? = validator.validateChildren()
+        validateResult?.highlightElement(holder)
     }
 }

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

@@ -59,9 +59,9 @@ class SqlElIdExprReference(
             return forItem.element
         }
 
-        val errorElement = forDirectiveInspection.validateFieldAccessByForItem(targetElements)
-        var parentClass = (errorElement as? ValidationCompleteResult)?.parentClass
-        if (errorElement is ValidationCompleteResult && parentClass != null) {
+        val validateResult = forDirectiveInspection.validateFieldAccessByForItem(targetElements)
+        var parentClass = (validateResult as? ValidationCompleteResult)?.parentClass
+        if (validateResult is ValidationCompleteResult && parentClass != null) {
             val validator =
                 SqlElForItemFieldAccessorChildElementValidator(
                     targetElements,
@@ -138,9 +138,9 @@ class SqlElIdExprReference(
                 targetElement.dropLast(1),
                 topParentClass,
             )
-        val errorElement = validator.validateChildren()
-        if (errorElement != null) {
-            val targetClass = errorElement.parentClass ?: return null
+        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(