MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

redundant suppression: disable for global tools which need graph (IDEA-159279)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-08-12 11:06:57 +02:00
parent 1839e42715
commit 3ebd13b591
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java
+3 -10
View File
@@ -18,7 +18,6 @@ package com.intellij.codeInspection;
import com.intellij.analysis.AnalysisScope;
import com.intellij.codeInsight.daemon.GroupNames;
import com.intellij.codeInsight.daemon.impl.RemoveSuppressWarningAction;
import com.intellij.codeInspection.deadCode.UnusedDeclarationInspectionBase;
import com.intellij.codeInspection.ex.GlobalInspectionContextBase;
import com.intellij.codeInspection.ex.GlobalInspectionToolWrapper;
import com.intellij.codeInspection.ex.InspectionToolWrapper;
@@ -182,7 +181,7 @@ public class RedundantSuppressInspectionBase extends GlobalInspectionTool {
else if (toolWrapper.getShortName().equals(shortName)) {
//ignore global unused as it won't be checked anyway
if (toolWrapper instanceof LocalInspectionToolWrapper ||
toolWrapper instanceof GlobalInspectionToolWrapper && !isGlobalInspectionRunCustomly(toolWrapper.getTool())) {
toolWrapper instanceof GlobalInspectionToolWrapper && !((GlobalInspectionToolWrapper)toolWrapper).getTool().isGraphNeeded()) {
suppressedTools.put(toolWrapper, shortName);
}
else {
@@ -217,10 +216,8 @@ public class RedundantSuppressInspectionBase extends GlobalInspectionTool {
else if (toolWrapper instanceof GlobalInspectionToolWrapper) {
final GlobalInspectionToolWrapper global = (GlobalInspectionToolWrapper)toolWrapper;
GlobalInspectionTool globalTool = global.getTool();
if (isGlobalInspectionRunCustomly(globalTool)) continue;
if (globalTool.isGraphNeeded()) {
refManager.findAllDeclarations();
}
//when graph is needed, results probably depend on outer files so absence of results on one file (in current context) doesn't guarantee anything
if (globalTool.isGraphNeeded()) continue;
descriptors = new ArrayList<>();
globalContext.getRefManager().iterate(new RefVisitor() {
@Override public void visitElement(@NotNull RefEntity refEntity) {
@@ -301,10 +298,6 @@ public class RedundantSuppressInspectionBase extends GlobalInspectionTool {
return result.toArray(new ProblemDescriptor[result.size()]);
}
private static boolean isGlobalInspectionRunCustomly(InspectionProfileEntry tool) {
return tool instanceof UnusedDeclarationInspectionBase;
}
protected GlobalInspectionContextBase createContext(PsiFile file) {
return new GlobalInspectionContextBase(file.getProject());
}
java/java-tests/testData/inspection/redundantSuppress/defaultFile/expected.xml
-8
View File
@@ -52,12 +52,4 @@
<entry_point TYPE="method" FQNAME="x.S void g()" />
</problem>
<problem>
<file>X.java</file>
<line>67</line>
<problem_class>Redundant suppression</problem_class>
<description>Redundant suppression</description>
<entry_point TYPE="method" FQNAME="x.S void foo1()" />
</problem>
</problems>