Ensure multiple errors from the same method do not repeat in `@Suppre…

…ssWarnings` (#24) Ensure multiple errors from the same method do not repeat in `@SuppressWarnings` when suppressing
palantir · Nov 14, 2024 · bae6982 · bae6982
1 parent ad12601
commit bae6982
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/changelog/@unreleased/pr-24.v2.yml b/changelog/@unreleased/pr-24.v2.yml
@@ -0,0 +1,6 @@
+type: fix
+fix:
+  description: Ensure multiple errors from the same method do not repeat in `@SuppressWarnings`
+    when suppressing
+  links:
+  - https://github.com/palantir/suppressible-error-prone/pull/24
diff --git a/...ror-prone/src/main/java/com/palantir/suppressibleerrorprone/SuppressWarningsCoalesce.java b/...ror-prone/src/main/java/com/palantir/suppressibleerrorprone/SuppressWarningsCoalesce.java
@@ -93,6 +93,7 @@ private Description coalesceSuppressWarnings(VisitorState state, Tree tree, Modi
         List<String> warningsToSuppress = suppressWarnings.stream()
                 .sorted(suppressWarningsBeforeRepeatableSuppressedWarnings())
                 .flatMap(SuppressWarningsCoalesce::annotationStringValues)
+                .distinct()
                 .collect(Collectors.toList());
 
         if (warningsToSuppress.isEmpty()) {

diff --git a/...prone/src/test/java/com/palantir/suppressibleerrorprone/SuppressWarningsCoalesceTest.java b/...prone/src/test/java/com/palantir/suppressibleerrorprone/SuppressWarningsCoalesceTest.java
@@ -125,6 +125,31 @@ void multiple_suppress_warnings_multiple_repeatable_warnings() {
                 .doTest();
     }
 
+    @Test
+    void same_warnings_multiple_times() {
+        fix().addInput(
+                        "Test.java",
+                        String.join(
+                                "\n",
+                                "public class Test {",
+                                "    @com.palantir.suppressibleerrorprone.RepeatableSuppressWarnings(\"A\")",
+                                "    @com.palantir.suppressibleerrorprone.RepeatableSuppressWarnings(\"A\")",
+                                "    @com.palantir.suppressibleerrorprone.RepeatableSuppressWarnings(\"B\")",
+                                "    @com.palantir.suppressibleerrorprone.RepeatableSuppressWarnings(\"D\")",
+                                "    @SuppressWarnings({\"A\", \"B\", \"C\"})",
+                                "    void f() {}",
+                                "}"))
+                .addOutput(
+                        "Test.java",
+                        String.join(
+                                "\n",
+                                "public class Test {",
+                                "    @SuppressWarnings({\"A\", \"B\", \"C\", \"D\"})",
+                                "    void f() {}",
+                                "}"))
+                .doTest();
+    }
+
     @Test
     void field() {
         fix().addInput(