Merge pull request #1115 from Haehnchen/feature/twig-array-usage

Haehnchen · web-flow · commit 3048700a6bc0 · 2017-12-18T21:04:12.000+01:00
cleanup Twig file array usage
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/completion/xml/XmlGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/completion/xml/XmlGotoCompletionRegistrar.java
@@ -34,10 +34,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -312,9 +309,7 @@ public Collection<PsiElement> getPsiTargets(PsiElement element) {
                         return Collections.emptyList();
                     }
 
-                    return Arrays.asList(
-                        TwigUtil.getTemplatePsiElements(getElement().getProject(), xmlAttributeValue)
-                    );
+                    return new HashSet<>(TwigUtil.getTemplatePsiElements(getElement().getProject(), xmlAttributeValue));
                 }
             };
         }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlGoToDeclarationHandler.java b/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlGoToDeclarationHandler.java
@@ -74,7 +74,7 @@ public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int i, Edit
                 }
 
                 if(psiText.endsWith(".twig") || psiText.endsWith(".php")) {
-                    targets.addAll(templateGoto(psiElement, psiText));
+                    targets.addAll(TwigUtil.getTemplatePsiElements(psiElement.getProject(), psiText));
                 }
 
                 if(psiText.matches("^[\\w_.]+") && getGlobalServiceStringPattern().accepts(psiElement)) {
@@ -224,11 +224,6 @@ private Collection<PsiElement> parameterGoToDeclaration(@NotNull PsiElement psiE
         return targets;
     }
 
-    @NotNull
-    private Collection<PsiFile> templateGoto(@NotNull PsiElement psiElement, @NotNull String templateName) {
-        return Arrays.asList(TwigUtil.getTemplatePsiElements(psiElement.getProject(), templateName));
-    }
-
     @NotNull
     private Collection<PsiElement> constantGoto(@NotNull PsiElement psiElement, @NotNull String tagName) {
         String constantName = tagName.substring(11);
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/external/locator/TwigFileToolboxTargetLocator.java b/src/fr/adrienbrault/idea/symfony2plugin/external/locator/TwigFileToolboxTargetLocator.java
@@ -7,6 +7,7 @@
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -27,8 +28,6 @@ public Collection<PsiElement> getTargets(@NotNull TargetLocatorParameter paramet
             return Collections.emptyList();
         }
 
-        Collection<PsiElement> psiElements = new HashSet<>();
-        Collections.addAll(psiElements, TwigUtil.getTemplatePsiElements(parameter.getProject(), target));
-        return psiElements;
+        return new HashSet<>(TwigUtil.getTemplatePsiElements(parameter.getProject(), target));
     }
 }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TwigToolboxProvider.java b/src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TwigToolboxProvider.java
@@ -13,6 +13,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -38,9 +39,7 @@ public Collection<PsiElement> getPsiTargets(@NotNull PhpToolboxDeclarationHandle
             return Collections.emptyList();
         }
 
-        Collection<PsiElement> psiElements = new HashSet<>();
-        Collections.addAll(psiElements, TwigUtil.getTemplatePsiElements(parameter.getProject(), parameter.getContents()));
-        return psiElements;
+        return new HashSet<>(TwigUtil.getTemplatePsiElements(parameter.getProject(), parameter.getContents()));
     }
 
     @NotNull
@@ -59,7 +58,6 @@ public Icon getIcon() {
                 return TwigIcons.TwigFileIcon;
             }
 
