From 703e934506e8bcb273c12c67670304cbeef4a161 Mon Sep 17 00:00:00 2001
From: "vlad.koshkin" <vladislav.koshkin@jetbrains.com>
Date: Mon, 11 Dec 2023 12:35:25 +0000
Subject: [PATCH] [kotlin] IndentRawStringIntention to k2

^KTIJ-22963 Fixed

GitOrigin-RevId: 4f627ead2f85e2c81a6fe85fb0bf62e2fa87d1ba
---
 .../after.kt.template                         |  0
 .../before.kt.template                        |  0
 .../IndentRawStringIntention/description.html |  0
 .../kotlin.code-insight.intentions-shared.xml |  6 +++
 .../shared}/IndentRawStringIntention.kt       | 11 ++---
 .../SharedK1IntentionTestGenerated.java       | 43 +++++++++++++++++++
 .../SharedK2IntentionTestGenerated.java       | 43 +++++++++++++++++++
 .../intentions/indentRawString/.intention     |  1 +
 .../indentRawString/annotationEntry.kt        |  0
 .../intentions/indentRawString/const.kt       |  0
 .../intentions/indentRawString/hasIndent.kt   |  0
 .../indentRawString/notRawString.kt           |  0
 .../intentions/indentRawString/receiver.kt    |  0
 .../intentions/indentRawString/simple.kt      |  0
 .../indentRawString/simple.kt.after           |  0
 .../intentions/indentRawString/singleLine.kt  |  0
 .../intentions/K1IntentionTestGenerated.java  | 43 -------------------
 .../intentions/indentRawString/.intention     |  1 -
 .../j2k/post/processing/allProcessings.kt     |  1 +
 .../resources/META-INF/inspections-fe10.xml   |  7 ---
 20 files changed, 100 insertions(+), 56 deletions(-)
 rename plugins/kotlin/code-insight/{descriptions => intentions-shared}/resources-en/intentionDescriptions/IndentRawStringIntention/after.kt.template (100%)
 rename plugins/kotlin/code-insight/{descriptions => intentions-shared}/resources-en/intentionDescriptions/IndentRawStringIntention/before.kt.template (100%)
 rename plugins/kotlin/code-insight/{descriptions => intentions-shared}/resources-en/intentionDescriptions/IndentRawStringIntention/description.html (100%)
 rename plugins/kotlin/{idea/src/org/jetbrains/kotlin/idea/intentions => code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared}/IndentRawStringIntention.kt (88%)
 create mode 100644 plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/.intention
 rename plugins/kotlin/{idea => code-insight/intentions-shared}/tests/testData/intentions/indentRawString/annotationEntry.kt (100%)
 rename plugins/kotlin/{idea => code-insight/intentions-shared}/tests/testData/intentions/indentRawString/const.kt (100%)
 rename plugins/kotlin/{idea => code-insight/intentions-shared}/tests/testData/intentions/indentRawString/hasIndent.kt (100%)
 rename plugins/kotlin/{idea => code-insight/intentions-shared}/tests/testData/intentions/indentRawString/notRawString.kt (100%)
 rename plugins/kotlin/{idea => code-insight/intentions-shared}/tests/testData/intentions/indentRawString/receiver.kt (100%)
 rename plugins/kotlin/{idea => code-insight/intentions-shared}/tests/testData/intentions/indentRawString/simple.kt (100%)
 rename plugins/kotlin/{idea => code-insight/intentions-shared}/tests/testData/intentions/indentRawString/simple.kt.after (100%)
 rename plugins/kotlin/{idea => code-insight/intentions-shared}/tests/testData/intentions/indentRawString/singleLine.kt (100%)
 delete mode 100644 plugins/kotlin/idea/tests/testData/intentions/indentRawString/.intention

