Merge pull request #1441 from Haehnchen/feature/twig-path

support changes in path extraction for "twig.loader"

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/TwigPathServiceParser.java

@@ -16,7 +16,7 @@ public class TwigPathServiceParser extends AbstractServiceParser {
 
     @Override
     public String getXPathFilter() {
-        return "/container/services/service[@id='twig.loader']//call[@method='addPath']";
+        return "/container/services/service[@id[starts-with(.,'twig.loader')]]//call[@method='addPath']";
     }
 
     public synchronized void parser(InputStream file) {
@@ -34,7 +34,12 @@ public synchronized void parser(InputStream file) {
             if(arguments.getLength() == 1) {
                 twigPathIndex.addPath(new TwigPath(arguments.item(0).getTextContent()));
             } else if(arguments.getLength() == 2) {
-                twigPathIndex.addPath(new TwigPath(arguments.item(0).getTextContent(), arguments.item(1).getTextContent()));
+                String namespace = arguments.item(1).getTextContent();
+
+                // we ignore overwrites; they are added also without "!", so just skip it
+                if (!namespace.startsWith("!")) {
+                    twigPathIndex.addPath(new TwigPath(arguments.item(0).getTextContent(), namespace));
+                }
             }
         }
     }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/TwigPathServiceParserTest.java

@@ -12,10 +12,8 @@
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class TwigPathServiceParserTest extends Assert {
-
     @Test
     public void testParse() throws Exception {
-
         File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/appDevDebugProjectContainer.xml");
 
         TwigPathServiceParser parser = new TwigPathServiceParser();
@@ -27,6 +25,7 @@ public void testParse() throws Exception {
         assertEquals("vendor\\symfony\\symfony\\src\\Symfony\\Bridge\\Twig/Resources/views/Form", parser.getTwigPathIndex().getNamespacePaths(TwigUtil.MAIN).get(0).getPath());
         assertEquals("app/Resources/views", parser.getTwigPathIndex().getNamespacePaths(TwigUtil.MAIN).get(1).getPath());
 
+        assertEquals("/app/vendor/symfony/twig-bundle/Resources/views2", parser.getTwigPathIndex().getNamespacePaths("Twig2").get(0).getPath());
+        assertEquals(0, parser.getTwigPathIndex().getNamespacePaths("!Twig2").size());
     }
-
 }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/path/appDevDebugProjectContainer.xml

@@ -20,5 +20,17 @@
               <argument>app/Resources/views</argument>
           </call>
       </service>
+
+      <service id="twig.loader.native_filesystem" class="Symfony\Bundle\TwigBundle\Loader\NativeFilesystemLoader" public="false">
+          <tag name="twig.loader"/>
+          <call method="addPath">
+              <argument>/app/vendor/symfony/twig-bundle/Resources/views2</argument>
+              <argument>Twig2</argument>
+          </call>
+          <call method="addPath">
+              <argument>/app/vendor/symfony/twig-bundle/Resources/views2</argument>
+              <argument>!Twig2</argument>
+          </call>
+      </service>
   </services>
 </container>