-            @Nullable
             @Override
             public String getDescription() {
                 return "Templates";
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/navigation/TemplateFileContributor.java b/src/fr/adrienbrault/idea/symfony2plugin/navigation/TemplateFileContributor.java
@@ -8,7 +8,6 @@
 import icons.TwigIcons;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
 import java.util.Collection;
 
 /**
@@ -33,7 +32,8 @@ public NavigationItem[] getItemsByName(String templateName, String s2, Project p
             return new NavigationItem[0];
         }
 
-        return Arrays.stream(TwigUtil.getTemplatePsiElements(project, templateName))
+        return TwigUtil.getTemplatePsiElements(project, templateName)
+            .stream()
             .map(psiFile ->
                 new NavigationItemEx(psiFile, templateName, TwigIcons.TwigFileIcon, "Template", false)
             )
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/navigation/controller/TemplatesControllerRelatedGotoCollector.java b/src/fr/adrienbrault/idea/symfony2plugin/navigation/controller/TemplatesControllerRelatedGotoCollector.java
@@ -2,6 +2,7 @@
 
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag;
@@ -19,10 +20,7 @@
 import icons.TwigIcons;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Consumer;
 
 /**
@@ -57,7 +55,7 @@ public void collectGotoRelatedItems(ControllerActionGotoRelatedCollectorParamete
                 String resolveString = PhpElementsUtil.getStringValue(psiElement);
                 if(resolveString != null && !uniqueTemplates.contains(resolveString)) {
                     uniqueTemplates.add(resolveString);
-                    for(PsiElement templateTarget: TwigUtil.getTemplatePsiElements(parameter.getProject(), resolveString)) {
+                    for(PsiFile templateTarget: TwigUtil.getTemplatePsiElements(parameter.getProject(), resolveString)) {
                         parameter.add(new RelatedPopupGotoLineMarker.PopupGotoRelatedItem(templateTarget, resolveString).withIcon(TwigIcons.TwigFileIcon, Symfony2Icons.TWIG_LINE_MARKER));
                     }
                 }
@@ -68,7 +66,7 @@ public void collectGotoRelatedItems(ControllerActionGotoRelatedCollectorParamete
     /**
      *  Visit every possible template on given method: eg Annotations @Template()
      */
-    public static void visitMethodTemplateNames(@NotNull Method method, @NotNull Consumer<Pair<String, PsiElement[]>> consumer) {
+    public static void visitMethodTemplateNames(@NotNull Method method, @NotNull Consumer<Pair<String, Collection<PsiElement>>> consumer) {
         // on @Template annotation
         PhpDocComment phpDocComment = method.getDocComment();
         if(phpDocComment != null) {
@@ -81,7 +79,7 @@ public static void visitMethodTemplateNames(@NotNull Method method, @NotNull Con
                         // resolve annotation and check for template
                         PhpClass phpClass = AnnotationBackportUtil.getAnnotationReference(phpDocTag, importMap);
                         if(phpClass != null && PhpElementsUtil.isEqualClassName(phpClass, TwigUtil.TEMPLATE_ANNOTATION_CLASS)) {
-                            Pair<String, PsiElement[]> templateAnnotationFiles = TwigUtil.getTemplateAnnotationFiles(phpDocTag);
+                            Pair<String, Collection<PsiElement>> templateAnnotationFiles = TwigUtil.getTemplateAnnotationFiles(phpDocTag);
                             if(templateAnnotationFiles != null) {
                                 consumer.accept(Pair.create(templateAnnotationFiles.getFirst(), templateAnnotationFiles.getSecond()));
                             }
@@ -93,7 +91,10 @@ public static void visitMethodTemplateNames(@NotNull Method method, @NotNull Con
 
         // on method name
         for (String templateName : TwigUtil.getControllerMethodShortcut(method)) {
-            consumer.accept(Pair.create(templateName, TwigUtil.getTemplatePsiElements(method.getProject(), templateName)));
+            consumer.accept(Pair.create(
+                templateName,
+                new HashSet<>(TwigUtil.getTemplatePsiElements(method.getProject(), templateName))
+            ));
         }
     }
 }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/profiler/widget/action/SymfonyProfilerWidgetActions.java b/src/fr/adrienbrault/idea/symfony2plugin/profiler/widget/action/SymfonyProfilerWidgetActions.java
@@ -20,8 +20,7 @@
 import javax.swing.*;
 import java.awt.*;
 import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
+import java.util.Collection;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
@@ -41,11 +40,11 @@ public TemplateAction(Project project, @Nullable String text) {
 
         @Override
         public void actionPerformed(AnActionEvent e) {
-            List<PsiFile> psiFiles = Arrays.asList(TwigUtil.getTemplatePsiElements(project, templateName));
+            Collection<PsiFile> psiFiles = TwigUtil.getTemplatePsiElements(project, templateName);
 
             // @TODO: multiple targets?
             if(psiFiles.size() > 0) {
-                IdeHelper.navigateToPsiElement(psiFiles.get(0));
+                IdeHelper.navigateToPsiElement(psiFiles.iterator().next());
             }
         }
     }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTemplateMissingInspection.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTemplateMissingInspection.java
@@ -68,7 +68,7 @@ private String getTemplateNameIfMissing(@NotNull PsiElement psiElement) {
             return null;
         }
 
-        if(TwigUtil.getTemplatePsiElements(psiElement.getProject(), templateName).length > 0) {
+        if(TwigUtil.getTemplateFiles(psiElement.getProject(), templateName).size() > 0) {
             return null;
         }
 
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TemplateGotoCompletionRegistrar.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/TemplateGotoCompletionRegistrar.java
@@ -7,9 +7,9 @@
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
@@ -33,8 +33,6 @@ public Collection<PsiElement> getPsiTargets(PsiElement element) {
             return Collections.emptyList();
         }
 
-        return Arrays.asList(
-            TwigUtil.getTemplatePsiElements(getElement().getProject(), templateName)
-        );
+        return new HashSet<>(TwigUtil.getTemplatePsiElements(getElement().getProject(), templateName));
     }
 }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java
@@ -49,9 +49,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -138,7 +136,7 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
 
                     // {% from _self
                     if(psiElement.getNode().getElementType() == TwigTokenTypes.RESERVED_ID) {
-                        attachLookupElements(resultSet, new PsiFile[]{psiElement.getContainingFile()});
+                        attachLookupElements(resultSet, Collections.singletonList(psiElement.getContainingFile()));
                         return;
                     }
 
@@ -147,15 +145,15 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
                         return;
                     }
 
-                    PsiFile[] twigFilesByName = TwigUtil.getTemplatePsiElements(parameters.getPosition().getProject(), templateName);
-                    if(twigFilesByName.length == 0) {
+                    Collection<PsiFile> twigFilesByName = TwigUtil.getTemplatePsiElements(parameters.getPosition().getProject(), templateName);
+                    if(twigFilesByName.size() == 0) {
                         return;
                     }
 
                     attachLookupElements(resultSet, twigFilesByName);
                 }
 
-                private void attachLookupElements(@NotNull CompletionResultSet resultSet, PsiFile[] psiFiles) {
+                private void attachLookupElements(@NotNull CompletionResultSet resultSet, Collection<PsiFile> psiFiles) {
                     for (PsiFile psiFile : psiFiles) {
                         for (TwigMacroTagInterface entry: TwigUtil.getMacros(psiFile)) {
                             resultSet.addElement(LookupElementBuilder.create(entry.getName()).withTypeText(entry.getParameters(), true).withIcon(TwigIcons.TwigFileIcon));
@@ -576,7 +574,7 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
             CompletionResultSet myResultSet = resultSet.withPrefixMatcher(blockNamePrefix);
 
             // collect blocks in all related files
-            Pair<PsiFile[], Boolean> scopedContext = TwigUtil.findScopedFile(position);
+            Pair<Collection<PsiFile>, Boolean> scopedContext = TwigUtil.findScopedFile(position);
 
             myResultSet.addAllElements(TwigUtil.getBlockLookupElements(
                 position.getProject(),
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java
@@ -6,7 +6,10 @@
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.patterns.PlatformPatterns;
-import com.intellij.psi.*;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiManager;
+import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.jetbrains.php.PhpIndex;
@@ -389,7 +392,7 @@ private Collection<PsiElement> getSeeDocTagTargets(@NotNull PsiElement psiElemen
             String content = matcher.group(1);
 
             if(content.toLowerCase().endsWith(".twig")) {
-                ContainerUtil.addAll(psiElements, TwigUtil.getTemplatePsiElements(psiElement.getProject(), content));
+                psiElements.addAll(TwigUtil.getTemplatePsiElements(psiElement.getProject(), content));
             }
 
             psiElements.addAll(PhpElementsUtil.getClassesInterface(psiElement.getProject(), content));
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigTemplateMissingInspection.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TwigTemplateMissingInspection.java
@@ -2,13 +2,16 @@
 
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.ProblemsHolder;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern;
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Collection;
+
 /**
  * {% include 'f<caret>.html.twig' %}
  * {{ include('f<caret>.html.twig') }}
@@ -40,8 +43,8 @@ public void visitElement(PsiElement element) {
     private void invoke(@NotNull final PsiElement element, @NotNull ProblemsHolder holder) {
         String templateName = element.getText();
 
-        PsiElement[] psiElements = TwigUtil.getTemplatePsiElements(element.getProject(), templateName);
-        if(psiElements.length > 0)  {
+        Collection<VirtualFile> psiElements = TwigUtil.getTemplateFiles(element.getProject(), templateName);
+        if(psiElements.size() > 0)  {
             return;
         }
 
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationAnnotator.java b/src/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationAnnotator.java
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationGotoHandler.java b/src/fr/adrienbrault/idea/symfony2plugin/twig/annotation/TemplateAnnotationGotoHandler.java
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigBlockUtil.java b/src/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigBlockUtil.java
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigFileUtil.java b/src/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigFileUtil.java
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTempTest.java b/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTempTest.java

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,7 @@`
`34`	`34`	`import org.jetbrains.annotations.NotNull;`
`35`	`35`	`import org.jetbrains.annotations.Nullable;`
`36`	`36`
`37`		`-import java.util.ArrayList;`
`38`		`-import java.util.Arrays;`
`39`		`-import java.util.Collection;`
`40`		`-import java.util.Collections;`
	`37`	`+import java.util.*;`
`41`	`38`	`import java.util.stream.Collectors;`
`42`	`39`
`43`	`40`	`/**`
`@@ -312,9 +309,7 @@ public Collection<PsiElement> getPsiTargets(PsiElement element) {`
`312`	`309`	`return Collections.emptyList();`
`313`	`310`	`}`
`314`	`311`
`315`		`- return Arrays.asList(`
`316`		`- TwigUtil.getTemplatePsiElements(getElement().getProject(), xmlAttributeValue)`
`317`		`- );`
	`312`	`+ return new HashSet<>(TwigUtil.getTemplatePsiElements(getElement().getProject(), xmlAttributeValue));`
`318`	`313`	`}`
`319`	`314`	`};`
`320`	`315`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int i, Edit`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`if(psiText.endsWith(".twig") \|\| psiText.endsWith(".php")) {`
`77`		`- targets.addAll(templateGoto(psiElement, psiText));`
	`77`	`+ targets.addAll(TwigUtil.getTemplatePsiElements(psiElement.getProject(), psiText));`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`if(psiText.matches("^[\\w_.]+") && getGlobalServiceStringPattern().accepts(psiElement)) {`
`@@ -224,11 +224,6 @@ private Collection<PsiElement> parameterGoToDeclaration(@NotNull PsiElement psiE`
`224`	`224`	`return targets;`
`225`	`225`	`}`
`226`	`226`
`227`		`- @NotNull`
`228`		`- private Collection<PsiFile> templateGoto(@NotNull PsiElement psiElement, @NotNull String templateName) {`
`229`		`- return Arrays.asList(TwigUtil.getTemplatePsiElements(psiElement.getProject(), templateName));`
`230`		`- }`
`231`		`-`
`232`	`227`	`@NotNull`
`233`	`228`	`private Collection<PsiElement> constantGoto(@NotNull PsiElement psiElement, @NotNull String tagName) {`
`234`	`229`	`String constantName = tagName.substring(11);`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;`
`8`	`8`	`import org.jetbrains.annotations.NotNull;`
`9`	`9`
	`10`	`+import java.util.Arrays;`
`10`	`11`	`import java.util.Collection;`
`11`	`12`	`import java.util.Collections;`
`12`	`13`	`import java.util.HashSet;`
`@@ -27,8 +28,6 @@ public Collection<PsiElement> getTargets(@NotNull TargetLocatorParameter paramet`
`27`	`28`	`return Collections.emptyList();`
`28`	`29`	`}`
`29`	`30`
`30`		`- Collection<PsiElement> psiElements = new HashSet<>();`
`31`		`- Collections.addAll(psiElements, TwigUtil.getTemplatePsiElements(parameter.getProject(), target));`
`32`		`- return psiElements;`
	`31`	`+ return new HashSet<>(TwigUtil.getTemplatePsiElements(parameter.getProject(), target));`
`33`	`32`	`}`
`34`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`import icons.TwigIcons;`
`9`	`9`	`import org.jetbrains.annotations.NotNull;`
`10`	`10`
`11`		`-import java.util.Arrays;`
`12`	`11`	`import java.util.Collection;`
`13`	`12`
`14`	`13`	`/**`
`@@ -33,7 +32,8 @@ public NavigationItem[] getItemsByName(String templateName, String s2, Project p`
`33`	`32`	`return new NavigationItem[0];`
`34`	`33`	`}`
`35`	`34`
`36`		`- return Arrays.stream(TwigUtil.getTemplatePsiElements(project, templateName))`
	`35`	`+ return TwigUtil.getTemplatePsiElements(project, templateName)`
	`36`	`+ .stream()`
`37`	`37`	`.map(psiFile ->`
`38`	`38`	`new NavigationItemEx(psiFile, templateName, TwigIcons.TwigFileIcon, "Template", false)`
`39`	`39`	`)`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private String getTemplateNameIfMissing(@NotNull PsiElement psiElement) {`
`68`	`68`	`return null;`
`69`	`69`	`}`
`70`	`70`
`71`		`- if(TwigUtil.getTemplatePsiElements(psiElement.getProject(), templateName).length > 0) {`
	`71`	`+ if(TwigUtil.getTemplateFiles(psiElement.getProject(), templateName).size() > 0) {`
`72`	`72`	`return null;`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@`
`7`	`7`	`import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;`
`8`	`8`	`import org.jetbrains.annotations.NotNull;`
`9`	`9`
`10`		`-import java.util.Arrays;`
`11`	`10`	`import java.util.Collection;`
`12`	`11`	`import java.util.Collections;`
	`12`	`+import java.util.HashSet;`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* @author Daniel Espendiller <daniel@espendiller.net>`
`@@ -33,8 +33,6 @@ public Collection<PsiElement> getPsiTargets(PsiElement element) {`
`33`	`33`	`return Collections.emptyList();`
`34`	`34`	`}`
`35`	`35`
`36`		`- return Arrays.asList(`
`37`		`- TwigUtil.getTemplatePsiElements(getElement().getProject(), templateName)`
`38`		`- );`
	`36`	`+ return new HashSet<>(TwigUtil.getTemplatePsiElements(getElement().getProject(), templateName));`
`39`	`37`	`}`
`40`	`38`	`}`