Merge pull request #2094 from Haehnchen/feature/const-inspection-recursive

replace recursive visiting for yaml / xml const inspection

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/ContainerConstantInspection.java

@@ -3,17 +3,16 @@
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
+import com.intellij.lang.Language;
+import com.intellij.lang.xml.XMLLanguage;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiRecursiveElementVisitor;
-import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlText;
 import fr.adrienbrault.idea.symfony2plugin.config.xml.XmlHelper;
 import fr.adrienbrault.idea.symfony2plugin.dic.container.util.ServiceContainerUtil;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.yaml.psi.YAMLFile;
+import org.jetbrains.yaml.YAMLLanguage;
 import org.jetbrains.yaml.psi.YAMLScalar;
 
 /**
@@ -27,61 +26,48 @@ public class ContainerConstantInspection extends LocalInspectionTool {
     public PsiElementVisitor buildVisitor(final @NotNull ProblemsHolder holder, boolean isOnTheFly) {
         return new PsiElementVisitor() {
             @Override
-            public void visitFile(@NotNull PsiFile psiFile) {
-                if(psiFile instanceof XmlFile) {
-                    xmlVisitor(holder, psiFile);
-                } else if(psiFile instanceof YAMLFile) {
-                    yamlVisitor(holder, psiFile);
+            public void visitElement(@NotNull PsiElement element) {
+                Language language = element.getLanguage();
+
+                if (language == YAMLLanguage.INSTANCE) {
+                    if (element instanceof YAMLScalar yamlScalar) {
+                        visitYamlElement(yamlScalar, holder);
+                    }
+                } else if(language == XMLLanguage.INSTANCE) {
+                    visitXmlElement(element, holder);
                 }
+
+                super.visitElement(element);
             }
         };
     }
-    private void yamlVisitor(@NotNull ProblemsHolder holder, @NotNull PsiFile psiFile) {
-        psiFile.acceptChildren(new PsiRecursiveElementVisitor() {
-            @Override
-            public void visitElement(@NotNull PsiElement psiElement) {
-                if(psiElement instanceof YAMLScalar) {
-                    String textValue = ((YAMLScalar) psiElement).getTextValue();
-                    if(textValue.startsWith("!php/const:")) {
-                        String constantName = textValue.substring(11);
-                        if(StringUtils.isNotBlank(constantName) && ServiceContainerUtil.getTargetsForConstant(psiElement.getProject(), constantName).size() == 0) {
-                            holder.registerProblem(psiElement, MESSAGE, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
-                        }
-                    }
-                }
-
-                super.visitElement(psiElement);
+    private void visitYamlElement(@NotNull YAMLScalar psiElement, @NotNull ProblemsHolder holder) {
+        String textValue = ((YAMLScalar) psiElement).getTextValue();
+        if(textValue.startsWith("!php/const:")) {
+            String constantName = textValue.substring(11);
+            if(StringUtils.isNotBlank(constantName) && ServiceContainerUtil.getTargetsForConstant(psiElement.getProject(), constantName).size() == 0) {
+                holder.registerProblem(psiElement, MESSAGE, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
             }
-        });
+        }
     }
 
-    private void xmlVisitor(@NotNull ProblemsHolder holder, @NotNull PsiFile psiFile) {
-        psiFile.acceptChildren(new PsiRecursiveElementVisitor() {
-            @Override
-            public void visitElement(@NotNull PsiElement psiElement) {
-                if(!XmlHelper.getArgumentValueWithTypePattern("constant").accepts(psiElement)) {
-                    super.visitElement(psiElement);
-                    return;
-                }
+    private void visitXmlElement(@NotNull PsiElement psiElement, @NotNull ProblemsHolder holder) {
+        if(!XmlHelper.getArgumentValueWithTypePattern("constant").accepts(psiElement)) {
+            return;
+        }
 
-                PsiElement xmlText = psiElement.getParent();
-                if(!(xmlText instanceof XmlText)) {
-                    super.visitElement(psiElement);
-                    return;
-                }
+        PsiElement xmlText = psiElement.getParent();
+        if(!(xmlText instanceof XmlText)) {
+            return;
+        }
 
-                String value = ((XmlText) xmlText).getValue();
-                if(StringUtils.isBlank(value)) {
-                    super.visitElement(psiElement);
-                    return;
-                }
+        String value = ((XmlText) xmlText).getValue();
+        if(StringUtils.isBlank(value)) {
+            return;
+        }
 
-                if(ServiceContainerUtil.getTargetsForConstant(xmlText.getProject(), value).size() == 0) {
-                    holder.registerProblem(xmlText, MESSAGE, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
-                }
-
-                super.visitElement(psiElement);
-            }
-        });
+        if(ServiceContainerUtil.getTargetsForConstant(xmlText.getProject(), value).size() == 0) {
+            holder.registerProblem(xmlText, MESSAGE, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
+        }
     }
 }