diff --git a/plugins/kotlin/code-insight/descriptions/resources-en/intentionDescriptions/IndentRawStringIntention/after.kt.template b/plugins/kotlin/code-insight/intentions-shared/resources-en/intentionDescriptions/IndentRawStringIntention/after.kt.template
similarity index 100%
rename from plugins/kotlin/code-insight/descriptions/resources-en/intentionDescriptions/IndentRawStringIntention/after.kt.template
rename to plugins/kotlin/code-insight/intentions-shared/resources-en/intentionDescriptions/IndentRawStringIntention/after.kt.template
diff --git a/plugins/kotlin/code-insight/descriptions/resources-en/intentionDescriptions/IndentRawStringIntention/before.kt.template b/plugins/kotlin/code-insight/intentions-shared/resources-en/intentionDescriptions/IndentRawStringIntention/before.kt.template
similarity index 100%
rename from plugins/kotlin/code-insight/descriptions/resources-en/intentionDescriptions/IndentRawStringIntention/before.kt.template
rename to plugins/kotlin/code-insight/intentions-shared/resources-en/intentionDescriptions/IndentRawStringIntention/before.kt.template
diff --git a/plugins/kotlin/code-insight/descriptions/resources-en/intentionDescriptions/IndentRawStringIntention/description.html b/plugins/kotlin/code-insight/intentions-shared/resources-en/intentionDescriptions/IndentRawStringIntention/description.html
similarity index 100%
rename from plugins/kotlin/code-insight/descriptions/resources-en/intentionDescriptions/IndentRawStringIntention/description.html
rename to plugins/kotlin/code-insight/intentions-shared/resources-en/intentionDescriptions/IndentRawStringIntention/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 b9d8e048e361..0ab8c37b38ba 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
@@ -189,5 +189,11 @@
       <categoryKey>group.names.kotlin</categoryKey>
     </intentionAction>
 
+    <intentionAction>
+      <language>kotlin</language>
+      <className>org.jetbrains.kotlin.idea.codeInsight.intentions.shared.IndentRawStringIntention</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/IndentRawStringIntention.kt b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/IndentRawStringIntention.kt
similarity index 88%
rename from plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/IndentRawStringIntention.kt
rename to plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/IndentRawStringIntention.kt
index eb454bedb4aa..0b602d1d085f 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/IndentRawStringIntention.kt
+++ b/plugins/kotlin/code-insight/intentions-shared/src/org/jetbrains/kotlin/idea/codeInsight/intentions/shared/IndentRawStringIntention.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.
+// Copyright 2000-2023 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
+package org.jetbrains.kotlin.idea.codeInsight.intentions.shared
 
 import com.intellij.application.options.CodeStyle
 import com.intellij.openapi.editor.Editor
@@ -16,11 +16,13 @@ import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForReceiver
 import org.jetbrains.kotlin.psi.psiUtil.parents
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
+private const val QTS = "\"\"\""
+
 class IndentRawStringIntention : SelfTargetingOffsetIndependentIntention<KtStringTemplateExpression>(
     KtStringTemplateExpression::class.java, KotlinBundle.lazyMessage("indent.raw.string")
 ) {
     override fun isApplicableTo(element: KtStringTemplateExpression): Boolean {
-        if (!element.text.startsWith("\"\"\"")) return false
+        if (!element.text.startsWith(QTS)) return false
         if (element.parents.any { it is KtAnnotationEntry || (it as? KtProperty)?.hasModifier(KtTokens.CONST_KEYWORD) == true }) return false
         if (element.getQualifiedExpressionForReceiver() != null) return false
         val entries = element.entries
@@ -44,7 +46,6 @@ class IndentRawStringIntention : SelfTargetingOffsetIndependentIntention<KtStrin
             }
         }
 
-        element.replace(KtPsiFactory(project).createExpression("\"\"\"$newString\"\"\".trimIndent()"))
+        element.replace(KtPsiFactory(project).createExpression("$QTS${newString}$QTS.trimIndent()"))
     }
-
 }
