From a1b30986afffd969bcecdb6261177fabfe3b0bdf Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Tue, 19 Jul 2016 10:58:28 +0200 Subject: [PATCH] alternative suppress id for global inspections (IDEA-154071) --- .../unusedSymbol/UnusedSymbolLocalInspectionBase.java | 3 ++- .../unusedParameters/UnusedParametersInspection.java | 4 ++-- .../unusedMethodParameter/suppressedParameter/src/Test.java | 4 ++++ .../codeInspection/ex/GlobalInspectionContextBase.java | 2 +- .../codeInspection/ex/GlobalInspectionContextUtil.java | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspectionBase.java index f9525dc0a268..f9f0e5e88008 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspectionBase.java @@ -32,6 +32,7 @@ public class UnusedSymbolLocalInspectionBase extends BaseJavaLocalInspectionTool @NonNls public static final String SHORT_NAME = HighlightInfoType.UNUSED_SYMBOL_SHORT_NAME; @NonNls public static final String DISPLAY_NAME = HighlightInfoType.UNUSED_SYMBOL_DISPLAY_NAME; @NonNls public static final String UNUSED_PARAMETERS_SHORT_NAME = "UnusedParameters"; + @NonNls public static final String UNUSED_ID = "unused"; public boolean LOCAL_VARIABLE = true; public boolean FIELD = true; @@ -126,7 +127,7 @@ public class UnusedSymbolLocalInspectionBase extends BaseJavaLocalInspectionTool @NotNull @NonNls public String getID() { - return "unused"; + return UNUSED_ID; } @Override diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java index 6abd0970c83a..9ef81a972904 100644 --- a/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java @@ -193,7 +193,7 @@ public class UnusedParametersInspection extends GlobalJavaBatchInspectionTool { clearUsedParameters(refMethod, result, checkDeep); for (RefParameter parameter : result) { - if (parameter != null && !((RefElementImpl)parameter).isSuppressed(UnusedSymbolLocalInspectionBase.UNUSED_PARAMETERS_SHORT_NAME)) { + if (parameter != null && !((RefElementImpl)parameter).isSuppressed(UnusedSymbolLocalInspectionBase.UNUSED_PARAMETERS_SHORT_NAME, UnusedSymbolLocalInspectionBase.UNUSED_ID)) { res.add(parameter); } } @@ -315,6 +315,6 @@ public class UnusedParametersInspection extends GlobalJavaBatchInspectionTool { @Nullable @Override public String getAlternativeID() { - return "unused"; + return UnusedSymbolLocalInspectionBase.UNUSED_ID; } } diff --git a/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/src/Test.java b/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/src/Test.java index f2b5752b9eef..1897fa90b920 100644 --- a/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/src/Test.java +++ b/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/src/Test.java @@ -2,4 +2,8 @@ public class Test { public void foo(@SuppressWarnings("UnusedParameters") boolean b) { } + + public void foo(@SuppressWarnings("unused") boolean b) { + + } } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java index 18a48944f420..d2fc4a61fe52 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java @@ -209,7 +209,7 @@ public class GlobalInspectionContextBase extends UserDataHolderBase implements G } public boolean isToCheckMember(@NotNull RefElement owner, @NotNull InspectionProfileEntry tool) { - return isToCheckFile(((RefElementImpl)owner).getContainingFile(), tool) && !((RefElementImpl)owner).isSuppressed(tool.getShortName()); + return isToCheckFile(((RefElementImpl)owner).getContainingFile(), tool) && !((RefElementImpl)owner).isSuppressed(tool.getShortName(), tool.getAlternativeID()); } public boolean isToCheckFile(PsiFile file, @NotNull InspectionProfileEntry tool) { diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextUtil.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextUtil.java index 44ea4a205a38..4ab2c77092cc 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextUtil.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextUtil.java @@ -42,7 +42,7 @@ public class GlobalInspectionContextUtil { public static boolean isToCheckMember(@NotNull RefElement owner, @NotNull InspectionProfileEntry tool, Tools tools, ProfileManager profileManager) { - return isToCheckFile(((RefElementImpl)owner).getContainingFile(), tool, tools, profileManager) && !((RefElementImpl)owner).isSuppressed(tool.getShortName()); + return isToCheckFile(((RefElementImpl)owner).getContainingFile(), tool, tools, profileManager) && !((RefElementImpl)owner).isSuppressed(tool.getShortName(), tool.getAlternativeID()); } public static boolean isToCheckFile(PsiFile file, @NotNull InspectionProfileEntry tool, Tools tools, ProfileManager profileManager) {