ConvertSwitchToIfIntention: fix processing of empty blocks

IDEA-205137 `Replace Switch with If` produce exceptions
IDEA-205122 Unwrap switch fails with exception

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java

@@ -340,7 +340,7 @@ public class ConvertSwitchToIfIntention implements IntentionAction {
         final PsiCodeBlock codeBlock = blockStatement.getCodeBlock();
         PsiElement start = PsiTreeUtil.skipWhitespacesForward(codeBlock.getFirstBodyElement());
         PsiElement end = PsiTreeUtil.skipWhitespacesBackward(codeBlock.getLastBodyElement());
-        if (start != null && end != null) {
+        if (start != null && end != null && start != codeBlock.getRBrace()) {
           for (PsiElement child = start; child != null; child = child.getNextSibling()) {
             out.append(commentTracker.text(child));
             if (child == end) break;

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

@@ -0,0 +1,8 @@
+// "Replace 'switch' with 'if'" "true"
+class Test {
+  void m() {
+      if (0 == 1) {
+      }
+
+  }
+}

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

@@ -0,0 +1,11 @@
+// "Replace 'switch' with 'if'" "true"
+class Test {
+  void m() {
+    switc<caret>h (0) {
+      case 1 -> {
+      }
+      default -> {}
+    }
+
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/switchDefault/afterRuleEmpty.java

@@ -0,0 +1,7 @@
+// "Unwrap 'switch'" "true"
+public class One {
+  void n() {
+    if (true) {
+    }
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/switchDefault/beforeRuleEmpty.java

@@ -0,0 +1,11 @@
+// "Unwrap 'switch'" "true"
+public class One {
+  void n() {
+    if (true) {
+      swit<caret>ch (0) {
+        default -> {
+        }
+      }
+    }
+  }
+}

java/java-tests/testSrc/com/intellij/java/propertyBased/Java12SwitchExpressionSanityTest.java

@@ -1,14 +1,12 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.java.propertyBased;
 
-import com.intellij.codeInspection.CommonQuickFixBundle;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiKeyword;
 import com.intellij.psi.PsiSwitchBlock;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.testFramework.IdeaTestUtil;
@@ -68,11 +66,7 @@ public class Java12SwitchExpressionSanityTest extends LightCodeInsightFixtureTes
         InvokeIntentionAroundSwitch anyIntentionInSwitchRange = new InvokeIntentionAroundSwitch(file, new JavaIntentionPolicy() {
           @Override
           protected boolean shouldSkipByFamilyName(@NotNull String familyName) {
-            return super.shouldSkipByFamilyName(familyName)
-                   //IDEA-205122
-                   || CommonQuickFixBundle.message("fix.unwrap", PsiKeyword.SWITCH).equals(familyName)
-                   //IDEA-205137
-                   || "Replace Switch with If".equals(familyName);
+            return super.shouldSkipByFamilyName(familyName);
           }
         });