Merge pull request #1527 from Haehnchen/feature/form

only support "form" and "form_start" for valid linemarker on types

Author: Haehnchen

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

@@ -334,7 +334,7 @@ private LineMarkerInfo attachFormType(@NotNull PsiElement psiElement) {
 
         NavigationGutterIconBuilder<PsiElement> builder = NavigationGutterIconBuilder.create(Symfony2Icons.FORM_TYPE_LINE_MARKER)
             .setTargets(phpClasses)
-            .setTooltipText("Overwrites")
+            .setTooltipText("Navigate to Form")
             .setCellRenderer(new MyBlockListCellRenderer());
 
         return builder.createLineMarkerInfo(firstChild);

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

@@ -562,7 +562,7 @@ static ElementPattern<PsiElement> getFunctionPattern(@NotNull String ...function
         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.stream(functionName).anyMatch(s::startsWith);
+                return Arrays.asList(functionName).contains(s);
             }
         }));
     }