[kotlin] K2: Port UnfoldAssignmentToIfIntention

^KTIJ-32031 Fixed GitOrigin-RevId: a50320d11f09db7cc4ab304c68ef87a5b049af97
JetBrains · Dec 9, 2024 · 34780c2 · 34780c2
1 parent 19a9301
commit 34780c2
Show file tree

Hide file tree

Showing 28 changed files with 114 additions and 65 deletions.
diff --git a/...AssignmentToIfIntention/after.kt.template → ...AssignmentToIfIntention/after.kt.template b/...AssignmentToIfIntention/after.kt.template → ...AssignmentToIfIntention/after.kt.template
diff --git a/...ssignmentToIfIntention/before.kt.template → ...ssignmentToIfIntention/before.kt.template b/...ssignmentToIfIntention/before.kt.template → ...ssignmentToIfIntention/before.kt.template
diff --git a/...dAssignmentToIfIntention/description.html → ...dAssignmentToIfIntention/description.html b/...dAssignmentToIfIntention/description.html → ...dAssignmentToIfIntention/description.html
diff --git a/...kotlin/code-insight/intentions-shared/resources/kotlin.code-insight.intentions.shared.xml b/...kotlin/code-insight/intentions-shared/resources/kotlin.code-insight.intentions.shared.xml
@@ -301,5 +301,12 @@
       <categoryKey>group.names.kotlin</categoryKey>
     </intentionAction>
 
+    <intentionAction>
+      <language>kotlin</language>
+      <className>org.jetbrains.kotlin.idea.codeInsight.intentions.shared.UnfoldAssignmentToIfIntention</className>
+      <bundleName>messages.KotlinBundle</bundleName>
+      <categoryKey>group.names.kotlin</categoryKey>
+    </intentionAction>
+
   </extensions>
 </idea-plugin>
diff --git a/...tentions/UnfoldAssignmentToIfIntention.kt → ...s/shared/UnfoldAssignmentToIfIntention.kt b/...tentions/UnfoldAssignmentToIfIntention.kt → ...s/shared/UnfoldAssignmentToIfIntention.kt
@@ -1,13 +1,13 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 
-package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
+package org.jetbrains.kotlin.idea.codeInsight.intentions.shared
 
 import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
 import org.jetbrains.kotlin.idea.codeinsight.api.classic.intentions.SelfTargetingRangeIntention
-import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedUnfoldingUtils
+import org.jetbrains.kotlin.idea.codeinsight.utils.BranchedUnfoldingUtils
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtBinaryExpression
 import org.jetbrains.kotlin.psi.KtIfExpression
@@ -25,5 +25,5 @@ class UnfoldAssignmentToIfIntention : SelfTargetingRangeIntention<KtBinaryExpres
         return TextRange(element.startOffset, right.ifKeyword.endOffset)
     }
 
-    override fun applyTo(element: KtBinaryExpression, editor: Editor?) = BranchedUnfoldingUtils.unfoldAssignmentToIf(element, editor)
+    override fun applyTo(element: KtBinaryExpression, editor: Editor?): Unit = BranchedUnfoldingUtils.unfoldAssignmentToIf(element, editor)
 }
