Merge pull request #1953 from Haehnchen/feature/PhpLineMarkerProvider

PhpLineMarkerProvider linemarker should only be triggered on smallest (leaf) elements

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/PhpLineMarkerProvider.java

@@ -7,6 +7,7 @@
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.jetbrains.php.lang.lexer.PhpTokenTypes;
 import com.jetbrains.php.lang.psi.PhpFile;
 import com.jetbrains.php.lang.psi.elements.MethodReference;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons;
@@ -47,7 +48,12 @@ public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> psiElemen
         }
     }
 
-    private void attachRouteActions(@NotNull Collection<? super LineMarkerInfo<?>> lineMarkerInfos, @NotNull PsiElement psiElement) {
+    private void attachRouteActions(@NotNull Collection<? super LineMarkerInfo<?>> lineMarkerInfos, @NotNull PsiElement leaf) {
+        if (leaf.getNode().getElementType() != PhpTokenTypes.IDENTIFIER) {
+            return;
+        }
+
+        PsiElement psiElement = leaf.getParent();
         if (!(psiElement instanceof MethodReference) || !"controller".equalsIgnoreCase(((MethodReference) psiElement).getName()) || !PhpElementsUtil.isMethodReferenceInstanceOf((MethodReference) psiElement, "\\Symfony\\Component\\Routing\\Loader\\Configurator\\Traits\\RouteTrait", "controller")) {
             return;
         }