the correct resolve for global variables (#15)

VKCOM · Jul 24, 2024 · 006d176 · 006d176
1 parent e00a05a
commit 006d176
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/src/main/kotlin/com/vk/modulite/highlighting/ModulitePhpAnnotator.kt b/src/main/kotlin/com/vk/modulite/highlighting/ModulitePhpAnnotator.kt
@@ -12,6 +12,7 @@ import com.intellij.refactoring.suggested.startOffset
 import com.jetbrains.php.lang.psi.elements.*
 import com.vk.modulite.modulite.ModuliteRestrictionChecker
 import com.vk.modulite.psi.extensions.files.containingModulite
+import com.vk.modulite.psi.extensions.php.resolveElement
 import com.vk.modulite.utils.fromStubs
 import com.vk.modulite.utils.fromTests
 
@@ -46,7 +47,7 @@ class ModulitePhpAnnotator : Annotator {
         reference: PhpReference,
         problemElement: PsiElement? = reference
     ) {
-        val references = reference.resolveGlobal(false)
+        val references = reference.resolveElement()
         if (references.isEmpty()) {
 //            LOG.warn("Unknown reference for symbol '${reference.safeFqn()}'")
             return

diff --git a/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt b/src/main/kotlin/com/vk/modulite/inspections/InternalSymbolUsageInspection.kt
@@ -14,6 +14,7 @@ import com.vk.modulite.modulite.Modulite
 import com.vk.modulite.modulite.ModuliteRestrictionChecker
 import com.vk.modulite.psi.extensions.files.containingComposerPackage
 import com.vk.modulite.psi.extensions.files.containingModulite
+import com.vk.modulite.psi.extensions.php.resolveElement
 import com.vk.modulite.psi.extensions.php.symbolName
 import com.vk.modulite.utils.fromStubs
 import com.vk.modulite.utils.fromTests
@@ -123,7 +124,7 @@ class InternalSymbolUsageInspection : LocalInspectionTool() {
             }
 
             private fun checkReferenceUsage(reference: PhpReference, problemElement: PsiElement? = reference) {
-                val references = reference.resolveGlobal(false)
+                val references = reference.resolveElement()
                 if (references.isEmpty()) {
 //                    LOG.warn("Unknown reference for symbol '${reference.safeFqn()}'")
                     return

diff --git a/src/main/kotlin/com/vk/modulite/psi/extensions/php/Extensions.kt b/src/main/kotlin/com/vk/modulite/psi/extensions/php/Extensions.kt
@@ -151,3 +151,11 @@ fun PhpReference.safeFqn(): String {
         signature
     }
 }
+
+fun PhpReference.resolveElement(): MutableCollection<out PhpNamedElement> {
+    return if (this is VariableImpl) {
+        this.resolveLocal()
+    } else {
+        this.resolveGlobal(false)
+    }
+}
diff --git a/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt b/src/main/kotlin/com/vk/modulite/services/ModuliteDependenciesCollector.kt
@@ -35,6 +35,7 @@ import com.vk.modulite.modulite.Modulite
 import com.vk.modulite.notifications.ModuliteWarningNotification
 import com.vk.modulite.psi.PhpRecursiveElementVisitor
 import com.vk.modulite.psi.extensions.files.*
+import com.vk.modulite.psi.extensions.php.resolveElement
 import com.vk.modulite.psi.extensions.php.safeFqn
 import com.vk.modulite.psi.extensions.php.symbolName
 import com.vk.modulite.utils.fromKphpPolyfills
@@ -295,7 +296,7 @@ class ModuliteDependenciesCollector(val project: Project) {
                 private fun handleReference(reference: PhpReference?, traverseFurther: Boolean = true) {
                     if (reference == null) return
 
-                    val references = reference.resolveGlobal(false)
+                    val references = reference.resolveElement()
                     if (references.isEmpty()) {
                         LOG.warn("Unknown reference '${reference.safeFqn()}'")
                         return