dropping weak route name annotator for php files

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/routing/PhpRouteInspection.java

@@ -71,26 +71,22 @@ public void annotate(@NotNull final StringLiteralExpression element, @NotNull Pr
     }
 
     public static void annotateRouteName(PsiElement target, @NotNull ProblemsHolder holder, final String routeName) {
-
         Map<String, Route> routes = RouteHelper.getCompiledRoutes(target.getProject());
         if(routes.containsKey(routeName))  {
             return;
         }
 
         Collection fileCollection = FileBasedIndex.getInstance().getContainingFiles(RoutesStubIndex.KEY, routeName,  GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.allScope(target.getProject()), YAMLFileType.YML, XmlFileType.INSTANCE));
         if(fileCollection.size() > 0) {
-            holder.registerProblem(target, "Weak Route", ProblemHighlightType.WEAK_WARNING);
             return;
         }
 
         fileCollection = FileBasedIndex.getInstance().getContainingFiles(AnnotationRoutesStubIndex.KEY, routeName, GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.allScope(target.getProject()), PhpFileType.INSTANCE));
         if(fileCollection.size() > 0) {
-            holder.registerProblem(target, "Weak Route", ProblemHighlightType.WEAK_WARNING);
             return;
         }
 
         holder.registerProblem(target, "Missing Route", ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
-
     }
 
 }

src/fr/adrienbrault/idea/symfony2plugin/routing/PhpRoutingAnnotator.java

@@ -20,26 +20,22 @@
 public class PhpRoutingAnnotator {
 
     public static void annotateRouteName(PsiElement target, @NotNull AnnotationHolder holder, final String routeName) {
-
         Map<String, Route> routes = RouteHelper.getCompiledRoutes(target.getProject());
         if(routes.containsKey(routeName))  {
             return;
         }
 
         Collection fileCollection = FileBasedIndex.getInstance().getContainingFiles(RoutesStubIndex.KEY, routeName,  GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.allScope(target.getProject()), YAMLFileType.YML, XmlFileType.INSTANCE));
         if(fileCollection.size() > 0) {
-            holder.createWeakWarningAnnotation(target, "Weak Route");
             return;
         }
 
         fileCollection = FileBasedIndex.getInstance().getContainingFiles(AnnotationRoutesStubIndex.KEY, routeName, GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.allScope(target.getProject()), PhpFileType.INSTANCE));
         if(fileCollection.size() > 0) {
-            holder.createWeakWarningAnnotation(target, "Weak Route");
             return;
         }
 
         holder.createWarningAnnotation(target, "Missing Route");
-
     }
 
 }

src/fr/adrienbrault/idea/symfony2plugin/routing/inspection/PhpRouteMissingInspection.java

@@ -1,47 +1,15 @@
 package fr.adrienbrault.idea.symfony2plugin.routing.inspection;
 
-import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
-import com.intellij.ide.highlighter.XmlFileType;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.util.indexing.FileBasedIndex;
-import com.jetbrains.php.lang.PhpFileType;
-import fr.adrienbrault.idea.symfony2plugin.routing.Route;
-import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
-import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.AnnotationRoutesStubIndex;
-import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.RoutesStubIndex;
+import fr.adrienbrault.idea.symfony2plugin.routing.PhpRouteInspection;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.yaml.YAMLFileType;
-
-import java.util.Collection;
-import java.util.Map;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class PhpRouteMissingInspection extends AbstractPhpRouteInspection {
-
     protected void annotateRouteName(PsiElement target, @NotNull ProblemsHolder holder, final String routeName) {
-
-        Map<String, Route> routes = RouteHelper.getCompiledRoutes(target.getProject());
-
-        if(routes.containsKey(routeName))  {
-            return;
-        }
-
-        Collection fileCollection = FileBasedIndex.getInstance().getContainingFiles(RoutesStubIndex.KEY, routeName,  GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.allScope(target.getProject()), YAMLFileType.YML, XmlFileType.INSTANCE));
-        if(fileCollection.size() > 0) {
-            return;
-        }
-
-        fileCollection = FileBasedIndex.getInstance().getContainingFiles(AnnotationRoutesStubIndex.KEY, routeName, GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.allScope(target.getProject()), PhpFileType.INSTANCE));
-        if(fileCollection.size() > 0) {
-            return;
-        }
-
-        holder.registerProblem(target, "Missing Route", ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
-
+        PhpRouteInspection.annotateRouteName(target, holder, routeName);
     }
-
 }