[T3CMS] Contribute IconReferences without PhpIndex exceptions

Author: cedricziel

typo3-cms/src/main/java/com/cedricziel/idea/typo3/icons/IconReferenceContributor.java

@@ -3,6 +3,7 @@
 import com.cedricziel.idea.typo3.util.PhpLangUtil;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.*;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ProcessingContext;
 import com.jetbrains.php.PhpIndex;
 import com.jetbrains.php.lang.psi.elements.MethodReference;
@@ -21,51 +22,43 @@ public class IconReferenceContributor extends PsiReferenceContributor {
     public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) {
         // known method calls
         registrar.registerReferenceProvider(
-                PlatformPatterns.psiElement(StringLiteralExpression.class),
-                new PsiReferenceProvider() {
-                    @NotNull
-                    @Override
-                    public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
-                        StringLiteralExpression stringLiteralExpression = (StringLiteralExpression) element;
+            PlatformPatterns.psiElement(StringLiteralExpression.class).withSuperParent(2, PlatformPatterns.psiElement(MethodReference.class)),
+            new PsiReferenceProvider() {
+                @NotNull
+                @Override
+                public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
+                    StringLiteralExpression stringLiteralExpression = (StringLiteralExpression) element;
+                    MethodReference methodReference = (MethodReference) PsiTreeUtil.findFirstParent(stringLiteralExpression, p -> p instanceof MethodReference);
 
-                        PsiElement parent = stringLiteralExpression.getParent();
-                        while (!(parent instanceof MethodReference)) {
-
-                            if (parent != null) {
-                                parent = parent.getParent();
-
-                                continue;
-                            }
-
-                            return new PsiReference[0];
-                        }
-
-                        MethodReference methodReference = (MethodReference) parent;
-                        String methodName = methodReference.getName();
+                    if (methodReference == null) {
+                        return PsiReference.EMPTY_ARRAY;
+                    }
 
-                        if (methodReference.getFirstPsiChild() instanceof Variable) {
-                            Variable variable = (Variable) methodReference.getFirstPsiChild();
-                            String signature = variable.getSignature();
+                    String methodName = methodReference.getName();
+                    if (methodReference.getFirstPsiChild() instanceof Variable) {
+                        Variable variable = (Variable) methodReference.getFirstPsiChild();
+                        String signature = variable.getSignature();
+                        try {
                             Collection<? extends PhpNamedElement> bySignature = PhpIndex.getInstance(element.getProject()).getBySignature(signature);
-                            try {
-                                for (PhpNamedElement el : bySignature) {
-                                    if (el.getFQN().equals(ICON_FACTORY) && methodName.equals("getIcon")) {
-                                        return new PsiReference[]{new IconReference(stringLiteralExpression)};
-                                    }
+                            for (PhpNamedElement el : bySignature) {
+                                String fqn = el.getFQN();
+                                if (fqn.equals(ICON_FACTORY) && methodName.equals("getIcon")) {
+                                    return new PsiReference[]{new IconReference(stringLiteralExpression)};
                                 }
-                            } catch (RuntimeException e) {
-                                // invalid index signature, skip
                             }
+                        } catch (RuntimeException e) {
+                            // invalid index signature, skip
                         }
+                    }
 
-                        String className = PhpLangUtil.getClassName(stringLiteralExpression);
-                        if (methodName != null && className != null && methodName.equals("getIcon") && className.equals(ICON_FACTORY)) {
-                            return new PsiReference[]{new IconReference(stringLiteralExpression)};
-                        }
-
-                        return new PsiReference[0];
+                    String className = PhpLangUtil.getClassName(stringLiteralExpression);
+                    if (methodName != null && className != null && methodName.equals("getIcon") && className.equals(ICON_FACTORY)) {
+                        return new PsiReference[]{new IconReference(stringLiteralExpression)};
                     }
+
+                    return PsiReference.EMPTY_ARRAY;
                 }
+            }
         );
     }
 }

typo3-cms/src/test/java/com/cedricziel/idea/typo3/icons/IconReferenceProviderTest.java

@@ -1,11 +1,11 @@
 package com.cedricziel.idea.typo3.icons;
 
+import com.cedricziel.idea.typo3.AbstractTestCase;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
-import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 
 
-public class IconReferenceProviderTest extends LightCodeInsightFixtureTestCase {
+public class IconReferenceProviderTest extends AbstractTestCase {
     @Override
     protected String getTestDataPath() {
         return "testData/com/cedricziel/idea/typo3/icons";

typo3-cms/testData/com/cedricziel/idea/typo3/icons/general_utility_icon_provider_test.php

@@ -7,9 +7,19 @@ class IconFactory
     }
 }
 
+namespace TYPO3\CMS\Core\Utility {
+    class GeneralUtility
+    {
+        public static function makeInstance()
+        {
+        }
+    }
+}
+
 namespace {
-    use TYPO3\CMS\Core\Utility\GeneralUtility;
+
     use TYPO3\CMS\Core\Imaging\IconFactory;
+    use TYPO3\CMS\Core\Utility\GeneralUtility;
 
     $iconFactory = GeneralUtility::makeInstance(IconFactory::class);