strip also "Bundle" from template folding and provide test

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/navigation/PhpFoldingBuilder.java

@@ -11,10 +11,12 @@
 import com.jetbrains.php.lang.psi.elements.StringLiteralExpression;
 import fr.adrienbrault.idea.symfony2plugin.Settings;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
+import fr.adrienbrault.idea.symfony2plugin.TwigHelper;
 import fr.adrienbrault.idea.symfony2plugin.config.SymfonyPhpReferenceContributor;
 import fr.adrienbrault.idea.symfony2plugin.routing.PhpRouteReferenceContributor;
 import fr.adrienbrault.idea.symfony2plugin.routing.Route;
 import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
+import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.MethodMatcher;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -142,15 +144,9 @@ private void attachTemplateShortcuts(List<FoldingDescriptor> descriptors, final
  }
 
  String content = stringLiteralExpression.getContents();
- String templateShortcutName = null;
 
- if(content.endsWith(".html.twig") && content.length() > 10) {
- templateShortcutName = content.substring(0, content.length() - 10);
- } else if(content.endsWith(".html.php") && content.length() > 9) {
- templateShortcutName = content.substring(0, content.length() - 9);
- }
-
- if(templateShortcutName == null || templateShortcutName.length() == 0) {
+ String templateShortcutName = TwigUtil.getFoldingTemplateName(content);
+ if(templateShortcutName == null) {
  return;
  }
 

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

@@ -303,4 +303,31 @@ public static HashMap<String, Set<String>> collectControllerTemplateVariables(Ps
 
  }
 
+ @Nullable
+ public static String getFoldingTemplateName(String content) {
+
+ String templateShortcutName = null;
+ if(content.endsWith(".html.twig") && content.length() > 10) {
+ templateShortcutName = content.substring(0, content.length() - 10);
+ } else if(content.endsWith(".html.php") && content.length() > 9) {
+ templateShortcutName = content.substring(0, content.length() - 9);
+ }
+
+ if(templateShortcutName == null || templateShortcutName.length() == 0) {
+ return null;
+ }
+
+ // template FooBundle:Test:edit.html.twig
+ if(templateShortcutName.length() <= "Bundle:".length()) {
+ return templateShortcutName;
+ }
+
+ int split = templateShortcutName.indexOf("Bundle:");
+ if(split > 0) {
+ templateShortcutName = templateShortcutName.substring(0, split) + templateShortcutName.substring("Bundle".length() + split);
+ }
+
+ return templateShortcutName;
+ }
+
 }

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

@@ -0,0 +1,21 @@
+package fr.adrienbrault.idea.symfony2plugin.tests.templating.util;
+
+import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class TwigUtilTest extends Assert {
+
+ @Test
+ public void testGetFoldingTemplateName() {
+
+ assertEquals("Foo:edit", TwigUtil.getFoldingTemplateName("FooBundle:edit.html.twig"));
+ assertEquals("Foo:edit", TwigUtil.getFoldingTemplateName("FooBundle:edit.html.php"));
+ assertEquals("Bundle:", TwigUtil.getFoldingTemplateName("Bundle:.html.twig"));
+ assertEquals("edit", TwigUtil.getFoldingTemplateName("edit.html.twig"));
+ assertNull(TwigUtil.getFoldingTemplateName("FooBundle:edit.foo.twig"));
+
+ }
+
+}