\ 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 50be49d11bab..eb0a9925c7d7 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
@@ -778,6 +778,49 @@ public abstract class SharedK1IntentionTestGenerated extends AbstractSharedK1Int
         }
     }
 
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("../testData/intentions/indentRawString")
+    public static class IndentRawString extends AbstractSharedK1IntentionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("annotationEntry.kt")
+        public void testAnnotationEntry() throws Exception {
+            runTest("../testData/intentions/indentRawString/annotationEntry.kt");
+        }
+
+        @TestMetadata("const.kt")
+        public void testConst() throws Exception {
+            runTest("../testData/intentions/indentRawString/const.kt");
+        }
+
+        @TestMetadata("hasIndent.kt")
+        public void testHasIndent() throws Exception {
+            runTest("../testData/intentions/indentRawString/hasIndent.kt");
+        }
+
+        @TestMetadata("notRawString.kt")
+        public void testNotRawString() throws Exception {
+            runTest("../testData/intentions/indentRawString/notRawString.kt");
+        }
+
+        @TestMetadata("receiver.kt")
+        public void testReceiver() throws Exception {
+            runTest("../testData/intentions/indentRawString/receiver.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("../testData/intentions/indentRawString/simple.kt");
+        }
+
+        @TestMetadata("singleLine.kt")
+        public void testSingleLine() throws Exception {
+            runTest("../testData/intentions/indentRawString/singleLine.kt");
+        }
+    }
+
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../testData/intentions/operatorToFunction")
     public static class OperatorToFunction 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 b2109a9b0878..1e72d783ad42 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
