From 5ab790eaac6518d13bd4d9e55938dcc86112758e Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 18 Aug 2015 17:49:44 +0200 Subject: [PATCH] suppress single unused parameter --- .../unusedParameters/UnusedParametersInspection.java | 2 +- .../unusedMethodParameter/suppressedParameter/expected.xml | 2 ++ .../unusedMethodParameter/suppressedParameter/src/Test.java | 5 +++++ .../intellij/codeInspection/UnusedMethodParameterTest.java | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/expected.xml create mode 100644 java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/src/Test.java 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 9e1f28254b65..7c4726fcb24a 100644 --- a/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java @@ -191,7 +191,7 @@ public class UnusedParametersInspection extends GlobalJavaBatchInspectionTool { clearUsedParameters(refMethod, result, checkDeep); for (RefParameter parameter : result) { - if (parameter != null) { + if (parameter != null && !((RefElementImpl)parameter).isSuppressed(UnusedSymbolLocalInspectionBase.UNUSED_PARAMETERS_SHORT_NAME)) { res.add(parameter); } } diff --git a/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/expected.xml b/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/expected.xml new file mode 100644 index 000000000000..4704d91e891d --- /dev/null +++ b/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/expected.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/src/Test.java b/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/src/Test.java new file mode 100644 index 000000000000..f2b5752b9eef --- /dev/null +++ b/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/src/Test.java @@ -0,0 +1,5 @@ +public class Test { + public void foo(@SuppressWarnings("UnusedParameters") boolean b) { + + } +} diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/UnusedMethodParameterTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/UnusedMethodParameterTest.java index 9e7d553dfe58..b307b9f56177 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/UnusedMethodParameterTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/UnusedMethodParameterTest.java @@ -38,6 +38,10 @@ public class UnusedMethodParameterTest extends InspectionTestCase { doTest(); } + public void testSuppressedParameter() throws Exception { + doTest(); + } + public void testEntryPointUnusedParameter() throws Exception { doTest("unusedMethodParameter/" + getTestName(true), myTool, true, true); }