Skip to content

Commit 21ab178

Browse files
committed
[T3CMS] Update Module inspections to respect plugin activation
1 parent 9af4f52 commit 21ab178

File tree

3 files changed

+31
-7
lines changed

3 files changed

+31
-7
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.cedricziel.idea.typo3.codeInspection;
2+
3+
import com.cedricziel.idea.typo3.TYPO3CMSProjectSettings;
4+
import com.intellij.codeInspection.LocalInspectionToolSession;
5+
import com.intellij.codeInspection.ProblemsHolder;
6+
import com.intellij.lang.javascript.inspections.JSInspection;
7+
import com.intellij.lang.javascript.psi.JSElementVisitor;
8+
import com.intellij.psi.PsiElementVisitor;
9+
import org.jetbrains.annotations.NotNull;
10+
11+
public abstract class PluginEnabledJsInspection extends JSInspection {
12+
@NotNull
13+
@Override
14+
protected PsiElementVisitor createVisitor(@NotNull ProblemsHolder problemsHolder, @NotNull LocalInspectionToolSession localInspectionToolSession) {
15+
if (!TYPO3CMSProjectSettings.getInstance(problemsHolder.getProject()).pluginEnabled) {
16+
return new JSElementVisitor() {
17+
};
18+
}
19+
20+
return buildRealVisitor(problemsHolder, localInspectionToolSession);
21+
}
22+
23+
@NotNull
24+
public abstract PsiElementVisitor buildRealVisitor(@NotNull ProblemsHolder problemsHolder, @NotNull LocalInspectionToolSession localInspectionToolSession);
25+
}

typo3-cms/src/main/java/com/cedricziel/idea/typo3/javaScript/codeInspection/MissingModuleJSInspection.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package com.cedricziel.idea.typo3.javaScript.codeInspection;
22

3+
import com.cedricziel.idea.typo3.codeInspection.PluginEnabledJsInspection;
34
import com.cedricziel.idea.typo3.util.JavaScriptUtil;
45
import com.intellij.codeInspection.LocalInspectionToolSession;
56
import com.intellij.codeInspection.ProblemsHolder;
67
import com.intellij.lang.javascript.frameworks.modules.JSResolvableModuleReference;
7-
import com.intellij.lang.javascript.inspections.JSInspection;
88
import com.intellij.lang.javascript.psi.JSElementVisitor;
99
import com.intellij.lang.javascript.psi.JSLiteralExpression;
1010
import com.intellij.psi.PsiElementVisitor;
1111
import com.intellij.psi.PsiReference;
1212
import org.jetbrains.annotations.Nls;
1313
import org.jetbrains.annotations.NotNull;
1414

15-
public class MissingModuleJSInspection extends JSInspection {
15+
public class MissingModuleJSInspection extends PluginEnabledJsInspection {
1616
@Nls(capitalization = Nls.Capitalization.Sentence)
1717
@NotNull
1818
@Override
@@ -22,7 +22,7 @@ public String getDisplayName() {
2222

2323
@NotNull
2424
@Override
25-
protected PsiElementVisitor createVisitor(@NotNull ProblemsHolder problemsHolder, @NotNull LocalInspectionToolSession localInspectionToolSession) {
25+
public PsiElementVisitor buildRealVisitor(@NotNull ProblemsHolder problemsHolder, @NotNull LocalInspectionToolSession localInspectionToolSession) {
2626
return new JSElementVisitor() {
2727
@Override
2828
public void visitJSLiteralExpression(JSLiteralExpression node) {

typo3-cms/src/main/java/com/cedricziel/idea/typo3/javaScript/codeInspection/MissingModulePHPInspection.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
package com.cedricziel.idea.typo3.javaScript.codeInspection;
22

3-
import com.cedricziel.idea.fluid.lang.psi.ArgumentList;
3+
import com.cedricziel.idea.typo3.codeInspection.PluginEnabledPhpInspection;
44
import com.cedricziel.idea.typo3.util.JavaScriptUtil;
55
import com.intellij.codeInspection.ProblemsHolder;
66
import com.intellij.patterns.PlatformPatterns;
77
import com.intellij.patterns.PsiElementPattern;
88
import com.intellij.psi.PsiElement;
99
import com.intellij.psi.PsiElementVisitor;
1010
import com.intellij.psi.util.PsiTreeUtil;
11-
import com.jetbrains.php.lang.inspections.PhpInspection;
1211
import com.jetbrains.php.lang.psi.elements.MethodReference;
1312
import com.jetbrains.php.lang.psi.elements.StringLiteralExpression;
1413
import com.jetbrains.php.lang.psi.visitors.PhpElementVisitor;
1514
import org.jetbrains.annotations.Nls;
1615
import org.jetbrains.annotations.NotNull;
1716

18-
public class MissingModulePHPInspection extends PhpInspection {
17+
public class MissingModulePHPInspection extends PluginEnabledPhpInspection {
1918
@Nls(capitalization = Nls.Capitalization.Sentence)
2019
@NotNull
2120
@Override
@@ -25,7 +24,7 @@ public String getDisplayName() {
2524

2625
@NotNull
2726
@Override
28-
public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder problemsHolder, boolean b) {
27+
public PsiElementVisitor buildRealVisitor(@NotNull ProblemsHolder problemsHolder, boolean b) {
2928
return new PhpElementVisitor() {
3029
@Override
3130
public void visitPhpStringLiteralExpression(StringLiteralExpression expression) {

0 commit comments

Comments
 (0)