From 34780c297919f4ecc0053a1b9586b27602b64a0a Mon Sep 17 00:00:00 2001
From: Vlad Koshkin <vladislav.koshkin@jetbrains.com>
Date: Thu, 5 Dec 2024 23:14:03 +0100
Subject: [PATCH] [kotlin] K2: Port UnfoldAssignmentToIfIntention

^KTIJ-32031 Fixed

GitOrigin-RevId: a50320d11f09db7cc4ab304c68ef87a5b049af97
---
 .../after.kt.template                         |  0
 .../before.kt.template                        |  0
 .../description.html                          |  0
 .../kotlin.code-insight.intentions.shared.xml |  7 +++
 .../shared}/UnfoldAssignmentToIfIntention.kt  |  8 +--
 .../SharedK1IntentionTestGenerated.java       | 49 +++++++++++++++++++
 .../SharedK2IntentionTestGenerated.java       | 49 +++++++++++++++++++
 .../unfolding/assignmentToIf/.intention       |  1 +
 .../assignmentToIf/innerIfTransformed.kt      |  0
 .../innerIfTransformed.kt.after               |  0
 .../unfolding/assignmentToIf/nestedIfs.kt     |  0
 .../assignmentToIf/nestedIfs.kt.after         |  0
 .../unfolding/assignmentToIf/simpleIf.kt      |  0
 .../assignmentToIf/simpleIf.kt.after          |  0
 .../simpleIfWithAugmentedAssignment.kt        |  0
 .../simpleIfWithAugmentedAssignment.kt.after  |  0
 .../assignmentToIf/simpleIfWithBlocks.kt      |  0
 .../simpleIfWithBlocks.kt.after               |  0
 .../simpleIfWithComplexAssignmentLHS.kt       |  0
 .../simpleIfWithComplexAssignmentLHS.kt.after |  0
 .../simpleIfWithoutAssignment.kt              |  0
 .../utils}/BranchedUnfoldingUtils.kt          |  2 +-
 .../UnfoldAssignmentToWhenIntention.kt        |  2 +-
 .../intentions/UnfoldPropertyToIfIntention.kt |  2 +-
 .../UnfoldPropertyToWhenIntention.kt          |  2 +-
 .../intentions/K1IntentionTestGenerated.java  | 49 -------------------
 .../unfolding/assignmentToIf/.intention       |  1 -
 .../resources/META-INF/inspections-fe10.xml   |  7 ---
 28 files changed, 114 insertions(+), 65 deletions(-)
 rename plugins/kotlin/code-insight/{descriptions => intentions-shared}/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/after.kt.template (100%)
 rename plugins/kotlin/code-insight/{descriptions => intentions-shared}/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/before.kt.template (100%)
 rename plugins/kotlin/code-insight/{descriptions => intentions-shared}/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/description.html (100%)
 rename plugins/kotlin/{idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions => code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared}/UnfoldAssignmentToIfIntention.kt (74%)
 create mode 100644 plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/.intention
 rename plugins/kotlin/{idea/tests/testData/intentions/branched => code-insight/intentions-shared/tests/testData/intentions}/unfolding/assignmentToIf/innerIfTransformed.kt (100%)
 rename plugins/kotlin/{idea/tests/testData/intentions/branched => code-insight/intentions-shared/tests/testData/intentions}/unfolding/assignmentToIf/innerIfTransformed.kt.after (100%)
 rename plugins/kotlin/{idea/tests/testData/intentions/branched => code-insight/intentions-shared/tests/testData/intentions}/unfolding/assignmentToIf/nestedIfs.kt (100%)
 rename plugins/kotlin/{idea/tests/testData/intentions/branched => code-insight/intentions-shared/tests/testData/intentions}/unfolding/assignmentToIf/nestedIfs.kt.after (100%)
 rename plugins/kotlin/{idea/tests/testData/intentions/branched => code-insight/intentions-shared/tests/testData/intentions}/unfolding/assignmentToIf/simpleIf.kt (100%)
 rename plugins/kotlin/{idea/tests/testData/intentions/branched => code-insight/intentions-shared/tests/testData/intentions}/unfolding/assignmentToIf/simpleIf.kt.after (100%)
 rename plugins/kotlin/{idea/tests/testData/intentions/branched => code-insight/intentions-shared/tests/testData/intentions}/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt (100%)
 rename plugins/kotlin/{idea/tests/testData/intentions/branched => code-insight/intentions-shared/tests/testData/intentions}/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt.after (100%)
 rename plugins/kotlin/{idea/tests/testData/intentions/branched => code-insight/intentions-shared/tests/testData/intentions}/unfolding/assignmentToIf/simpleIfWithBlocks.kt (100%)
 rename plugins/kotlin/{idea/tests/testData/intentions/branched => code-insight/intentions-shared/tests/testData/intentions}/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after (100%)
 rename plugins/kotlin/{idea/tests/testData/intentions/branched => code-insight/intentions-shared/tests/testData/intentions}/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt (100%)
 rename plugins/kotlin/{idea/tests/testData/intentions/branched => code-insight/intentions-shared/tests/testData/intentions}/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt.after (100%)
 rename plugins/kotlin/{idea/tests/testData/intentions/branched => code-insight/intentions-shared/tests/testData/intentions}/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt (100%)
 rename plugins/kotlin/{idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations => code-insight/utils/src/org/jetbrains/kotlin/idea/codeinsight/utils}/BranchedUnfoldingUtils.kt (96%)
 delete mode 100644 plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/.intention

