Merge pull request #1951 from Haehnchen/feature/annotation-linemarker

remove annotation linemarker as its also catched by resources linemarker now

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ServiceLineMarkerProvider.java

@@ -33,7 +33,6 @@
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.DoctrineModel;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.ServiceUtil;
-import fr.adrienbrault.idea.symfony2plugin.util.resource.FileResourceUtil;
 import icons.ExternalSystemIcons;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -86,10 +85,6 @@ public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> psiElemen
                 this.autowireConstructorMarker(psiElement, results);
             }
 
-            if(psiElement instanceof PhpFile) {
-                routeAnnotationFileResource((PhpFile) psiElement, results);
-            }
-
             // public $message = 'This value should not be blank.';
             if (ConstraintMessageGotoCompletionRegistrar.getConstraintPropertyMessagePattern().accepts(psiElement)) {
                 this.constraintMessagePropertyMarker(psiElement, results);
@@ -259,13 +254,6 @@ private void formNameMarker(PsiElement psiElement, Collection<? super RelatedIte
 
     }
 
-    private void routeAnnotationFileResource(@NotNull PsiFile psiFile, Collection<? super RelatedItemLineMarkerInfo<?>> results) {
-        RelatedItemLineMarkerInfo<PsiElement> lineMarker = FileResourceUtil.getFileImplementsLineMarkerInFolderScope(psiFile);
-        if(lineMarker != null) {
-            results.add(lineMarker);
-        }
-    }
-
     /**
      * Constraints in same namespace and validateBy service name
      */

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/resource/FileResourceUtil.java

@@ -213,27 +213,6 @@ public static RelatedItemLineMarkerInfo<PsiElement> getFileImplementsLineMarker(
         return null;
     }
 
-    /**
-     * On route annotations we can have folder scope so: "@FooBundle/Controller/foo.php" can be equal "@FooBundle/Controller/"
-     */
-    @Nullable
-    public static RelatedItemLineMarkerInfo<PsiElement> getFileImplementsLineMarkerInFolderScope(@NotNull PsiFile psiFile) {
-        if (!hasFileResources(psiFile.getProject(), psiFile)) {
-            return null;
-        }
-
-        VirtualFile virtualFile = psiFile.getVirtualFile();
-        if (virtualFile == null) {
-            return null;
-        }
-
-        NavigationGutterIconBuilder<PsiElement> builder = NavigationGutterIconBuilder.create(PlatformIcons.ANNOTATION_TYPE_ICON)
-            .setTargets(NotNullLazyValue.lazy(new FileResourceNotNullLazyValue(psiFile.getProject(), virtualFile)))
-            .setTooltipText("Symfony: <a href=\"https://symfony.com/doc/current/routing.html#creating-routes-as-annotations\">Annotation Routing</a>");
-
-        return builder.createLineMarkerInfo(psiFile);
-    }
-
     /**
      * Gives targets to files on Bundle locate syntax. "@FooBundle/.../foo.yml"
      */

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/ServiceLineMarkerProviderTest.java

@@ -76,33 +76,6 @@ public void testDoctrineRepositoryDefinitionLineMarker() {
         ), new LineMarker.ToolTipEqualsAssert("Navigate to metadata"));
     }
 
-    public void testThatResourceProvidesLineMarker() {
-        myFixture.copyFileToProject("BundleScopeLineMarkerProvider.php");
-
-        String[] providers = new String[] {"@FooBundle/foo.php", "@FooBundle", "@FooBundle/"};
-
-        for (String provider : providers) {
-            myFixture.configureByText(
-                XmlFileType.INSTANCE,
-               String.format("<routes><import resource=\"%s\" /></routes>", provider)
-            );
-
-            PsiFile psiFile = myFixture.configureByText("foo.php", "");
-            assertLineMarker(
-                psiFile,
-                new LineMarker.ToolTipEqualsAssert("Symfony: <a href=\"https://symfony.com/doc/current/routing.html#creating-routes-as-annotations\">Annotation Routing</a>")
-            );
-
-            assertLineMarker(
-                psiFile,
-                new LineMarker.TargetAcceptsPattern(
-                    "Symfony: <a href=\"https://symfony.com/doc/current/routing.html#creating-routes-as-annotations\">Annotation Routing</a>",
-                    XmlPatterns.xmlTag().withName("import").withAttributeValue("resource", provider)
-                )
-            );
-        }
-    }
-
     public void testXmlServiceLineMarker() {
         myFixture.configureByText(XmlFileType.INSTANCE,
             "<container>\n" +