From 2d02c481d0c6e8343b8f7b0225b4ab5bc87bc89e Mon Sep 17 00:00:00 2001
From: Roman Golyshev <roman.golyshev@jetbrains.com>
Date: Wed, 16 Aug 2023 16:51:03 +0200
Subject: [PATCH] KTIJ-26685 [kotlin] Adjust class names in "Unused imports"
 quickfix testdata

GitOrigin-RevId: a474c7dc677c1b7f2f0e54da122f4c7ffd9b0730
---
 .../inspections/unusedImport/inspectionData/inspections.test  | 2 +-
 .../tests/testData/quickfix/allowResolveInWriteAction.txt     | 2 +-
 .../idea/tests/testData/quickfix/optimizeImports/.inspection  | 2 +-
 .../testData/quickfix/optimizeImports/destructuringAtTop.kt   | 3 ++-
 .../quickfix/optimizeImports/destructuringAtTop.kt.after      | 3 ++-
 .../tests/testData/quickfix/optimizeImports/fileRuntime.kt    | 3 ++-
 .../testData/quickfix/optimizeImports/fileRuntime.kt.after    | 3 ++-
 .../tests/testData/quickfix/optimizeImports/importAlias.kt    | 3 ++-
 .../testData/quickfix/optimizeImports/importAlias.kt.after    | 3 ++-
 .../idea/tests/testData/quickfix/optimizeImports/invoke2.kt   | 3 ++-
 .../tests/testData/quickfix/optimizeImports/invoke2.kt.after  | 3 ++-
 .../testData/quickfix/suppress/inspections/unusedImports.kt   | 4 ++--
 .../quickfix/suppress/inspections/unusedImports.kt.after      | 4 ++--
 13 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/plugins/kotlin/idea/tests/testData/inspections/unusedImport/inspectionData/inspections.test b/plugins/kotlin/idea/tests/testData/inspections/unusedImport/inspectionData/inspections.test
index e713c1f414ea..b1d03d3878b7 100644
--- a/plugins/kotlin/idea/tests/testData/inspections/unusedImport/inspectionData/inspections.test
+++ b/plugins/kotlin/idea/tests/testData/inspections/unusedImport/inspectionData/inspections.test
@@ -1,3 +1,3 @@
-// INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.KotlinUnusedImportInspection
+// INSPECTION_CLASS: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinUnusedImportInspection
 // RUNTIME_WITH_FULL_JDK
 // COMPILER_PLUGIN_OPTIONS: plugin:org.jetbrains.kotlin.assignment:annotation=test.assignment.SupportsKotlinAssignmentOverloading
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/allowResolveInWriteAction.txt b/plugins/kotlin/idea/tests/testData/quickfix/allowResolveInWriteAction.txt
index ea699e245fe1..0036730e2ae7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/allowResolveInWriteAction.txt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/allowResolveInWriteAction.txt
@@ -6,7 +6,7 @@ org.jetbrains.kotlin.idea.quickfix.ReorderParametersFix
 org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler
 org.jetbrains.kotlin.idea.inspections.ConflictingExtensionPropertyInspection$DeleteRedundantExtensionAction
 org.jetbrains.kotlin.idea.codeinsight.api.classic.inspections.IntentionBasedInspection$HighPriorityIntentionBasedQuickFix
