Add getContainingFile() to TwigFileVariableCollectorParameter to cache file resolve

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigTypeResolveUtil.java

@@ -9,6 +9,7 @@
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.psi.formatter.FormatterUtil;
 import com.intellij.psi.tree.IElementType;
@@ -348,17 +349,18 @@ public static Map<String, PsiVariable> collectScopeVariables(@NotNull PsiElement
 
     @NotNull
     public static Map<String, PsiVariable> collectScopeVariables(@NotNull PsiElement psiElement, @NotNull Set<VirtualFile> visitedFiles) {
-        VirtualFile virtualFile = psiElement.getContainingFile().getVirtualFile();
-        if(visitedFiles.contains(virtualFile)) {
+        PsiFile containingFile = psiElement.getContainingFile();
+        VirtualFile virtualFile = containingFile.getVirtualFile();
+        if (visitedFiles.contains(virtualFile)) {
             return Collections.emptyMap();
         }
 
         visitedFiles.add(virtualFile);
 
         Map<String, VariableData> controllerVars = new HashMap<>();
 
-        TwigFileVariableCollectorParameter collectorParameter = new TwigFileVariableCollectorParameter(psiElement, visitedFiles);
-        for(TwigFileVariableCollector collector: TWIG_FILE_VARIABLE_COLLECTORS.getExtensions()) {
+        TwigFileVariableCollectorParameter collectorParameter = new TwigFileVariableCollectorParameter(psiElement, containingFile, visitedFiles);
+        for (TwigFileVariableCollector collector: TWIG_FILE_VARIABLE_COLLECTORS.getExtensions()) {
             Map<String, Set<String>> globalVarsScope = new HashMap<>();
             collector.collect(collectorParameter, globalVarsScope);
 

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigFileVariableCollectorParameter.java

@@ -3,6 +3,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Set;
@@ -14,12 +15,13 @@ public class TwigFileVariableCollectorParameter {
 
     private final PsiElement psiElement;
     private final Set<VirtualFile> visitedFiles;
-    private final Project project
-        ;
+    private final Project project;
+    private final PsiFile containingFile;
 
-    public TwigFileVariableCollectorParameter(@NotNull PsiElement psiElement, @NotNull Set<VirtualFile> visitedFiles) {
+    public TwigFileVariableCollectorParameter(@NotNull PsiElement psiElement, @NotNull PsiFile containingFile, @NotNull Set<VirtualFile> visitedFiles) {
         this.psiElement = psiElement;
         this.project = psiElement.getProject();
+        this.containingFile = containingFile;
         this.visitedFiles = visitedFiles;
     }
 
@@ -28,7 +30,12 @@ public PsiElement getElement() {
     }
 
     public Project getProject() {
-        return psiElement.getProject();
+        return project;
+    }
+
+    @NotNull
+    public PsiFile getContainingFile() {
+        return containingFile;
     }
 
     public Set<VirtualFile> getVisitedFiles() {

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/FileDocVariableCollector.java

@@ -15,7 +15,7 @@
 public class FileDocVariableCollector implements TwigFileVariableCollector {
     @Override
     public void collect(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, Set<String>> variables) {
-        PsiFile containingFile = parameter.getElement().getContainingFile();
+        PsiFile containingFile = parameter.getContainingFile();
         if(!(containingFile instanceof TwigFile)) {
             return;
         }

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/IncludeVariableCollector.java

@@ -54,7 +54,7 @@ private record IncludeContext(@NotNull Collection<IncludeArgument> arguments, bo
 
     @Override
     public void collectPsiVariables(@NotNull final TwigFileVariableCollectorParameter parameter, @NotNull final Map<String, PsiVariable> variables) {
-        PsiFile psiFile = parameter.getElement().getContainingFile();
+        PsiFile psiFile = parameter.getContainingFile();
         if (!(psiFile instanceof TwigFile) || PsiTreeUtil.getChildOfType(psiFile, TwigExtendsTag.class) != null) {
             return;
         }

src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerDocVariableCollector.java

@@ -34,7 +34,7 @@ public class ControllerDocVariableCollector implements TwigFileVariableCollector
 
     @Override
     public void collectPsiVariables(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
-        PsiFile psiFile = parameter.getElement().getContainingFile();
+        PsiFile psiFile = parameter.getContainingFile();
         if(!(psiFile instanceof TwigFile)) {
             return;
         }

src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerVariableCollector.java

@@ -16,7 +16,7 @@
 public class ControllerVariableCollector implements TwigFileVariableCollector {
     @Override
     public void collectPsiVariables(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
-        PsiFile psiFile = parameter.getElement().getContainingFile();
+        PsiFile psiFile = parameter.getContainingFile();
         if(!(psiFile instanceof TwigFile)) {
             return;
         }

src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/UxComponentVariableCollector.java

@@ -19,7 +19,7 @@
  */
 public class UxComponentVariableCollector implements TwigFileVariableCollector {
     public void collectPsiVariables(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
-        PsiFile psiFile = parameter.getElement().getContainingFile();
+        PsiFile psiFile = parameter.getContainingFile();
         if (!(psiFile instanceof TwigFile)) {
             return;
         }

src/main/kotlin/fr/adrienbrault/idea/symfony2plugin/ux/variable/collector/UxComponentVariableCollector.kt

@@ -14,7 +14,7 @@ import fr.adrienbrault.idea.symfony2plugin.util.UxUtil
 class UxComponentVariableCollector : TwigFileVariableCollector {
     override fun collectPsiVariables(parameter: TwigFileVariableCollectorParameter, variables: MutableMap<String, PsiVariable>) {
         val project = parameter.project
-        val componentClassesForTemplateFile = UxUtil.getComponentClassesForTemplateFile(project, parameter.element.containingFile)
+        val componentClassesForTemplateFile = UxUtil.getComponentClassesForTemplateFile(project, parameter.containingFile)
 
         if (componentClassesForTemplateFile.isNotEmpty()) {
             variables["attributes"] = PsiVariable("\\Symfony\\UX\\TwigComponent\\ComponentAttributes")