merge TwigFileVariableCollectorExt interface implementation into TwigFileVariableCollector

Author: Haehnchen

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

@@ -230,10 +230,7 @@ public static Map<String, PsiVariable> collectScopeVariables(@NotNull PsiElement
         TwigFileVariableCollectorParameter collectorParameter = new TwigFileVariableCollectorParameter(psiElement, visitedFiles);
         for(TwigFileVariableCollector collector: TWIG_FILE_VARIABLE_COLLECTORS.getExtensions()) {
             collector.collect(collectorParameter, globalVars);
-
-            if(collector instanceof TwigFileVariableCollector.TwigFileVariableCollectorExt) {
-                ((TwigFileVariableCollector.TwigFileVariableCollectorExt) collector).collectVars(collectorParameter, controllerVars);
-            }
+            collector.collectPsiVariables(collectorParameter, controllerVars);
         }
 
         // globals first

src/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigFileVariableCollector.java

@@ -13,7 +13,5 @@ public interface TwigFileVariableCollector {
 
     default void collect(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, Set<String>> variables) {}
 
-    interface TwigFileVariableCollectorExt {
-        void collectVars(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables);
-    }
+    default void collectPsiVariables(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {}
 }

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

@@ -12,7 +12,6 @@
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class FileDocVariableCollector implements TwigFileVariableCollector {
-
     @Override
     public void collect(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, Set<String>> variables) {
         if(!(parameter.getElement().getContainingFile() instanceof TwigFile)) {
@@ -30,5 +29,4 @@ private static Map<String, Set<String>> convertHashMapToTypeSet(Map<String, Stri
 
         return globalVars;
     }
-
 }

src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/GlobalExtensionVariableCollector.java

@@ -18,9 +18,9 @@
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
-public class GlobalExtensionVariableCollector implements TwigFileVariableCollector, TwigFileVariableCollector.TwigFileVariableCollectorExt {
+public class GlobalExtensionVariableCollector implements TwigFileVariableCollector {
     @Override
-    public void collectVars(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
+    public void collectPsiVariables(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
         for(PhpClass phpClass : TwigUtil.getTwigExtensionClasses(parameter.getProject())) {
             if(!PhpUnitUtil.isPhpUnitTestFile(phpClass.getContainingFile())) {
                 Method method = phpClass.findMethodByName("getGlobals");

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

@@ -33,12 +33,11 @@
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
-public class IncludeVariableCollector implements TwigFileVariableCollector, TwigFileVariableCollector.TwigFileVariableCollectorExt {
+public class IncludeVariableCollector implements TwigFileVariableCollector {
 
     @Override
-    public void collectVars(@NotNull final TwigFileVariableCollectorParameter parameter, @NotNull final Map<String, PsiVariable> variables) {
-
-        final PsiFile psiFile = parameter.getElement().getContainingFile();
+    public void collectPsiVariables(@NotNull final TwigFileVariableCollectorParameter parameter, @NotNull final Map<String, PsiVariable> variables) {
+        PsiFile psiFile = parameter.getElement().getContainingFile();
         if(!(psiFile instanceof TwigFile) || PsiTreeUtil.getChildOfType(psiFile, TwigExtendsTag.class) != null) {
             return;
         }

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

@@ -21,13 +21,13 @@
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
-public class ControllerDocVariableCollector implements TwigFileVariableCollector, TwigFileVariableCollector.TwigFileVariableCollectorExt {
+public class ControllerDocVariableCollector implements TwigFileVariableCollector {
 
     public static String DOC_PATTERN  = "\\{#[\\s]+@[C|c]ontroller[\\s]+([\\w\\\\\\[\\]:]+)[\\s]+#}";
     public static String DOC_PATTERN_COMPLETION  = "\\{#[\\s]+@[C|c]ontroller[\\s]+.*#}";
 
     @Override
-    public void collectVars(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
+    public void collectPsiVariables(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
 
         PsiFile psiFile = parameter.getElement().getContainingFile();
         if(!(psiFile instanceof TwigFile)) {
@@ -63,9 +63,4 @@ private static ArrayList<String> findFileControllerDocBlocks(TwigFile twigFile)
 
         return controller;
     }
-
-    @Override
-    public void collect(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, Set<String>> variables) {
-
-    }
 }

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

@@ -14,9 +14,9 @@
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
-public class ControllerVariableCollector implements TwigFileVariableCollector, TwigFileVariableCollector.TwigFileVariableCollectorExt {
+public class ControllerVariableCollector implements TwigFileVariableCollector {
     @Override
-    public void collectVars(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
+    public void collectPsiVariables(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
         PsiFile psiFile = parameter.getElement().getContainingFile();
         if(!(psiFile instanceof TwigFile)) {
             return;

src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/GlobalTwigConfigVariableCollector.java

@@ -31,12 +31,12 @@
  *
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
-public class GlobalTwigConfigVariableCollector implements TwigFileVariableCollector, TwigFileVariableCollector.TwigFileVariableCollectorExt {
+public class GlobalTwigConfigVariableCollector implements TwigFileVariableCollector {
 
     private static final Key<CachedValue<Map<String, PsiVariable>>> CACHE = new Key<>("TWIG_CONFIGURATION_GLOBALS");
 
     @Override
-    public void collectVars(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
+    public void collectPsiVariables(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
         variables.putAll(getGlobals(parameter.getProject()));
     }