fix template extraction for methods with ending "Action" to fix non-existing template complaining in @template() annotation #999

Author: Haehnchen

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

@@ -111,7 +111,7 @@ public static String[] getControllerMethodShortcut(@NotNull Method method) {
                 symfonyBundle.getName(),
                 templateFolderName,
                 templateName,
-                StringUtils.stripEnd(methodName, "Action")
+                !methodName.endsWith("Action") ? methodName : methodName.substring(0, methodName.length() - "Action".length())
             );
         }
 

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

@@ -373,22 +373,31 @@ public void testGetTwigMacroNameAndParameter() {
     public void testGetControllerMethodShortcut() {
         myFixture.copyFileToProject("controller_method.php");
 
-        myFixture.configureByText(PhpFileType.INSTANCE, "<?php\n" +
-            "namespace FooBundle\\Controller;\n" +
-            "class FoobarController\n" +
-            "{\n" +
-            "   public function fo<caret>obarAction() {}\n" +
-            "" +
-            "}\n"
-        );
-
-        PsiElement psiElement = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
-
-        List<String> strings = Arrays.asList(TwigUtil.getControllerMethodShortcut((Method) psiElement.getParent()));
-
-        assertContainsElements(strings, "FooBundle:Foobar:foobar.html.twig");
-        assertContainsElements(strings, "FooBundle:Foobar:foobar.json.twig");
-        assertContainsElements(strings, "FooBundle:Foobar:foobar.xml.twig");
+        Collection<String[]> dataProvider = new ArrayList<String[]>() {{
+            add(new String[] {"fo<caret>obarAction", "foobar"});
+            add(new String[] {"fo<caret>obar", "foobar"});
+            add(new String[] {"editAction", "edit"});
+            add(new String[] {"ed<caret>it", "edit"});
+        }};
+
+        for (String[] string : dataProvider) {
+            myFixture.configureByText(PhpFileType.INSTANCE, "<?php\n" +
+                "namespace FooBundle\\Controller;\n" +
+                "class FoobarController\n" +
+                "{\n" +
+                "   public function " + string[0] + "() {}\n" +
+                "" +
+                "}\n"
+            );
+
+            PsiElement psiElement = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
+
+            List<String> strings = Arrays.asList(TwigUtil.getControllerMethodShortcut((Method) psiElement.getParent()));
+
+            assertContainsElements(strings, "FooBundle:Foobar:" + string[1] + ".html.twig");
+            assertContainsElements(strings, "FooBundle:Foobar:" + string[1] + ".json.twig");
+            assertContainsElements(strings, "FooBundle:Foobar:" + string[1] + ".xml.twig");
+        }
     }
 
     public void testGetControllerMethodShortcutForInvoke() {