fix global twig name navigation in php files, because of some api changes Haehnchen#450, Haehnchen#456

Haehnchen · Haehnchen · commit 9100dee8b6a2 · 2015-08-22T15:41:58.000+02:00
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTemplateGlobalStringGoToDeclarationHandler.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTemplateGlobalStringGoToDeclarationHandler.java
@@ -6,10 +6,12 @@
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.PsiElement;
 import com.jetbrains.php.lang.PhpLanguage;
-import com.jetbrains.php.lang.lexer.PhpTokenTypes;
+import com.jetbrains.php.lang.psi.PhpFile;
+import com.jetbrains.php.lang.psi.elements.StringLiteralExpression;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.TwigHelper;
 import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils;
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -21,27 +23,35 @@ public class PhpTemplateGlobalStringGoToDeclarationHandler implements GotoDeclar
     @Override
     public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int i, Editor editor) {
 
+        if(!(psiElement.getContainingFile() instanceof PhpFile) || !(psiElement.getContext() instanceof StringLiteralExpression)) {
+            return new PsiElement[0];
+        }
+
         if(!Symfony2ProjectComponent.isEnabled(psiElement) || !PlatformPatterns.or(
             PlatformPatterns
-                .psiElement(PhpTokenTypes.STRING_LITERAL)
+                .psiElement(StringLiteralExpression.class)
                 .withText(PlatformPatterns.or(
                     PlatformPatterns.string().endsWith("twig'"),
                     PlatformPatterns.string().endsWith("twig\"")
                 ))
                 .withLanguage(PhpLanguage.INSTANCE),
             PlatformPatterns
-                .psiElement(PhpTokenTypes.STRING_LITERAL_SINGLE_QUOTE)
+                .psiElement(StringLiteralExpression.class)
                 .withText(PlatformPatterns.or(
                     PlatformPatterns.string().endsWith("twig'"),
                     PlatformPatterns.string().endsWith("twig\"")
                 ))
                 .withLanguage(PhpLanguage.INSTANCE)
-            ).accepts(psiElement)) {
+            ).accepts(psiElement.getContext())) {
 
             return new PsiElement[0];
         }
 
         String templateName = PsiElementUtils.getText(psiElement);
+        if(StringUtils.isBlank(templateName)) {
+            return new PsiElement[0];
+        }
+
         return TwigHelper.getTemplatePsiElements(psiElement.getProject(), templateName);
     }
 
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/PhpTemplateGlobalStringGoToDeclarationHandlerTest.java b/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/PhpTemplateGlobalStringGoToDeclarationHandlerTest.java
@@ -0,0 +1,25 @@
+package fr.adrienbrault.idea.symfony2plugin.tests.templating;
+
+import com.jetbrains.php.lang.PhpFileType;
+import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
+
+/**
+ * @author Daniel Espendiller <daniel@espendiller.net>
+ * @see fr.adrienbrault.idea.symfony2plugin.templating.PhpTemplateGlobalStringGoToDeclarationHandler
+ */
+public class PhpTemplateGlobalStringGoToDeclarationHandlerTest extends SymfonyLightCodeInsightFixtureTestCase {
+
+    public void setUp() throws Exception {
+        super.setUp();
+
+        createDummyFiles(
+            "app/Resources/views/layout.html.twig"
+        );
+    }
+
+    public void testTemplateGoTo() {
+        assertNavigationContainsFile(PhpFileType.INSTANCE, "<?php '::layout.<caret>html.twig'", "layout.html.twig");
+        assertNavigationContainsFile(PhpFileType.INSTANCE, "<?php \"::layout.<caret>html.twig\"", "layout.html.twig");
+        assertNavigationContainsFile(PhpFileType.INSTANCE, "<?php 'layout.<caret>html.twig'", "layout.html.twig");
+    }
+}
