From 786f2bc88afc472f160f8a4ab0a072cc2e0fa391 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 6 Sep 2017 12:30:31 +0300
Subject: [PATCH] redundant suppressions: trim ids (IDEA-178473)

---
 .../codeInspection/RedundantSuppressInspectionBase.java        | 3 ++-
 .../inspection/redundantSuppress/defaultFile/src/x/X.java      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java
index 51747e9d7bb4..a51c51815740 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java
@@ -141,7 +141,8 @@ public class RedundantSuppressInspectionBase extends GlobalInspectionTool {
       private void checkElement(final PsiElement owner) {
         String idsString = JavaSuppressionUtil.getSuppressedInspectionIdsIn(owner);
         if (idsString != null && !idsString.isEmpty()) {
-          List<String> ids = StringUtil.split(idsString, ",");
+          List<String> ids = new ArrayList<>();
+          StringUtil.tokenize(idsString, "[, ]").forEach(ids::add);
           if (IGNORE_ALL && (ids.contains(SuppressionUtil.ALL) || ids.contains(SuppressionUtil.ALL.toLowerCase()))) return;
           Collection<String> suppressed = suppressedScopes.get(owner);
           if (suppressed == null) {
diff --git a/java/java-tests/testData/inspection/redundantSuppress/defaultFile/src/x/X.java b/java/java-tests/testData/inspection/redundantSuppress/defaultFile/src/x/X.java
index 95e1a638850d..4643923566c1 100644
--- a/java/java-tests/testData/inspection/redundantSuppress/defaultFile/src/x/X.java
+++ b/java/java-tests/testData/inspection/redundantSuppress/defaultFile/src/x/X.java
@@ -4,7 +4,7 @@ class S {
     public void f() {
         //noinspection HardCodedStringLiteral
         String s=null;
-        //noinspection HardCodedStringLiteral
+        //noinspection unused, HardCodedStringLiteral
         String s2="sssssss";
     }
     @SuppressWarnings({"HardCodedStringLiteral"})