2020.3 support: removed go_to_declaration_handler for sets because now it works out of the box

slapoguzov · slapoguzov · commit 2c507c1c5f63 · 2020-12-02T13:16:32.000+03:00
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java
@@ -127,17 +127,6 @@ public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int offset,
             targets.addAll(this.getMacros(psiElement));
         }
 
-        // {% set foo  %}
-        // {% set foo = bar %}
-        if (PlatformPatterns
-            .psiElement(TwigTokenTypes.IDENTIFIER)
-            .withParent(
-                PlatformPatterns.psiElement(TwigElementTypes.PRINT_BLOCK)
-            ).withLanguage(TwigLanguage.INSTANCE).accepts(psiElement)) {
-
-            targets.addAll(getSets(psiElement));
-        }
-
         // {{ foo.fo<caret>o }}
         if (TwigPattern.getTypeCompletionPattern().accepts(psiElement)
             || TwigPattern.getPrintBlockFunctionPattern().accepts(psiElement)
@@ -466,23 +455,6 @@ private Collection<PsiElement> getFunctions(@NotNull PsiElement psiElement) {
         return Arrays.asList(PhpElementsUtil.getPsiElementsBySignature(psiElement.getProject(), functions.get(funcName).getSignature()));
     }
 
-    @NotNull
-    private Collection<PsiElement> getSets(@NotNull PsiElement psiElement) {
-        String funcName = psiElement.getText();
-        for(String twigSet: TwigUtil.getSetDeclaration(psiElement.getContainingFile())) {
-            if(twigSet.equals(funcName)) {
-                // @TODO: drop regex
-                return Arrays.asList(PsiTreeUtil.collectElements(psiElement.getContainingFile(), psiElement1 ->
-                    PlatformPatterns.psiElement(TwigTagWithFileReference.class)
-                    .accepts(psiElement1) && psiElement1.getText()
-                    .matches("\\{%\\s?set\\s?" + Pattern.quote(funcName) + "\\s?.*"))
-                );
-            }
-        }
-
-        return Collections.emptyList();
-    }
-
     @NotNull
     private Collection<PsiElement> getMacros(@NotNull PsiElement psiElement) {
         String funcName = psiElement.getText();
