multiple scope vars are now merge in twig "for" statements #463

Author: Haehnchen

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

@@ -343,7 +343,12 @@ public boolean value(PsiElement psiElement) {
             }
         }
 
-        globalVars.put(scopeVariable, new PsiVariable(types));
+        // we already have same variable in scope, so merge types
+        if(globalVars.containsKey(scopeVariable)) {
+            globalVars.get(scopeVariable).getTypes().addAll(types);
+        } else {
+            globalVars.put(scopeVariable, new PsiVariable(types));
+        }
 
     }
 

tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/variable/collector/FileDocVariableCollectorTest.java

@@ -79,4 +79,20 @@ public void testVarChainArrayIteration() {
 
     }
 
+    /**
+     * @see fr.adrienbrault.idea.symfony2plugin.templating.util.TwigTypeResolveUtil#collectForArrayScopeVariables
+     */
+    public void testThatDuplicateScopeVariablesAreMerged() {
+
+        assertCompletionContains(TwigFileType.INSTANCE, "" +
+                "{# @var bars \\Bar\\FooClass #}\n" +
+                "{% for bar in bars.fooBar %}\n" +
+                "  {# @var bar \\Bar\\FooClass #}\n" +
+                "  {{ bar.<caret> }}\n" +
+                "{% endfor %}\n"
+            , "fooBar"
+        );
+
+    }
+
 }