move Symfony related Twig variable collector into its own package

Haehnchen · Haehnchen · commit 3e14abda7d09 · 2017-12-15T19:29:55.000+01:00
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -597,13 +597,13 @@
 
         <TwigVariableCollector implementation="fr.adrienbrault.idea.symfony2plugin.templating.variable.collector.StaticVariableCollector"/>
         <TwigVariableCollector implementation="fr.adrienbrault.idea.symfony2plugin.templating.variable.collector.GlobalExtensionVariableCollector"/>
-        <TwigVariableCollector implementation="fr.adrienbrault.idea.symfony2plugin.templating.variable.collector.ControllerDocVariableCollector"/>
-        <TwigVariableCollector implementation="fr.adrienbrault.idea.symfony2plugin.templating.variable.collector.ServiceContainerVariableCollector"/>
+        <TwigVariableCollector implementation="fr.adrienbrault.idea.symfony2plugin.twig.variable.collector.ControllerDocVariableCollector"/>
+        <TwigVariableCollector implementation="fr.adrienbrault.idea.symfony2plugin.twig.variable.collector.ServiceContainerGlobalVariableCollector"/>
         <TwigVariableCollector implementation="fr.adrienbrault.idea.symfony2plugin.templating.variable.collector.FileDocVariableCollector"/>
-        <TwigVariableCollector implementation="fr.adrienbrault.idea.symfony2plugin.templating.variable.collector.ControllerVariableCollector"/>
+        <TwigVariableCollector implementation="fr.adrienbrault.idea.symfony2plugin.twig.variable.collector.ControllerVariableCollector"/>
         <TwigVariableCollector implementation="fr.adrienbrault.idea.symfony2plugin.templating.variable.collector.IncludeVariableCollector"/>
         <TwigVariableCollector implementation="fr.adrienbrault.idea.symfony2plugin.templating.variable.collector.MarcoScopeVariableCollector"/>
