whitelist twig "set tag" for twig extension references #600

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/TwigHelper.java

@@ -722,7 +722,10 @@ public static ElementPattern<PsiElement> getCompletablePattern() {
                 ),
                 PlatformPatterns.psiElement()
             )
-            .withParent(PlatformPatterns.psiElement(TwigElementTypes.PRINT_BLOCK))
+            .withParent(PlatformPatterns.or(
+                PlatformPatterns.psiElement(TwigElementTypes.PRINT_BLOCK),
+                PlatformPatterns.psiElement(TwigElementTypes.SET_TAG)
+            ))
             .withLanguage(TwigLanguage.INSTANCE);
     }
 

src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToLocalDeclarationHandler.java

@@ -74,9 +74,10 @@ public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int i, Edit
         if (PlatformPatterns
             .psiElement(TwigTokenTypes.IDENTIFIER)
             .beforeLeaf(PlatformPatterns.psiElement(TwigTokenTypes.LBRACE))
-            .withParent(
-                PlatformPatterns.psiElement(TwigElementTypes.PRINT_BLOCK)
-            ).withLanguage(TwigLanguage.INSTANCE).accepts(psiElement)) {
+            .withParent(PlatformPatterns.or(
+                PlatformPatterns.psiElement(TwigElementTypes.PRINT_BLOCK),
+                PlatformPatterns.psiElement(TwigElementTypes.SET_TAG)
+            )).withLanguage(TwigLanguage.INSTANCE).accepts(psiElement)) {
 
             psiElements.addAll(Arrays.asList(this.getFunctions(psiElement)));
         }

tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigFilterCompletionContributorTest.java

@@ -1,6 +1,7 @@
 package fr.adrienbrault.idea.symfony2plugin.tests.templating;
 
 import com.intellij.patterns.PlatformPatterns;
+import com.jetbrains.php.lang.psi.elements.Function;
 import com.jetbrains.php.lang.psi.elements.Method;
 import com.jetbrains.twig.TwigFileType;
 import com.jetbrains.twig.elements.TwigElementTypes;
@@ -159,4 +160,13 @@ public void testControllerReferences() {
         assertCompletionContains(TwigFileType.INSTANCE, "{% render \"<caret>\" %}", "FooBundle:Foo:bar");
         assertNavigationMatch(TwigFileType.INSTANCE, "{% render \"FooBundl<caret>e:Foo:bar\" %}", PlatformPatterns.psiElement(Method.class).withName("barAction"));
     }
+
+    /**
+     * @see fr.adrienbrault.idea.symfony2plugin.templating.TwigTemplateCompletionContributor
+     * @see fr.adrienbrault.idea.symfony2plugin.templating.TwigTemplateGoToLocalDeclarationHandler
+     */
+    public void testSetTagIsAvailableForFunctionReferences() {
+        assertCompletionContains(TwigFileType.INSTANCE, "{% set = <caret> %}", "json_bar");
+        assertNavigationMatch(TwigFileType.INSTANCE, "{% set = json_<caret>bar() %}", PlatformPatterns.psiElement(Function.class));
+    }
 }