@@ -778,6 +778,49 @@ public abstract class SharedK2IntentionTestGenerated extends AbstractSharedK2Int
         }
     }
 
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("../testData/intentions/indentRawString")
+    public static class IndentRawString extends AbstractSharedK2IntentionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("annotationEntry.kt")
+        public void testAnnotationEntry() throws Exception {
+            runTest("../testData/intentions/indentRawString/annotationEntry.kt");
+        }
+
+        @TestMetadata("const.kt")
+        public void testConst() throws Exception {
+            runTest("../testData/intentions/indentRawString/const.kt");
+        }
+
+        @TestMetadata("hasIndent.kt")
+        public void testHasIndent() throws Exception {
+            runTest("../testData/intentions/indentRawString/hasIndent.kt");
+        }
+
+        @TestMetadata("notRawString.kt")
+        public void testNotRawString() throws Exception {
+            runTest("../testData/intentions/indentRawString/notRawString.kt");
+        }
+
+        @TestMetadata("receiver.kt")
+        public void testReceiver() throws Exception {
+            runTest("../testData/intentions/indentRawString/receiver.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("../testData/intentions/indentRawString/simple.kt");
+        }
+
+        @TestMetadata("singleLine.kt")
+        public void testSingleLine() throws Exception {
+            runTest("../testData/intentions/indentRawString/singleLine.kt");
+        }
+    }
+
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../testData/intentions/operatorToFunction")
     public static class OperatorToFunction extends AbstractSharedK2IntentionTest {
diff --git a/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/.intention b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/.intention
new file mode 100644
index 000000000000..a53c9196cbd6
--- /dev/null
+++ b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.codeInsight.intentions.shared.IndentRawStringIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/indentRawString/annotationEntry.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/annotationEntry.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/indentRawString/annotationEntry.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/annotationEntry.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/indentRawString/const.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/const.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/indentRawString/const.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/const.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/indentRawString/hasIndent.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/hasIndent.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/indentRawString/hasIndent.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/hasIndent.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/indentRawString/notRawString.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/notRawString.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/indentRawString/notRawString.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/notRawString.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/indentRawString/receiver.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/receiver.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/indentRawString/receiver.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/receiver.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/indentRawString/simple.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/simple.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/indentRawString/simple.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/simple.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/indentRawString/simple.kt.after b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/simple.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/indentRawString/simple.kt.after
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/simple.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/indentRawString/singleLine.kt b/plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/singleLine.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/indentRawString/singleLine.kt
rename to plugins/kotlin/code-insight/intentions-shared/tests/testData/intentions/indentRawString/singleLine.kt
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 2b9f86e2eed3..b17b711f47b9 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
@@ -11040,49 +11040,6 @@ public abstract class K1IntentionTestGenerated extends AbstractK1IntentionTest {
         }
     }
 
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/intentions/indentRawString")
-    public static class IndentRawString extends AbstractK1IntentionTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("annotationEntry.kt")
-        public void testAnnotationEntry() throws Exception {
-            runTest("testData/intentions/indentRawString/annotationEntry.kt");
-        }
-
-        @TestMetadata("const.kt")
-        public void testConst() throws Exception {
-            runTest("testData/intentions/indentRawString/const.kt");
-        }
-
-        @TestMetadata("hasIndent.kt")
-        public void testHasIndent() throws Exception {
-            runTest("testData/intentions/indentRawString/hasIndent.kt");
-        }
-
-        @TestMetadata("notRawString.kt")
-        public void testNotRawString() throws Exception {
-            runTest("testData/intentions/indentRawString/notRawString.kt");
-        }
-
-        @TestMetadata("receiver.kt")
-        public void testReceiver() throws Exception {
-            runTest("testData/intentions/indentRawString/receiver.kt");
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("testData/intentions/indentRawString/simple.kt");
-        }
-
-        @TestMetadata("singleLine.kt")
-        public void testSingleLine() throws Exception {
-            runTest("testData/intentions/indentRawString/singleLine.kt");
-        }
-    }
-
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("testData/intentions/infixCallToOrdinary")
     public static class InfixCallToOrdinary extends AbstractK1IntentionTest {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/indentRawString/.intention b/plugins/kotlin/idea/tests/testData/intentions/indentRawString/.intention
deleted file mode 100644
index ae3461dfb839..000000000000
--- a/plugins/kotlin/idea/tests/testData/intentions/indentRawString/.intention
+++ /dev/null
@@ -1 +0,0 @@
-org.jetbrains.kotlin.idea.intentions.IndentRawStringIntention
diff --git a/plugins/kotlin/j2k/post-processing/src/org/jetbrains/kotlin/idea/j2k/post/processing/allProcessings.kt b/plugins/kotlin/j2k/post-processing/src/org/jetbrains/kotlin/idea/j2k/post/processing/allProcessings.kt
index 6ca59581f1cb..9bdd4d26a819 100644
--- a/plugins/kotlin/j2k/post-processing/src/org/jetbrains/kotlin/idea/j2k/post/processing/allProcessings.kt
+++ b/plugins/kotlin/j2k/post-processing/src/org/jetbrains/kotlin/idea/j2k/post/processing/allProcessings.kt
@@ -2,6 +2,7 @@
 package org.jetbrains.kotlin.idea.j2k.post.processing
 
 import org.jetbrains.kotlin.diagnostics.Errors
+import org.jetbrains.kotlin.idea.codeInsight.intentions.shared.IndentRawStringIntention
 import org.jetbrains.kotlin.idea.codeInsight.intentions.shared.RemoveUnnecessaryParenthesesIntention
 import org.jetbrains.kotlin.idea.codeinsight.utils.NegatedBinaryExpressionSimplificationUtils.canBeSimplifiedWithoutChangingSemantics
 import org.jetbrains.kotlin.idea.codeinsights.impl.base.KotlinInspectionFacade
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 334b3107e97e..098fbc2b1616 100644
--- a/plugins/kotlin/plugin/k1/resources/META-INF/inspections-fe10.xml
+++ b/plugins/kotlin/plugin/k1/resources/META-INF/inspections-fe10.xml
@@ -819,13 +819,6 @@
       <categoryKey>group.names.kotlin</categoryKey>
     </intentionAction>
 
-    <intentionAction>
-      <language>kotlin</language>
-      <className>org.jetbrains.kotlin.idea.intentions.IndentRawStringIntention</className>
-      <bundleName>messages.KotlinBundle</bundleName>
-      <categoryKey>group.names.kotlin</categoryKey>
-    </intentionAction>
-
     <intentionAction>
       <language>kotlin</language>
       <className>org.jetbrains.kotlin.idea.intentions.ConvertVarargParameterToArrayIntention</className>