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: support alternative suppres id for global inspections

Browse Source 
unused declaration and former unused parameters
This commit is contained in:
Anna.Kozlova
2018-10-04 18:20:20 +02:00
parent 790f1937b6
commit ecee57369f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/inspection/redundantSuppress/alternativeIds/src/x/X.java
+9
View File
@@ -18,4 +18,13 @@ class NoSuperCall {
return new NoSuperCall();
}
}
class UnusedParam {
public static void main(String[] args) {
foo(1);
}
@SuppressWarnings("UnusedParameters")
static void foo(int i) {}
}
platform/lang-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java
+3 -2
View File
@@ -118,9 +118,10 @@ public class RedundantSuppressInspection extends GlobalInspectionTool {
String mergedToolName = InspectionElementsMerger.getMergedToolName(shortName);
for (InspectionToolWrapper toolWrapper : toolWrappers) {
String toolWrapperShortName = toolWrapper.getShortName();
String alternativeID = toolWrapper.getTool().getAlternativeID();
if (toolWrapper instanceof LocalInspectionToolWrapper &&
(((LocalInspectionToolWrapper)toolWrapper).getTool().getID().equals(shortName) ||
shortName.equals(((LocalInspectionToolWrapper)toolWrapper).getTool().getAlternativeID()) ||
shortName.equals(alternativeID) ||
toolWrapperShortName.equals(mergedToolName))) {
if (((LocalInspectionToolWrapper)toolWrapper).isUnfair()) {
iterator.remove();
@@ -130,7 +131,7 @@ public class RedundantSuppressInspection extends GlobalInspectionTool {
suppressedTools.put(toolWrapper, shortName);
}
}
else if (toolWrapperShortName.equals(shortName) || toolWrapperShortName.equals(mergedToolName)) {
else if (toolWrapperShortName.equals(shortName) || toolWrapperShortName.equals(mergedToolName) || shortName.equals(alternativeID)) {
//ignore global unused as it won't be checked anyway
if (toolWrapper instanceof LocalInspectionToolWrapper ||
toolWrapper instanceof GlobalInspectionToolWrapper && !((GlobalInspectionToolWrapper)toolWrapper).getTool().isGraphNeeded()) {