Match constants correctly

cedricziel · cedricziel · commit b5dec3c63dc9 · 2017-11-05T21:04:06.000+01:00
diff --git a/src/main/java/com/cedricziel/idea/typo3/extensionScanner/codeInspection/ConstantMatcherInspection.java b/src/main/java/com/cedricziel/idea/typo3/extensionScanner/codeInspection/ConstantMatcherInspection.java
@@ -43,20 +43,20 @@ public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder problemsHolder, bo
             @Override
             public void visitPhpElement(PhpPsiElement element) {
 
-                if (!PlatformPatterns.psiElement(PhpElementTypes.CLASS_REFERENCE).accepts(element)) {
+                if (!PlatformPatterns.psiElement(PhpElementTypes.CONSTANT_REF).accepts(element)) {
                     return;
                 }
 
-                Set<String> constants = getRemovedConstantsFQNs(element);
                 ConstantReference constantReference = (ConstantReference) element;
+                Set<String> constants = getRemovedConstantsFQNs(constantReference);
                 if (constants.contains(constantReference.getFQN())) {
                     problemsHolder.registerProblem(element, "Constant removed with TYPO3 9, consider using an alternative");
                 }
             }
         };
     }
 
-    private Set<String> getRemovedConstantsFQNs(PhpPsiElement element) {
+    private Set<String> getRemovedConstantsFQNs(ConstantReference element) {
         Set<PsiElement> elements = new HashSet<>();
         PsiFile[] constantMatcherFiles = FilenameIndex.getFilesByName(element.getProject(), "ConstantMatcher.php", GlobalSearchScope.allScope(element.getProject()));
         for (PsiFile file : constantMatcherFiles) {

Original file line number	Diff line number	Diff line change
`@@ -43,20 +43,20 @@ public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder problemsHolder, bo`
`43`	`43`	`@Override`
`44`	`44`	`public void visitPhpElement(PhpPsiElement element) {`
`45`	`45`
`46`		`- if (!PlatformPatterns.psiElement(PhpElementTypes.CLASS_REFERENCE).accepts(element)) {`
	`46`	`+ if (!PlatformPatterns.psiElement(PhpElementTypes.CONSTANT_REF).accepts(element)) {`
`47`	`47`	`return;`
`48`	`48`	`}`
`49`	`49`
`50`		`- Set<String> constants = getRemovedConstantsFQNs(element);`
`51`	`50`	`ConstantReference constantReference = (ConstantReference) element;`
	`51`	`+ Set<String> constants = getRemovedConstantsFQNs(constantReference);`
`52`	`52`	`if (constants.contains(constantReference.getFQN())) {`
`53`	`53`	`problemsHolder.registerProblem(element, "Constant removed with TYPO3 9, consider using an alternative");`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`};`
`57`	`57`	`}`
`58`	`58`
`59`		`- private Set<String> getRemovedConstantsFQNs(PhpPsiElement element) {`
	`59`	`+ private Set<String> getRemovedConstantsFQNs(ConstantReference element) {`
`60`	`60`	`Set<PsiElement> elements = new HashSet<>();`
`61`	`61`	`PsiFile[] constantMatcherFiles = FilenameIndex.getFilesByName(element.getProject(), "ConstantMatcher.php", GlobalSearchScope.allScope(element.getProject()));`
`62`	`62`	`for (PsiFile file : constantMatcherFiles) {`