From a6db339c7d0d0e6412b1202b1f18af231dfbecfc Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 29 Jun 2018 20:20:36 +0300
Subject: [PATCH] convert switch -> if: ignore whitespaces (IDEA-165260)

---
 .../daemon/impl/quickfix/ConvertSwitchToIfIntention.java         | 1 +
 .../daemonCodeAnalyzer/quickFix/convertSwitchToIf/after4.java    | 1 -
 .../quickFix/convertSwitchToIf/afterString.java                  | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java
index 7acfe637a522..2f96c2affdce 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java
@@ -296,6 +296,7 @@ public class ConvertSwitchToIfIntention implements IntentionAction {
   }
 
   private static void appendElement(PsiElement element, @NonNls StringBuilder out, CommentTracker commentTracker) {
+    if (element instanceof PsiWhiteSpace) return;
     if (element instanceof PsiBreakStatement) {
       final PsiBreakStatement breakStatement = (PsiBreakStatement)element;
       final PsiIdentifier identifier = breakStatement.getLabelIdentifier();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/after4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/after4.java
index 8ab4527ff5a4..5ee8aa2ff49b 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/after4.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/after4.java
@@ -5,7 +5,6 @@ class Precedence {
     int a = 10;
       if ((a & 1) == 0) {
           System.out.println("0");
-
       } else if ((a & 1) == 1) {
           System.out.println("1");
       }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterString.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterString.java
index 47791ae978e2..8beef0578e14 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterString.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterString.java
@@ -9,7 +9,6 @@ class X {
       //comment7
       //comment8
       if ("case1".equals(value)) {//comment2
-
       } else if ("case2".equals(value)) {
       } else {
       }