Merge pull request #1528 from Haehnchen/feature/form-pattern

smarter Twig function pattern

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java

@@ -558,11 +558,15 @@ static ElementPattern<PsiElement> getPrintBlockFunctionPattern() {
         return PlatformPatterns.psiElement(TwigTokenTypes.IDENTIFIER).withParent(getFunctionCallScopePattern()).withLanguage(TwigLanguage.INSTANCE);
     }
 
-    static ElementPattern<PsiElement> getFunctionPattern(@NotNull String ...functionName) {
+    public static ElementPattern<PsiElement> getFunctionPattern(@NotNull String ...functionName) {
         return PlatformPatterns.psiElement(TwigElementTypes.FUNCTION_CALL).withText(PlatformPatterns.string().with(new PatternCondition<String>("Twig: Function call") {
             @Override
-            public boolean accepts(@NotNull String s, ProcessingContext processingContext) {
-                return Arrays.asList(functionName).contains(s);
+            public boolean accepts(@NotNull String function, ProcessingContext processingContext) {
+                String funcWithoutSpace = function.replaceAll(" +", "");
+
+                return Arrays.stream(functionName).anyMatch(wantFunction ->
+                    funcWithoutSpace.startsWith(wantFunction + "(") || funcWithoutSpace.equals(wantFunction)
+                );
             }
         }));
     }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/TwigPatternTest.java

@@ -68,6 +68,23 @@ public void testGetPrintBlockOrTagFunctionPattern() {
         ));
     }
 
+    /**
+     * @see fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern#getFunctionPattern
+     */
+    public void testgetFunctionPattern() {
+        assertTrue(fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern.getFunctionPattern("form").accepts(
+            findElementAt(TwigFileType.INSTANCE, "{{ for<caret>m(test) }}").getParent()
+        ));
+
+        assertTrue(fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern.getFunctionPattern("form").accepts(
+            findElementAt(TwigFileType.INSTANCE, "{{ for<caret>m     (test) }}").getParent()
+        ));
+
+        assertFalse(fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern.getFunctionPattern("f").accepts(
+            findElementAt(TwigFileType.INSTANCE, "{{ for<caret>m(test) }}").getParent()
+        ));
+    }
+
     /**
      * @see fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern#getFunctionWithFirstParameterAsArrayPattern
      */