IDEA-275893 [extract method]: align selection for switch statement rules

GitOrigin-RevId: 00c58a19d98bdc99b95cd228b1cc2fa746e9d301

java/java-impl/src/com/intellij/refactoring/extractMethod/newImpl/ExtractSelector.kt

@@ -41,6 +41,7 @@ class ExtractSelector {
       singleElement is PsiBlockStatement -> if (singleElement.codeBlock.firstBodyElement != null) listOf(singleElement) else emptyList()
       singleElement is PsiCodeBlock -> alignCodeBlock(singleElement)
       singleElement is PsiExpression -> listOfNotNull(alignExpression(singleElement))
+      singleElement is PsiSwitchLabeledRuleStatement -> listOfNotNull(singleElement.body)
       else -> elements
     }
     return when {
@@ -86,11 +87,8 @@ class ExtractSelector {
     val filteredStatements = statements
       .dropWhile { it is PsiSwitchLabelStatement || it is PsiWhiteSpace }
       .dropLastWhile { it is PsiSwitchLabelStatement || it is PsiWhiteSpace }
-    return if (filteredStatements.any { it is PsiSwitchLabelStatement }) {
-      emptyList()
-    } else {
-      filteredStatements
-    }
+    if (filteredStatements.any { it is PsiSwitchLabelStatement || it is PsiSwitchLabeledRuleStatement }) return emptyList()
+    return filteredStatements
   }
 
   private fun isInsideAnnotation(expression: PsiExpression): Boolean {

java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DisabledOnSwitchRules.java

@@ -0,0 +1,14 @@
+package test;
+
+public class Test1 {
+    void test(){
+        String s = "sample";
+        switch (s) {
+            <selection>case "one" -> {
+                System.out.println("one");
+                System.out.println("two");
+            }
+            default -> System.out.println();</selection>
+        }
+    }
+}

java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/NormalizedOnSwitchRule.java

@@ -0,0 +1,14 @@
+package test;
+
+public class Test1 {
+    void test(){
+        String s = "sample";
+        switch (s) {
+            <selection>case "one" -> {
+                System.out.println("one");
+                System.out.println("two");
+            }</selection>
+            default -> System.out.println();
+        }
+    }
+}

java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/NormalizedOnSwitchRule_after.java

@@ -0,0 +1,16 @@
+package test;
+
+public class Test1 {
+    void test(){
+        String s = "sample";
+        switch (s) {
+            case "one" -> extracted();
+            default -> System.out.println();
+        }
+    }
+
+    private void extracted() {
+        System.out.println("one");
+        System.out.println("two");
+    }
+}

java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodAndDuplicatesInplaceTest.kt

@@ -9,6 +9,7 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.TextRange
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.pom.java.LanguageLevel
+import com.intellij.refactoring.RefactoringBundle
 import com.intellij.refactoring.extractMethod.newImpl.MethodExtractor
 import com.intellij.refactoring.listeners.RefactoringEventData
 import com.intellij.refactoring.listeners.RefactoringEventListener
@@ -135,6 +136,16 @@ class ExtractMethodAndDuplicatesInplaceTest: LightJavaCodeInsightTestCase() {
     doTest()
   }
 
+  fun testDisabledOnSwitchRules(){
+    assertThrows(RefactoringErrorHintException::class.java, RefactoringBundle.message("selected.block.should.represent.a.set.of.statements.or.an.expression")) {
+      doTest()
+    }
+  }
+
+  fun testNormalizedOnSwitchRule(){
+    doTest()
+  }
+
   fun testRefactoringListener(){
     templateTest {
       configureByFile("$BASE_PATH/${getTestName(false)}.java")