diff --git a/plugins/kotlin/code-insight/descriptions/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/after.kt.template b/plugins/kotlin/code-insight/intentions-shared/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/after.kt.template
similarity index 100%
rename from plugins/kotlin/code-insight/descriptions/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/after.kt.template
rename to plugins/kotlin/code-insight/intentions-shared/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/after.kt.template
diff --git a/plugins/kotlin/code-insight/descriptions/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/before.kt.template b/plugins/kotlin/code-insight/intentions-shared/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/before.kt.template
similarity index 100%
rename from plugins/kotlin/code-insight/descriptions/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/before.kt.template
rename to plugins/kotlin/code-insight/intentions-shared/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/before.kt.template
diff --git a/plugins/kotlin/code-insight/descriptions/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/description.html b/plugins/kotlin/code-insight/intentions-shared/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/description.html
similarity index 100%
rename from plugins/kotlin/code-insight/descriptions/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/description.html
rename to plugins/kotlin/code-insight/intentions-shared/resources-en/intentionDescriptions/UnfoldAssignmentToIfIntention/description.html
diff --git a/plugins/kotlin/code-insight/intentions-shared/resources/kotlin.code-insight.intentions.shared.xml b/plugins/kotlin/code-insight/intentions-shared/resources/kotlin.code-insight.intentions.shared.xml
index f9fc351f3eadf..af87670838780 100644
--- a/plugins/kotlin/code-insight/intentions-shared/resources/kotlin.code-insight.intentions.shared.xml
+++ b/plugins/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>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToIfIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/UnfoldAssignmentToIfIntention.kt
similarity index 74%
rename from plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToIfIntention.kt
rename to plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/UnfoldAssignmentToIfIntention.kt
index 5f2dd33c1984f..c98f3f349f203 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToIfIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/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)
 }
\ No newline at end of file
diff --git a/plugins/kotlin/code-insight/intentions-shared/tests/k1/test/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/SharedK1IntentionTestGenerated.java b/plugins/kotlin/code-insight/intentions-shared/tests/k1/test/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/SharedK1IntentionTestGenerated.java
index 458523f3b8cdd..142bddcf61f2e 100644
--- a/plugins/kotlin/code-insight/intentions-shared/tests/k1/test/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/SharedK1IntentionTestGenerated.java
+++ b/plugins/kotlin/code-insight/intentions-shared/tests/k1/test/org/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/plugins/kotlin/code-insight/intentions-shared/tests/k2/test/org/jetbrains/kotlin/idea/k2/codeInsight/intentions/shared/SharedK2IntentionTestGenerated.java b/plugins/kotlin/code-insight/intentions-shared/tests/k2/test/org/jetbrains/kotlin/idea/k2/codeInsight/intentions/shared/SharedK2IntentionTestGenerated.java
index 2c68a77ff8f55..5da6b09ae38c3 100644
--- a/plugins/kotlin/code-insight/intentions-shared/tests/k2/test/org/jetbrains/kotlin/idea/k2/codeInsight/intentions/shared/SharedK2IntentionTestGenerated.java
+++ b/plugins/kotlin/code-insight/intentions-shared/tests/k2/test/org/jetbrains/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/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/.intention b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/.intention
new file mode 100644
index 0000000000000..b466dd5ba058c
--- /dev/null
+++ b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.codeInsight.intentions.shared.UnfoldAssignmentToIfIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/innerIfTransformed.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/innerIfTransformed.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/innerIfTransformed.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/innerIfTransformed.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/nestedIfs.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/nestedIfs.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt.after b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/nestedIfs.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt.after
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/nestedIfs.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIf.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIf.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt.after b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIf.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt.after
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIf.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt.after b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt.after
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithBlocks.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithBlocks.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt.after b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt.after
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedUnfoldingUtils.kt b/plugins/kotlin/code-insight/utils/src/org/jetbrains/kotlin/idea/codeinsight/utils/BranchedUnfoldingUtils.kt
similarity index 96%
rename from plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedUnfoldingUtils.kt
rename to plugins/kotlin/code-insight/utils/src/org/jetbrains/kotlin/idea/codeinsight/utils/BranchedUnfoldingUtils.kt
index 18bafef93003e..bfe46c2f2e667 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedUnfoldingUtils.kt
+++ b/plugins/kotlin/code-insight/utils/src/org/jetbrains/kotlin/idea/codeinsight/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/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToWhenIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToWhenIntention.kt
index 6eec66b7dafed..7b4d7a885ada0 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToWhenIntention.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/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/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToIfIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToIfIntention.kt
index a1dccb3e17d01..2ac66ca6adff8 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToIfIntention.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/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/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToWhenIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToWhenIntention.kt
index f4e3cd976843a..9aac07e6a5420 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToWhenIntention.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/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/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/K1IntentionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/K1IntentionTestGenerated.java
index 6f82da2e5c042..49388d4a4caf1 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/K1IntentionTestGenerated.java
+++ b/plugins/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
deleted file mode 100644
index 4b30f5f1f3538..0000000000000
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/.intention
+++ /dev/null
@@ -1 +0,0 @@
-org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldAssignmentToIfIntention
diff --git a/plugins/kotlin/plugin/k1/resources/META-INF/inspections-fe10.xml b/plugins/kotlin/plugin/k1/resources/META-INF/inspections-fe10.xml
index 64ad8e3eddeaa..31cb9bbbb74cf 100644
--- 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>