-org.jetbrains.kotlin.idea.inspections.KotlinOptimizeImportsQuickFix
+org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
 org.jetbrains.kotlin.idea.inspections.migration.ObsoleteCoroutinesDelegateQuickFix
 org.jetbrains.kotlin.idea.inspections.SafeDeleteFix
 org.jetbrains.kotlin.idea.inspections.SuspiciousCollectionReassignmentInspection$ChangeTypeToMutableFix
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/.inspection b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/.inspection
index f369ba1a91a1..7a90ce467651 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/.inspection
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/.inspection
@@ -1 +1 @@
-org.jetbrains.kotlin.idea.inspections.KotlinUnusedImportInspection
\ No newline at end of file
+org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinUnusedImportInspection
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/destructuringAtTop.kt b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/destructuringAtTop.kt
index c05de874dfcf..9693e8063f71 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/destructuringAtTop.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/destructuringAtTop.kt
@@ -7,4 +7,5 @@ fun test() {
     val (a, b, c) = Triple(1, 2, 3)
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.KotlinOptimizeImportsQuickFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/destructuringAtTop.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/destructuringAtTop.kt.after
index 8a3eb6123e9d..ca345bdf0b4b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/destructuringAtTop.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/destructuringAtTop.kt.after
@@ -5,4 +5,5 @@ fun test() {
     val (a, b, c) = Triple(1, 2, 3)
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.KotlinOptimizeImportsQuickFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt
index 1f30c4230ed0..65b5b284d931 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt
@@ -8,4 +8,5 @@ fun foo(list: ArrayList<String>) {
     list.add("")
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.KotlinOptimizeImportsQuickFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt.after
index a23f37630389..c5a5689ce713 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt.after
@@ -5,4 +5,5 @@ fun foo(list: ArrayList<String>) {
     list.add("")
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.KotlinOptimizeImportsQuickFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/importAlias.kt b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/importAlias.kt
index 1bcef32c0396..9cba38250a04 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/importAlias.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/importAlias.kt
@@ -9,4 +9,5 @@ fun foo() {
     B()
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.KotlinOptimizeImportsQuickFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/importAlias.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/importAlias.kt.after
index e8e201797748..c6686d8838d5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/importAlias.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/importAlias.kt.after
@@ -8,4 +8,5 @@ fun foo() {
     B()
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.KotlinOptimizeImportsQuickFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/invoke2.kt b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/invoke2.kt
index 9ad68fb8e357..d34366257a23 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/invoke2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/invoke2.kt
@@ -15,4 +15,5 @@ operator fun Bar.invoke() = 2
 fun main() {
     println(Foo.bar())
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.KotlinOptimizeImportsQuickFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/invoke2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/invoke2.kt.after
index 53ec2a3f4402..77e672987a09 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/invoke2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/invoke2.kt.after
@@ -13,4 +13,5 @@ operator fun Bar.invoke() = 2
 fun main() {
     println(Foo.bar())
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.KotlinOptimizeImportsQuickFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinOptimizeImportsQuickFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/unusedImports.kt b/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/unusedImports.kt
index d452c0ea1f3e..84460943c7f9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/unusedImports.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/unusedImports.kt
@@ -2,7 +2,7 @@
 
 import<caret> java.io.*
 
-// K1_TOOL: org.jetbrains.kotlin.idea.inspections.KotlinUnusedImportInspection
-// K2_TOOL: org.jetbrains.kotlin.idea.k2.codeinsight.inspections.KotlinUnusedImportInspection
+// K1_TOOL: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinUnusedImportInspection
+// K2_TOOL: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinUnusedImportInspection
 // FUS_K2_QUICKFIX_NAME: com.intellij.codeInspection.SuppressIntentionActionFromFix
 // FUS_QUICKFIX_NAME: com.intellij.codeInspection.SuppressIntentionActionFromFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/unusedImports.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/unusedImports.kt.after
index eeaf77d9ad55..95bd597621c5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/unusedImports.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/unusedImports.kt.after
@@ -4,7 +4,7 @@
 
 import java.io.*
 
-// K1_TOOL: org.jetbrains.kotlin.idea.inspections.KotlinUnusedImportInspection
-// K2_TOOL: org.jetbrains.kotlin.idea.k2.codeinsight.inspections.KotlinUnusedImportInspection
+// K1_TOOL: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinUnusedImportInspection
+// K2_TOOL: org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinUnusedImportInspection
 // FUS_K2_QUICKFIX_NAME: com.intellij.codeInspection.SuppressIntentionActionFromFix
 // FUS_QUICKFIX_NAME: com.intellij.codeInspection.SuppressIntentionActionFromFix
\ No newline at end of file