-        <TwigVariableCollector implementation="fr.adrienbrault.idea.symfony2plugin.templating.variable.collector.GlobalTwigConfigVariableCollector"/>
+        <TwigVariableCollector implementation="fr.adrienbrault.idea.symfony2plugin.twig.variable.collector.GlobalTwigConfigVariableCollector"/>
     </extensions>
 
     <depends>com.jetbrains.twig</depends>
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTwigMethodLookupElement.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/PhpTwigMethodLookupElement.java
@@ -13,6 +13,9 @@
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class PhpTwigMethodLookupElement extends PhpLookupElement {
+    PhpTwigMethodLookupElement(@NotNull PhpNamedElement namedElement) {
+        super(namedElement);
+    }
 
     @Override
     public void handleInsert(InsertionContext context) {
@@ -32,10 +35,6 @@ public void renderElement(LookupElementPresentation presentation) {
 
     }
 
-    public PhpTwigMethodLookupElement(@NotNull PhpNamedElement namedElement) {
-        super(namedElement);
-    }
-
     @NotNull
     public String getLookupString() {
         String lookupString = super.getLookupString();
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java
@@ -26,14 +26,14 @@
 import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
 import fr.adrienbrault.idea.symfony2plugin.templating.completion.QuotedInsertionLookupElement;
 import fr.adrienbrault.idea.symfony2plugin.templating.dict.*;
-import fr.adrienbrault.idea.symfony2plugin.templating.globals.TwigGlobalEnum;
-import fr.adrienbrault.idea.symfony2plugin.templating.globals.TwigGlobalVariable;
-import fr.adrienbrault.idea.symfony2plugin.templating.globals.TwigGlobalsServiceParser;
+import fr.adrienbrault.idea.symfony2plugin.twig.variable.globals.TwigGlobalEnum;
+import fr.adrienbrault.idea.symfony2plugin.twig.variable.globals.TwigGlobalVariable;
+import fr.adrienbrault.idea.symfony2plugin.twig.variable.globals.TwigGlobalsServiceParser;
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigExtensionParser;
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigTypeResolveUtil;
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigTypeContainer;
-import fr.adrienbrault.idea.symfony2plugin.templating.variable.collector.ControllerDocVariableCollector;
+import fr.adrienbrault.idea.symfony2plugin.twig.variable.collector.ControllerDocVariableCollector;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.dict.PsiVariable;
 import fr.adrienbrault.idea.symfony2plugin.translation.dict.TranslationUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java
@@ -29,7 +29,7 @@
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigTypeResolveUtil;
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigTypeContainer;
-import fr.adrienbrault.idea.symfony2plugin.templating.variable.collector.ControllerDocVariableCollector;
+import fr.adrienbrault.idea.symfony2plugin.twig.variable.collector.ControllerDocVariableCollector;
 import fr.adrienbrault.idea.symfony2plugin.translation.dict.TranslationUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils;
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigFileVariableCollector.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/TwigFileVariableCollector.java
@@ -1,6 +1,7 @@
 package fr.adrienbrault.idea.symfony2plugin.templating.variable;
 
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.dict.PsiVariable;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
 import java.util.Set;
@@ -10,10 +11,9 @@
  */
 public interface TwigFileVariableCollector {
 
-    default void collect(TwigFileVariableCollectorParameter parameter, Map<String, Set<String>> variables) {}
+    default void collect(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, Set<String>> variables) {}
 
     interface TwigFileVariableCollectorExt {
-        void collectVars(TwigFileVariableCollectorParameter parameter, Map<String, PsiVariable> variables);
+        void collectVars(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables);
     }
-
 }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/FileDocVariableCollector.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/FileDocVariableCollector.java
@@ -4,6 +4,7 @@
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigTypeResolveUtil;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigFileVariableCollector;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigFileVariableCollectorParameter;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
@@ -13,7 +14,7 @@
 public class FileDocVariableCollector implements TwigFileVariableCollector {
 
     @Override
-    public void collect(TwigFileVariableCollectorParameter parameter, Map<String, Set<String>> variables) {
+    public void collect(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, Set<String>> variables) {
         if(!(parameter.getElement().getContainingFile() instanceof TwigFile)) {
             return;
         }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/GlobalExtensionVariableCollector.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/GlobalExtensionVariableCollector.java
@@ -9,6 +9,7 @@
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigFileVariableCollector;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigFileVariableCollectorParameter;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.dict.PsiVariable;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
 import java.util.Map;
@@ -19,7 +20,7 @@
  */
 public class GlobalExtensionVariableCollector implements TwigFileVariableCollector, TwigFileVariableCollector.TwigFileVariableCollectorExt {
     @Override
-    public void collectVars(TwigFileVariableCollectorParameter parameter, Map<String, PsiVariable> variables) {
+    public void collectVars(@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");
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/IncludeVariableCollector.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/IncludeVariableCollector.java
@@ -36,7 +36,7 @@
 public class IncludeVariableCollector implements TwigFileVariableCollector, TwigFileVariableCollector.TwigFileVariableCollectorExt {
 
     @Override
-    public void collectVars(final TwigFileVariableCollectorParameter parameter, final Map<String, PsiVariable> variables) {
+    public void collectVars(@NotNull final TwigFileVariableCollectorParameter parameter, @NotNull final Map<String, PsiVariable> variables) {
 
         final PsiFile psiFile = parameter.getElement().getContainingFile();
         if(!(psiFile instanceof TwigFile) || PsiTreeUtil.getChildOfType(psiFile, TwigExtendsTag.class) != null) {
@@ -49,15 +49,13 @@ public void collectVars(final TwigFileVariableCollectorParameter parameter, fina
         }
 
         for(VirtualFile virtualFile: files) {
-
             PsiFile twigFile = PsiManager.getInstance(parameter.getProject()).findFile(virtualFile);
             if(!(twigFile instanceof TwigFile)) {
                 continue;
             }
 
             twigFile.acceptChildren(new MyPsiRecursiveElementWalkingVisitor(psiFile, variables, parameter));
         }
-
     }
 
     private void collectIncludeContextVars(IElementType iElementType, PsiElement tag, PsiElement templatePsiName, Map<String, PsiVariable> variables, Set<VirtualFile> visitedFiles) {
@@ -134,10 +132,10 @@ private void collectIncludeContextVars(IElementType iElementType, PsiElement tag
                 }
             }
         }
-
     }
 
-    public static Map<String, String> getIncludeWithVarNames(String includeText) {
+    @NotNull
+    private static Map<String, String> getIncludeWithVarNames(String includeText) {
 
         String regex = "with\\s*\\{\\s*(.*[^%])\\}\\s*";
         Matcher matcher = Pattern.compile(regex).matcher(includeText.replace("\r\n", " ").replace("\n", " "));
@@ -150,7 +148,8 @@ public static Map<String, String> getIncludeWithVarNames(String includeText) {
         return new HashMap<>();
     }
 
-    private static Map<String, String> getVariableAliasMap(String jsonLike) {
+    @NotNull
+    private static Map<String, String> getVariableAliasMap(@NotNull String jsonLike) {
         Map<String, String> map = new HashMap<>();
 
         String[] parts = jsonLike.replaceAll("^\\{|\\}$","").split("\"?(:|,)(?![^\\{]*\\})\"?");
@@ -164,7 +163,7 @@ private static Map<String, String> getVariableAliasMap(String jsonLike) {
 
 
     @Override
-    public void collect(TwigFileVariableCollectorParameter parameter, Map<String, Set<String>> variables) {
+    public void collect(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, Set<String>> variables) {
     }
 
     private Collection<VirtualFile> getImplements(TwigFile twigFile) {
@@ -190,7 +189,7 @@ private class MyPsiRecursiveElementWalkingVisitor extends PsiRecursiveElementWal
         @NotNull
         private final TwigFileVariableCollectorParameter parameter;
 
-        private MyPsiRecursiveElementWalkingVisitor(@NotNull PsiFile psiFile, Map<String, PsiVariable> variables, @NotNull TwigFileVariableCollectorParameter parameter) {
+        private MyPsiRecursiveElementWalkingVisitor(@NotNull PsiFile psiFile, @NotNull Map<String, PsiVariable> variables, @NotNull TwigFileVariableCollectorParameter parameter) {
             this.psiFile = psiFile;
             this.variables = variables;
             this.parameter = parameter;
@@ -225,17 +224,15 @@ public void visitElement(PsiElement element) {
         }
 
         private void collectContextVars(IElementType iElementType, @NotNull PsiElement element, @NotNull PsiElement includeTag) {
-
             String templateName = includeTag.getText();
+
             if(StringUtils.isNotBlank(templateName)) {
                 for(PsiFile templateFile: TwigHelper.getTemplatePsiElements(element.getProject(), templateName)) {
                     if(templateFile.equals(psiFile)) {
                         collectIncludeContextVars(iElementType, element, includeTag, variables, parameter.getVisitedFiles());
                     }
                 }
-
             }
-
         }
     }
 }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/MarcoScopeVariableCollector.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/MarcoScopeVariableCollector.java
@@ -9,6 +9,7 @@
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigFileVariableCollector;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigFileVariableCollectorParameter;
 import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 import java.util.Map;
@@ -19,7 +20,7 @@
  */
 public class MarcoScopeVariableCollector implements TwigFileVariableCollector {
     @Override
-    public void collect(TwigFileVariableCollectorParameter parameter, Map<String, Set<String>> variables) {
+    public void collect(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, Set<String>> variables) {
         ASTNode macroStatement = TreeUtil.findParent(parameter.getElement().getNode(), TwigElementTypes.MACRO_STATEMENT);
         if(macroStatement == null) {
             return;
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/StaticVariableCollector.java b/src/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/StaticVariableCollector.java
@@ -2,17 +2,16 @@
 
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigFileVariableCollector;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigFileVariableCollectorParameter;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class StaticVariableCollector implements TwigFileVariableCollector {
-
     @Override
-    public void collect(TwigFileVariableCollectorParameter parameter, Map<String, Set<String>> variables) {
+    public void collect(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, Set<String>> variables) {
         variables.put("app", new HashSet<>(Collections.singletonList("\\Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables")));
     }
-
 }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerDocVariableCollector.java b/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerDocVariableCollector.java
@@ -1,4 +1,4 @@
-package fr.adrienbrault.idea.symfony2plugin.templating.variable.collector;
+package fr.adrienbrault.idea.symfony2plugin.twig.variable.collector;
 
 import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiFile;
@@ -10,6 +10,7 @@
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigFileVariableCollectorParameter;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.dict.PsiVariable;
 import fr.adrienbrault.idea.symfony2plugin.util.controller.ControllerIndex;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Map;
@@ -26,7 +27,7 @@ public class ControllerDocVariableCollector implements TwigFileVariableCollector
     public static String DOC_PATTERN_COMPLETION  = "\\{#[\\s]+@[C|c]ontroller[\\s]+.*#}";
 
     @Override
-    public void collectVars(TwigFileVariableCollectorParameter parameter, Map<String, PsiVariable> variables) {
+    public void collectVars(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
 
         PsiFile psiFile = parameter.getElement().getContainingFile();
         if(!(psiFile instanceof TwigFile)) {
@@ -64,7 +65,7 @@ private static ArrayList<String> findFileControllerDocBlocks(TwigFile twigFile)
     }
 
     @Override
-    public void collect(TwigFileVariableCollectorParameter parameter, Map<String, Set<String>> variables) {
+    public void collect(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, Set<String>> variables) {
 
     }
 }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerVariableCollector.java b/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ControllerVariableCollector.java
@@ -1,11 +1,12 @@
-package fr.adrienbrault.idea.symfony2plugin.templating.variable.collector;
+package fr.adrienbrault.idea.symfony2plugin.twig.variable.collector;
 
 import com.intellij.psi.PsiFile;
 import com.jetbrains.twig.TwigFile;
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigFileVariableCollector;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigFileVariableCollectorParameter;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.dict.PsiVariable;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
 import java.util.Set;
@@ -15,7 +16,7 @@
  */
 public class ControllerVariableCollector implements TwigFileVariableCollector, TwigFileVariableCollector.TwigFileVariableCollectorExt {
     @Override
-    public void collectVars(TwigFileVariableCollectorParameter parameter, Map<String, PsiVariable> variables) {
+    public void collectVars(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
         PsiFile psiFile = parameter.getElement().getContainingFile();
         if(!(psiFile instanceof TwigFile)) {
             return;
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/GlobalTwigConfigVariableCollector.java b/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/GlobalTwigConfigVariableCollector.java
@@ -1,4 +1,4 @@
-package fr.adrienbrault.idea.symfony2plugin.templating.variable.collector;
+package fr.adrienbrault.idea.symfony2plugin.twig.variable.collector;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
@@ -36,7 +36,7 @@ public class GlobalTwigConfigVariableCollector implements TwigFileVariableCollec
     private static final Key<CachedValue<Map<String, PsiVariable>>> CACHE = new Key<>("TWIG_CONFIGURATION_GLOBALS");
 
     @Override
-    public void collectVars(TwigFileVariableCollectorParameter parameter, Map<String, PsiVariable> variables) {
+    public void collectVars(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, PsiVariable> variables) {
         variables.putAll(getGlobals(parameter.getProject()));
     }
 
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ServiceContainerGlobalVariableCollector.java b/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/collector/ServiceContainerGlobalVariableCollector.java
@@ -1,14 +1,15 @@
-package fr.adrienbrault.idea.symfony2plugin.templating.variable.collector;
+package fr.adrienbrault.idea.symfony2plugin.twig.variable.collector;
 
 import com.jetbrains.php.lang.psi.elements.PhpClass;
-import fr.adrienbrault.idea.symfony2plugin.templating.globals.TwigGlobalEnum;
-import fr.adrienbrault.idea.symfony2plugin.templating.globals.TwigGlobalVariable;
-import fr.adrienbrault.idea.symfony2plugin.templating.globals.TwigGlobalsServiceParser;
+import fr.adrienbrault.idea.symfony2plugin.twig.variable.globals.TwigGlobalEnum;
+import fr.adrienbrault.idea.symfony2plugin.twig.variable.globals.TwigGlobalVariable;
+import fr.adrienbrault.idea.symfony2plugin.twig.variable.globals.TwigGlobalsServiceParser;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigFileVariableCollector;
 import fr.adrienbrault.idea.symfony2plugin.templating.variable.TwigFileVariableCollectorParameter;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.ServiceUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.service.ServiceXmlParserFactory;
 import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -18,10 +19,10 @@
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
-public class ServiceContainerVariableCollector implements TwigFileVariableCollector {
+public class ServiceContainerGlobalVariableCollector implements TwigFileVariableCollector {
 
     @Override
-    public void collect(TwigFileVariableCollectorParameter parameter, Map<String, Set<String>> variables) {
+    public void collect(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, Set<String>> variables) {
         TwigGlobalsServiceParser twigPathServiceParser = ServiceXmlParserFactory.getInstance(parameter.getProject(), TwigGlobalsServiceParser.class);
         for(Map.Entry<String, TwigGlobalVariable> globalVariableEntry: twigPathServiceParser.getTwigGlobals().entrySet()) {
             if(globalVariableEntry.getValue().getTwigGlobalEnum() == TwigGlobalEnum.SERVICE) {
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalEnum.java b/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalEnum.java
@@ -1,4 +1,4 @@
-package fr.adrienbrault.idea.symfony2plugin.templating.globals;
+package fr.adrienbrault.idea.symfony2plugin.twig.variable.globals;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalVariable.java b/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalVariable.java
@@ -1,29 +1,39 @@
-package fr.adrienbrault.idea.symfony2plugin.templating.globals;
+package fr.adrienbrault.idea.symfony2plugin.twig.variable.globals;
+
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class TwigGlobalVariable {
-
+    @NotNull
     private String name;
+
+    @NotNull
     private String value;
+
+    @NotNull
     private TwigGlobalEnum twigGlobalEnum;
-    public TwigGlobalVariable(String name, String value, TwigGlobalEnum twigGlobalEnum) {
+
+
+    TwigGlobalVariable(@NotNull String name, @NotNull String value, @NotNull TwigGlobalEnum twigGlobalEnum) {
         this.name = name;
         this.value = value;
         this.twigGlobalEnum = twigGlobalEnum;
     }
 
+    @NotNull
     public String getName() {
         return name;
     }
 
+    @NotNull
     public String getValue() {
         return value;
     }
 
+    @NotNull
     public TwigGlobalEnum getTwigGlobalEnum() {
         return twigGlobalEnum;
     }
-
 }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalsServiceParser.java b/src/fr/adrienbrault/idea/symfony2plugin/twig/variable/globals/TwigGlobalsServiceParser.java
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/globals/TwigGlobalsServiceParserTest.java b/tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/globals/TwigGlobalsServiceParserTest.java

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`public class IncludeVariableCollector implements TwigFileVariableCollector, TwigFileVariableCollector.TwigFileVariableCollectorExt {`
`37`	`37`
`38`	`38`	`@Override`
`39`		`- public void collectVars(final TwigFileVariableCollectorParameter parameter, final Map<String, PsiVariable> variables) {`
	`39`	`+ public void collectVars(@NotNull final TwigFileVariableCollectorParameter parameter, @NotNull final Map<String, PsiVariable> variables) {`
`40`	`40`
`41`	`41`	`final PsiFile psiFile = parameter.getElement().getContainingFile();`
`42`	`42`	`if(!(psiFile instanceof TwigFile) \|\| PsiTreeUtil.getChildOfType(psiFile, TwigExtendsTag.class) != null) {`
`@@ -49,15 +49,13 @@ public void collectVars(final TwigFileVariableCollectorParameter parameter, fina`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`for(VirtualFile virtualFile: files) {`
`52`		`-`
`53`	`52`	`PsiFile twigFile = PsiManager.getInstance(parameter.getProject()).findFile(virtualFile);`
`54`	`53`	`if(!(twigFile instanceof TwigFile)) {`
`55`	`54`	`continue;`
`56`	`55`	`}`
`57`	`56`
`58`	`57`	`twigFile.acceptChildren(new MyPsiRecursiveElementWalkingVisitor(psiFile, variables, parameter));`
`59`	`58`	`}`
`60`		`-`
`61`	`59`	`}`
`62`	`60`
`63`	`61`	`private void collectIncludeContextVars(IElementType iElementType, PsiElement tag, PsiElement templatePsiName, Map<String, PsiVariable> variables, Set<VirtualFile> visitedFiles) {`
`@@ -134,10 +132,10 @@ private void collectIncludeContextVars(IElementType iElementType, PsiElement tag`
`134`	`132`	`}`
`135`	`133`	`}`
`136`	`134`	`}`
`137`		`-`
`138`	`135`	`}`
`139`	`136`
`140`		`- public static Map<String, String> getIncludeWithVarNames(String includeText) {`
	`137`	`+ @NotNull`
	`138`	`+ private static Map<String, String> getIncludeWithVarNames(String includeText) {`
`141`	`139`
`142`	`140`	`String regex = "with\\s\\{\\s(.[^%])\\}\\s";`
`143`	`141`	`Matcher matcher = Pattern.compile(regex).matcher(includeText.replace("\r\n", " ").replace("\n", " "));`
`@@ -150,7 +148,8 @@ public static Map<String, String> getIncludeWithVarNames(String includeText) {`
`150`	`148`	`return new HashMap<>();`
`151`	`149`	`}`
`152`	`150`
`153`		`- private static Map<String, String> getVariableAliasMap(String jsonLike) {`
	`151`	`+ @NotNull`
	`152`	`+ private static Map<String, String> getVariableAliasMap(@NotNull String jsonLike) {`
`154`	`153`	`Map<String, String> map = new HashMap<>();`
`155`	`154`
`156`	`155`	`String[] parts = jsonLike.replaceAll("^\\{\|\\}$","").split("\"?(:\|,)(?![^\\{]*\\})\"?");`
`@@ -164,7 +163,7 @@ private static Map<String, String> getVariableAliasMap(String jsonLike) {`
`164`	`163`
`165`	`164`
`166`	`165`	`@Override`
`167`		`- public void collect(TwigFileVariableCollectorParameter parameter, Map<String, Set<String>> variables) {`
	`166`	`+ public void collect(@NotNull TwigFileVariableCollectorParameter parameter, @NotNull Map<String, Set<String>> variables) {`
`168`	`167`	`}`
`169`	`168`
`170`	`169`	`private Collection<VirtualFile> getImplements(TwigFile twigFile) {`
`@@ -190,7 +189,7 @@ private class MyPsiRecursiveElementWalkingVisitor extends PsiRecursiveElementWal`
`190`	`189`	`@NotNull`
`191`	`190`	`private final TwigFileVariableCollectorParameter parameter;`
`192`	`191`
`193`		`- private MyPsiRecursiveElementWalkingVisitor(@NotNull PsiFile psiFile, Map<String, PsiVariable> variables, @NotNull TwigFileVariableCollectorParameter parameter) {`
	`192`	`+ private MyPsiRecursiveElementWalkingVisitor(@NotNull PsiFile psiFile, @NotNull Map<String, PsiVariable> variables, @NotNull TwigFileVariableCollectorParameter parameter) {`
`194`	`193`	`this.psiFile = psiFile;`
`195`	`194`	`this.variables = variables;`
`196`	`195`	`this.parameter = parameter;`
`@@ -225,17 +224,15 @@ public void visitElement(PsiElement element) {`
`225`	`224`	`}`
`226`	`225`
`227`	`226`	`private void collectContextVars(IElementType iElementType, @NotNull PsiElement element, @NotNull PsiElement includeTag) {`
`228`		`-`
`229`	`227`	`String templateName = includeTag.getText();`
	`228`	`+`
`230`	`229`	`if(StringUtils.isNotBlank(templateName)) {`
`231`	`230`	`for(PsiFile templateFile: TwigHelper.getTemplatePsiElements(element.getProject(), templateName)) {`
`232`	`231`	`if(templateFile.equals(psiFile)) {`
`233`	`232`	`collectIncludeContextVars(iElementType, element, includeTag, variables, parameter.getVisitedFiles());`
`234`	`233`	`}`
`235`	`234`	`}`
`236`		`-`
`237`	`235`	`}`
`238`		`-`
`239`	`236`	`}`
`240`	`237`	`}`
`241`	`238`	`}`