ConvertSwitchToIfIntention: better comments handling

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterCommentsWithDefault.java

@@ -0,0 +1,13 @@
+// "Replace 'switch' with 'if'" "true"
+class Foo {
+  Object foo(int x) {
+      if (x == 1) { // not needed
+          return null;
+      } else if (x == 2) {// not needed
+          return null;
+      } else if (x == 4) {
+          return "foo";
+      }
+      return null;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterString.java

@@ -1,13 +1,13 @@
 // "Replace 'switch' with 'if'" "true"
 class X {
   public void doSomething( String value) {
-      //comment1
-      //comment4
       //comment6
       //comment7
-      if ("case1".equals(value)) {//comment2
+      if ("case1".equals(value)) {//comment1
+          //comment2
           //comment3
-      } else if ("case2".equals(value)) {//comment5
+      } else if ("case2".equals(value)) {//comment4
+          //comment5
       }//comment8
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeCommentsWithDefault.java

@@ -0,0 +1,15 @@
+// "Replace 'switch' with 'if'" "true"
+class Foo {
+  Object foo(int x) {
+    sw<caret>itch (x) {
+      case 1: // not needed
+        return null;
+      case 2:// not needed
+        return null;
+      case 4:
+        return "foo";
+      default:
+        return null;
+    }
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrap.java

@@ -2,6 +2,10 @@
 class Main {
     static void fff(int x) {
         if (x == 5) {
+            //1
+            //2
+            //3
+            //4
             System.out.println("five-ten-fifteen"); //5
             System.out.println("six"); //6
             System.out.println("seven"); //7