diff --git a/...g/jetbrains/kotlin/idea/codeInsight/intentions/shared/SharedK1IntentionTestGenerated.java b/...g/jetbrains/kotlin/idea/codeInsight/intentions/shared/SharedK1IntentionTestGenerated.java
@@ -2800,6 +2800,55 @@ public void testNoUnderscores() throws Exception {
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../testData/intentions/unfolding")
     public abstract static class Unfolding extends AbstractSharedK1IntentionTest {
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("../testData/intentions/unfolding/assignmentToIf")
+        public static class AssignmentToIf extends AbstractSharedK1IntentionTest {
+            @java.lang.Override
+            @org.jetbrains.annotations.NotNull
+            public final KotlinPluginMode getPluginMode() {
+                return KotlinPluginMode.K1;
+            }
+
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            }
+
+            @TestMetadata("innerIfTransformed.kt")
+            public void testInnerIfTransformed() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/innerIfTransformed.kt");
+            }
+
+            @TestMetadata("nestedIfs.kt")
+            public void testNestedIfs() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/nestedIfs.kt");
+            }
+
+            @TestMetadata("simpleIf.kt")
+            public void testSimpleIf() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/simpleIf.kt");
+            }
+
+            @TestMetadata("simpleIfWithAugmentedAssignment.kt")
+            public void testSimpleIfWithAugmentedAssignment() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt");
+            }
+
+            @TestMetadata("simpleIfWithBlocks.kt")
+            public void testSimpleIfWithBlocks() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/simpleIfWithBlocks.kt");
+            }
+
+            @TestMetadata("simpleIfWithComplexAssignmentLHS.kt")
+            public void testSimpleIfWithComplexAssignmentLHS() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt");
+            }
+
+            @TestMetadata("simpleIfWithoutAssignment.kt")
+            public void testSimpleIfWithoutAssignment() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt");
+            }
+        }
+
         @RunWith(JUnit3RunnerWithInners.class)
         @TestMetadata("../testData/intentions/unfolding/functionCallToIf")
         public static class FunctionCallToIf extends AbstractSharedK1IntentionTest {

diff --git a/...etbrains/kotlin/idea/k2/codeInsight/intentions/shared/SharedK2IntentionTestGenerated.java b/...etbrains/kotlin/idea/k2/codeInsight/intentions/shared/SharedK2IntentionTestGenerated.java
@@ -2800,6 +2800,55 @@ public void testNoUnderscores() throws Exception {
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../testData/intentions/unfolding")
     public abstract static class Unfolding extends AbstractSharedK2IntentionTest {
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("../testData/intentions/unfolding/assignmentToIf")
+        public static class AssignmentToIf extends AbstractSharedK2IntentionTest {
+            @java.lang.Override
+            @org.jetbrains.annotations.NotNull
+            public final KotlinPluginMode getPluginMode() {
+                return KotlinPluginMode.K2;
+            }
+
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            }
+
+            @TestMetadata("innerIfTransformed.kt")
+            public void testInnerIfTransformed() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/innerIfTransformed.kt");
+            }
+
+            @TestMetadata("nestedIfs.kt")
+            public void testNestedIfs() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/nestedIfs.kt");
+            }
+
+            @TestMetadata("simpleIf.kt")
+            public void testSimpleIf() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/simpleIf.kt");
+            }
+
+            @TestMetadata("simpleIfWithAugmentedAssignment.kt")
+            public void testSimpleIfWithAugmentedAssignment() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt");
+            }
+
+            @TestMetadata("simpleIfWithBlocks.kt")
+            public void testSimpleIfWithBlocks() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/simpleIfWithBlocks.kt");
+            }
+
+            @TestMetadata("simpleIfWithComplexAssignmentLHS.kt")
+            public void testSimpleIfWithComplexAssignmentLHS() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt");
+            }
+
+            @TestMetadata("simpleIfWithoutAssignment.kt")
+            public void testSimpleIfWithoutAssignment() throws Exception {
+                runTest("../testData/intentions/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt");
+            }
+        }
+
         @RunWith(JUnit3RunnerWithInners.class)
         @TestMetadata("../testData/intentions/unfolding/functionCallToIf")
         public static class FunctionCallToIf extends AbstractSharedK2IntentionTest {

diff --git a/...e-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/.intention b/...e-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.codeInsight.intentions.shared.UnfoldAssignmentToIfIntention
diff --git a/...ding/assignmentToIf/innerIfTransformed.kt → ...ding/assignmentToIf/innerIfTransformed.kt b/...ding/assignmentToIf/innerIfTransformed.kt → ...ding/assignmentToIf/innerIfTransformed.kt
diff --git a/...ssignmentToIf/innerIfTransformed.kt.after → ...ssignmentToIf/innerIfTransformed.kt.after b/...ssignmentToIf/innerIfTransformed.kt.after → ...ssignmentToIf/innerIfTransformed.kt.after
diff --git a/...hed/unfolding/assignmentToIf/nestedIfs.kt → ...ons/unfolding/assignmentToIf/nestedIfs.kt b/...hed/unfolding/assignmentToIf/nestedIfs.kt → ...ons/unfolding/assignmentToIf/nestedIfs.kt
diff --git a/...folding/assignmentToIf/nestedIfs.kt.after → ...folding/assignmentToIf/nestedIfs.kt.after b/...folding/assignmentToIf/nestedIfs.kt.after → ...folding/assignmentToIf/nestedIfs.kt.after
diff --git a/...ched/unfolding/assignmentToIf/simpleIf.kt → ...ions/unfolding/assignmentToIf/simpleIf.kt b/...ched/unfolding/assignmentToIf/simpleIf.kt → ...ions/unfolding/assignmentToIf/simpleIf.kt
diff --git a/...nfolding/assignmentToIf/simpleIf.kt.after → ...nfolding/assignmentToIf/simpleIf.kt.after b/...nfolding/assignmentToIf/simpleIf.kt.after → ...nfolding/assignmentToIf/simpleIf.kt.after
diff --git a/...ntToIf/simpleIfWithAugmentedAssignment.kt → ...ntToIf/simpleIfWithAugmentedAssignment.kt b/...ntToIf/simpleIfWithAugmentedAssignment.kt → ...ntToIf/simpleIfWithAugmentedAssignment.kt
diff --git a/.../simpleIfWithAugmentedAssignment.kt.after → .../simpleIfWithAugmentedAssignment.kt.after b/.../simpleIfWithAugmentedAssignment.kt.after → .../simpleIfWithAugmentedAssignment.kt.after
diff --git a/...ding/assignmentToIf/simpleIfWithBlocks.kt → ...ding/assignmentToIf/simpleIfWithBlocks.kt b/...ding/assignmentToIf/simpleIfWithBlocks.kt → ...ding/assignmentToIf/simpleIfWithBlocks.kt
diff --git a/...ssignmentToIf/simpleIfWithBlocks.kt.after → ...ssignmentToIf/simpleIfWithBlocks.kt.after b/...ssignmentToIf/simpleIfWithBlocks.kt.after → ...ssignmentToIf/simpleIfWithBlocks.kt.after
diff --git a/...tToIf/simpleIfWithComplexAssignmentLHS.kt → ...tToIf/simpleIfWithComplexAssignmentLHS.kt b/...tToIf/simpleIfWithComplexAssignmentLHS.kt → ...tToIf/simpleIfWithComplexAssignmentLHS.kt
diff --git a/...simpleIfWithComplexAssignmentLHS.kt.after → ...simpleIfWithComplexAssignmentLHS.kt.after b/...simpleIfWithComplexAssignmentLHS.kt.after → ...simpleIfWithComplexAssignmentLHS.kt.after
diff --git a/...signmentToIf/simpleIfWithoutAssignment.kt → ...signmentToIf/simpleIfWithoutAssignment.kt b/...signmentToIf/simpleIfWithoutAssignment.kt → ...signmentToIf/simpleIfWithoutAssignment.kt
diff --git a/...Transformations/BranchedUnfoldingUtils.kt → ...deinsight/utils/BranchedUnfoldingUtils.kt b/...Transformations/BranchedUnfoldingUtils.kt → ...deinsight/utils/BranchedUnfoldingUtils.kt
@@ -1,6 +1,6 @@
 // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
-package org.jetbrains.kotlin.idea.intentions.branchedTransformations
+package org.jetbrains.kotlin.idea.codeinsight.utils
 
 import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.idea.base.psi.copied

diff --git a/...lin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToWhenIntention.kt b/...lin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToWhenIntention.kt
@@ -7,7 +7,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
 import org.jetbrains.kotlin.idea.codeinsight.api.classic.intentions.SelfTargetingRangeIntention
-import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedUnfoldingUtils
+import org.jetbrains.kotlin.idea.codeinsight.utils.BranchedUnfoldingUtils
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtBinaryExpression
 import org.jetbrains.kotlin.psi.KtPsiUtil

diff --git a/.../kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToIfIntention.kt b/.../kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToIfIntention.kt
@@ -7,7 +7,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
 import org.jetbrains.kotlin.idea.codeinsight.api.classic.intentions.SelfTargetingRangeIntention
-import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedUnfoldingUtils
+import org.jetbrains.kotlin.idea.codeinsight.utils.BranchedUnfoldingUtils
 import org.jetbrains.kotlin.idea.intentions.splitPropertyDeclaration
 import org.jetbrains.kotlin.psi.KtIfExpression
 import org.jetbrains.kotlin.psi.KtProperty

diff --git a/...otlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToWhenIntention.kt b/...otlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToWhenIntention.kt
@@ -7,7 +7,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
 import org.jetbrains.kotlin.idea.codeinsight.api.classic.intentions.SelfTargetingRangeIntention
-import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedUnfoldingUtils
+import org.jetbrains.kotlin.idea.codeinsight.utils.BranchedUnfoldingUtils
 import org.jetbrains.kotlin.idea.intentions.splitPropertyDeclaration
 import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.psi.KtPsiUtil

diff --git a/...kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/K1IntentionTestGenerated.java b/...kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/K1IntentionTestGenerated.java
@@ -3435,55 +3435,6 @@ public void testUsedInUncheckedIfExpression() throws Exception {
         @RunWith(JUnit3RunnerWithInners.class)
         @TestMetadata("testData/intentions/branched/unfolding")
         public abstract static class Unfolding extends AbstractK1IntentionTest {
-            @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/intentions/branched/unfolding/assignmentToIf")
-            public static class AssignmentToIf extends AbstractK1IntentionTest {
-                @java.lang.Override
-                @org.jetbrains.annotations.NotNull
-                public final KotlinPluginMode getPluginMode() {
-                    return KotlinPluginMode.K1;
-                }
-
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-                }
-
-                @TestMetadata("innerIfTransformed.kt")
-                public void testInnerIfTransformed() throws Exception {
-                    runTest("testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt");
-                }
-
-                @TestMetadata("nestedIfs.kt")
-                public void testNestedIfs() throws Exception {
-                    runTest("testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt");
-                }
-
-                @TestMetadata("simpleIf.kt")
-                public void testSimpleIf() throws Exception {
-                    runTest("testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt");
-                }
-
-                @TestMetadata("simpleIfWithAugmentedAssignment.kt")
-                public void testSimpleIfWithAugmentedAssignment() throws Exception {
-                    runTest("testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt");
-                }
-
-                @TestMetadata("simpleIfWithBlocks.kt")
-                public void testSimpleIfWithBlocks() throws Exception {
-                    runTest("testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt");
-                }
-
-                @TestMetadata("simpleIfWithComplexAssignmentLHS.kt")
-                public void testSimpleIfWithComplexAssignmentLHS() throws Exception {
-                    runTest("testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt");
-                }
-
-                @TestMetadata("simpleIfWithoutAssignment.kt")
-                public void testSimpleIfWithoutAssignment() throws Exception {
-                    runTest("testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt");
-                }
-            }
-
             @RunWith(JUnit3RunnerWithInners.class)
             @TestMetadata("testData/intentions/branched/unfolding/assignmentToWhen")
             public static class AssignmentToWhen extends AbstractK1IntentionTest {

diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/.intention b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/.intention
diff --git a/plugins/kotlin/plugin/k1/resources/META-INF/inspections-fe10.xml b/plugins/kotlin/plugin/k1/resources/META-INF/inspections-fe10.xml
@@ -84,13 +84,6 @@
       <categoryKey>group.names.kotlin</categoryKey>
     </intentionAction>
 
-    <intentionAction>
-      <language>kotlin</language>
-      <className>org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldAssignmentToIfIntention</className>
-      <bundleName>messages.KotlinBundle</bundleName>
-      <categoryKey>group.names.kotlin</categoryKey>
-    </intentionAction>
-
     <intentionAction>
       <language>kotlin</language>
       <className>org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldPropertyToIfIntention</className>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		org.jetbrains.kotlin.idea.codeInsight.intentions.shared.UnfoldAssignmentToIfIntention