missing service argument inspection should only visit the working context

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ServiceActionUtil.java

@@ -165,28 +165,6 @@ public static Set<String> getPossibleServices(@NotNull PhpClass phpClass, @NotNu
             .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
-    @NotNull
-    public static Collection<XmlTag> getXmlContainerServiceDefinition(PsiFile psiFile) {
-
-        Collection<XmlTag> xmlTags = new ArrayList<>();
-
-        for(XmlTag xmlTag: PsiTreeUtil.getChildrenOfTypeAsList(psiFile.getFirstChild(), XmlTag.class)) {
-            if(xmlTag.getName().equals("container")) {
-                for(XmlTag servicesTag: xmlTag.getSubTags()) {
-                    if(servicesTag.getName().equals("services")) {
-                        for(XmlTag parameterTag: servicesTag.getSubTags()) {
-                            if(parameterTag.getName().equals("service")) {
-                                xmlTags.add(parameterTag);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return xmlTags;
-    }
-
     public static class ServiceYamlContainer {
 
         @NotNull

src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInspection/service/ServiceDeprecatedClassesInspection.java

@@ -45,9 +45,6 @@ public PsiElementVisitor buildVisitor(final @NotNull ProblemsHolder holder, bool
     }
 
     private static class ProblemRegistrar {
-
-        private ContainerCollectionResolver.LazyServiceCollector lazyServiceCollector;
-
         public static void attachDeprecatedProblem(@NotNull PsiElement element, @NotNull String text, @NotNull ProblemsHolder holder, @NotNull NotNullLazyValue<ContainerCollectionResolver.LazyServiceCollector> lazyServiceCollector) {
             PhpClass phpClass = ServiceUtil.getResolvedClassDefinition(element.getProject(), text, lazyServiceCollector.get());
             if(phpClass == null) {
@@ -58,7 +55,6 @@ public static void attachDeprecatedProblem(@NotNull PsiElement element, @NotNull
             if(docComment != null && docComment.getTagElementsByName("@deprecated").length > 0) {
                 holder.registerProblem(element, String.format("Class '%s' is deprecated", phpClass.getName()), ProblemHighlightType.LIKE_DEPRECATED);
             }
-
         }
 
         public static void attachServiceDeprecatedProblem(@NotNull PsiElement element, @NotNull String serviceName, @NotNull ProblemsHolder holder, @NotNull NotNullLazyValue<ContainerCollectionResolver.LazyServiceCollector> lazyServiceCollector) {

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlServiceArgumentInspection.java

@@ -3,10 +3,10 @@
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
+import com.intellij.openapi.util.NotNullLazyValue;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.PsiFile;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlTokenType;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
@@ -17,7 +17,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
@@ -35,39 +34,28 @@ public PsiElementVisitor buildVisitor(final @NotNull ProblemsHolder holder, bool
     }
 
     private static class MyPsiElementVisitor extends PsiElementVisitor {
-
         private final ProblemsHolder holder;
-        private ContainerCollectionResolver.LazyServiceCollector lazyServiceCollector;
+        private NotNullLazyValue<ContainerCollectionResolver.LazyServiceCollector> serviceCollector;
 
         MyPsiElementVisitor(@NotNull ProblemsHolder holder) {
             this.holder = holder;
         }
 
         @Override
-        public void visitFile(PsiFile file) {
-            for (XmlTag xmlTag : ServiceActionUtil.getXmlContainerServiceDefinition(file)) {
-                visitService(xmlTag, holder);
+        public void visitElement(@NotNull PsiElement element) {
+            if (element instanceof XmlTag xmlTag) {
+                visitService(xmlTag, holder, this.createLazyServiceCollector());
             }
 
-            this.lazyServiceCollector = null;
-
-            super.visitFile(file);
-        }
-
-        private ContainerCollectionResolver.LazyServiceCollector getLazyServiceCollector(XmlTag xmlTag) {
-            return Objects.requireNonNullElseGet(
-                this.lazyServiceCollector,
-                () -> this.lazyServiceCollector = new ContainerCollectionResolver.LazyServiceCollector(xmlTag.getProject())
-            );
-
+            super.visitElement(element);
         }
 
-        private void visitService(XmlTag xmlTag, @NotNull ProblemsHolder holder) {
+        private void visitService(XmlTag xmlTag, @NotNull ProblemsHolder holder, @NotNull NotNullLazyValue<ContainerCollectionResolver.LazyServiceCollector> lazyServiceCollector) {
             if(!ServiceActionUtil.isValidXmlParameterInspectionService(xmlTag)) {
                 return;
             }
 
-            final List<String> args = ServiceActionUtil.getXmlMissingArgumentTypes(xmlTag, false, getLazyServiceCollector(xmlTag));
+            final List<String> args = ServiceActionUtil.getXmlMissingArgumentTypes(xmlTag, false, lazyServiceCollector.get());
             if (args.size() == 0) {
                 return;
             }
@@ -79,5 +67,13 @@ private void visitService(XmlTag xmlTag, @NotNull ProblemsHolder holder) {
 
             holder.registerProblem(childrenOfType, "Missing argument", ProblemHighlightType.GENERIC_ERROR_OR_WARNING, new AddServiceXmlArgumentLocalQuickFix(args));
         }
+
+        private NotNullLazyValue<ContainerCollectionResolver.LazyServiceCollector> createLazyServiceCollector() {
+            if (this.serviceCollector == null) {
+                this.serviceCollector = NotNullLazyValue.lazy(() -> new ContainerCollectionResolver.LazyServiceCollector(holder.getProject()));
+            }
+
+            return this.serviceCollector;
+        }
     }
 }