Merge pull request #1465 from Haehnchen/feature/unused-twig-overwrite

remove unused "getTemplateNameByOverwrite" for Twig

Author: Haehnchen

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

@@ -2094,50 +2094,6 @@ public static String buildStringFromTwigCreateContainer(@NotNull Project project
 
     }
 
-    /**
-     * Gets a template name from "app" or bundle getParent overwrite
-     *
-     * app/Resources/AcmeBlogBundle/views/Blog/index.html.twig
-     * src/Acme/UserBundle/Resources/views/index.html.twig
-     */
-    @Nullable
-    public static String getTemplateNameByOverwrite(@NotNull Project project, @NotNull VirtualFile virtualFile) {
-
-        String relativePath = VfsUtil.getRelativePath(virtualFile, ProjectUtil.getProjectDir(project));
-        if(relativePath == null) {
-            return null;
-        }
-
-        // app/Resources/AcmeBlogBundle/views/Blog/index.html.twig
-        Matcher matcher = Pattern.compile("app/Resources/([^/]*Bundle)/views/(.*)$").matcher(relativePath);
-        if (matcher.find()) {
-            return normalizeTemplateName(matcher.group(1) + ":" + matcher.group(2));
-        }
-
-        // src/Acme/UserBundle/Resources/views/index.html.twig
-        SymfonyBundleUtil symfonyBundleUtil = new SymfonyBundleUtil(project);
-        SymfonyBundle containingBundle = symfonyBundleUtil.getContainingBundle(virtualFile);
-        if(containingBundle == null) {
-            return null;
-        }
-
-        String relative = containingBundle.getRelative(virtualFile);
-        if(relative == null) {
-            return null;
-        }
-
-        if(!relative.startsWith("Resources/views/")) {
-            return null;
-        }
-
-        String parentBundleName = containingBundle.getParentBundleName();
-        if(parentBundleName == null) {
-            return null;
-        }
-
-        return normalizeTemplateName(containingBundle.getName() + ":" + relative.substring("Resources/views/".length(), relative.length()));
-    }
-
     /**
      * {% include "foo/#{segment.typeKey}.html.twig" with {'segment': segment} %}
      * {% include "foo/#{1 + 2}.html.twig" %}

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTempTest.java

@@ -20,33 +20,6 @@
  * @author Daniel Espendiller <[email protected]>
  */
 public class TwigUtilTempTest extends SymfonyTempCodeInsightFixtureTestCase {
-
-    /**
-     * @see fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil#getTemplateNameByOverwrite
-     */
-    public void testTemplateOverwriteNameGeneration() {
-        createFiles(
-            "app/Resources/TwigUtilIntegrationBundle/views/layout.html.twig",
-            "app/Resources/TwigUtilIntegrationBundle/views/Foo/layout.html.twig",
-            "app/Resources/TwigUtilIntegrationBundle/views/Foo/Bar/layout.html.twig"
-        );
-
-        assertEquals(
-            "TwigUtilIntegrationBundle:layout.html.twig",
-            TwigUtil.getTemplateNameByOverwrite(getProject(), VfsUtil.findRelativeFile(getProject().getBaseDir(), "app/Resources/TwigUtilIntegrationBundle/views/layout.html.twig".split("/")))
-        );
-
-        assertEquals(
-            "TwigUtilIntegrationBundle:Foo/layout.html.twig",
-            TwigUtil.getTemplateNameByOverwrite(getProject(), VfsUtil.findRelativeFile(getProject().getBaseDir(), "app/Resources/TwigUtilIntegrationBundle/views/Foo/layout.html.twig".split("/")))
-        );
-
-        assertEquals(
-            "TwigUtilIntegrationBundle:Foo/Bar/layout.html.twig",
-            TwigUtil.getTemplateNameByOverwrite(getProject(), VfsUtil.findRelativeFile(getProject().getBaseDir(), "app/Resources/TwigUtilIntegrationBundle/views/Foo/Bar/layout.html.twig".split("/")))
-        );
-    }
-
     /**
      * @see fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil#getPresentableTemplateName
      */

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTest.java

@@ -45,17 +45,6 @@ public String getTestDataPath() {
         return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures";
     }
 
-    /**
-     * @see fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil#getTemplateNameByOverwrite
-     */
-    public void testTemplateOverwriteNavigation() {
-        if(System.getenv("PHPSTORM_ENV") != null) return;
-
-        assertNavigationContainsFile(TwigFileType.INSTANCE, "{% extends '<caret>TwigUtilIntegrationBundle:layout.html.twig' %}", "/views/layout.html.twig");
-        assertNavigationContainsFile(TwigFileType.INSTANCE, "{% extends '<caret>TwigUtilIntegrationBundle:Foo/layout.html.twig' %}", "/views/Foo/layout.html.twig");
-        assertNavigationContainsFile(TwigFileType.INSTANCE, "{% extends '<caret>TwigUtilIntegrationBundle:Foo/Bar/layout.html.twig' %}", "/views/Foo/Bar/layout.html.twig");
-    }
-
     /**
      * @see fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil#isValidStringWithoutInterpolatedOrConcat
      */