From 900a16855e7700b60e9807613dfdca5833ca0c62 Mon Sep 17 00:00:00 2001 From: Daniel Espendiller Date: Tue, 28 Jul 2020 19:17:13 +0200 Subject: [PATCH] only support "form" and "form_start" for valid linemarker on types --- .../idea/symfony2plugin/templating/TwigLineMarkerProvider.java | 2 +- .../idea/symfony2plugin/templating/TwigPattern.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java index f830f680c..e2edc3f55 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java @@ -334,7 +334,7 @@ private LineMarkerInfo attachFormType(@NotNull PsiElement psiElement) { NavigationGutterIconBuilder builder = NavigationGutterIconBuilder.create(Symfony2Icons.FORM_TYPE_LINE_MARKER) .setTargets(phpClasses) - .setTooltipText("Overwrites") + .setTooltipText("Navigate to Form") .setCellRenderer(new MyBlockListCellRenderer()); return builder.createLineMarkerInfo(firstChild); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java index b6d048c29..703585a63 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java @@ -562,7 +562,7 @@ static ElementPattern getFunctionPattern(@NotNull String ...function return PlatformPatterns.psiElement(TwigElementTypes.FUNCTION_CALL).withText(PlatformPatterns.string().with(new PatternCondition("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); } })); }