From 3ad9e4cb5c096330c96c3b72bef9e4752d624559 Mon Sep 17 00:00:00 2001
From: Roman Golyshev <roman.golyshev@jetbrains.com>
Date: Fri, 16 Apr 2021 11:23:31 +0500
Subject: [PATCH] Use `Import` instead of action FQN

This way test data can be used both in the old plugin and in the
FIR plugin
---
 .../checkNoStackOverflowInImportInnerClassInCurrentFile.kt    | 3 ++-
 ...eckNoStackOverflowInImportInnerClassInCurrentFile.kt.after | 4 +++-
 idea/testData/quickfix/autoImports/delegateNoOperator.test    | 2 +-
 .../quickfix/autoImports/falsePostfixOperator.before.Main.kt  | 2 +-
 .../quickfix/autoImports/indexCallExtensionGetNoOperator.test | 2 +-
 .../indexCallNoImportWhenGetNeededButSetAvailable.test        | 2 +-
 .../indexCallNoImportWhenSetNeededButGetAvailable.test        | 2 +-
 idea/testData/quickfix/autoImports/infixCall2.before.Main.kt  | 2 +-
 idea/testData/quickfix/autoImports/infixCallAndObject.kt      | 3 ++-
 .../testData/quickfix/autoImports/infixCallAndObject.kt.after | 1 +
 .../quickfix/autoImports/invokeExtensionNoOperator.test       | 2 +-
 .../multiDeclarationExtensionComponentNoOperator.test         | 2 +-
 idea/testData/quickfix/autoImports/namelessClass.kt           | 3 ++-
 idea/testData/quickfix/autoImports/namelessFunction.kt        | 3 ++-
 idea/testData/quickfix/autoImports/namelessObject.kt          | 3 ++-
 idea/testData/quickfix/autoImports/namelessParameter.kt       | 3 ++-
 idea/testData/quickfix/autoImports/namelessProperty.kt        | 3 ++-
 .../quickfix/autoImports/noImportAlreadyImported.kt.after     | 2 +-
 .../quickfix/autoImports/noImportForAlreadyImported.kt        | 3 ++-
 .../autoImports/noImportForFunInQualifiedNotFirst.after.kt    | 2 +-
 .../noImportForFunInQualifiedNotFirst.before.Main.kt          | 2 +-
 idea/testData/quickfix/autoImports/noImportForIndex.kt        | 2 +-
 idea/testData/quickfix/autoImports/noImportForIndex.kt.after  | 2 +-
 .../quickfix/autoImports/noImportForNestedInPrivate.after.kt  | 2 +-
 .../autoImports/noImportForNestedInPrivate.before.Main.kt     | 2 +-
 .../quickfix/autoImports/noImportForPrivateClass.after.kt     | 2 +-
 .../autoImports/noImportForPrivateClass.before.Main.kt        | 2 +-
 idea/testData/quickfix/autoImports/noImportInImports.after.kt | 2 +-
 .../quickfix/autoImports/noImportInImports.before.Main.kt     | 2 +-
 .../noImportInQualifiedExpressionNotFirst.after.kt            | 2 +-
 .../noImportInQualifiedExpressionNotFirst.before.Main.kt      | 2 +-
 .../autoImports/noImportInQualifiedUserTypeNotFirst.after.kt  | 2 +-
 .../noImportInQualifiedUserTypeNotFirst.before.Main.kt        | 2 +-
 .../noImportInSafeQualifiedExpressionNotFirst.after.kt        | 2 +-
 .../noImportInSafeQualifiedExpressionNotFirst.before.Main.kt  | 2 +-
 .../noImportsForClassInExcludedPackage.before.Main.kt         | 2 +-
 .../autoImports/noImportsForExcludedClass.before.Main.kt      | 2 +-
 .../noImportsForFunctionInExcludedPackage.before.Main.kt      | 2 +-
 idea/testData/quickfix/autoImports/notForThisLabel.kt         | 2 +-
 .../testData/quickfix/autoImports/packageClass.before.Main.kt | 2 +-
 .../autoImports/plusOperatorWithTypeMismatch.before.Main.kt   | 2 +-
 41 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt b/idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt
index 915083f9ba3..d98ba3cc608 100644
--- a/idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt
+++ b/idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt
@@ -1,4 +1,5 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
+// IGNORE_IRRELEVANT_ACTIONS
 
 // KT-3165 Weird stack overflow in IDE
 // ERROR: Unresolved reference: Bar
diff --git a/idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt.after b/idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt.after
index bbee5ddd5d7..d98ba3cc608 100644
--- a/idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt.after
+++ b/idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt.after
@@ -1,4 +1,6 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
+// IGNORE_IRRELEVANT_ACTIONS
+
 // KT-3165 Weird stack overflow in IDE
 // ERROR: Unresolved reference: Bar
 // ERROR: Unresolved reference: SomeImpossibleName
diff --git a/idea/testData/quickfix/autoImports/delegateNoOperator.test b/idea/testData/quickfix/autoImports/delegateNoOperator.test
index e346ef8ec5f..cab2efae36c 100644
--- a/idea/testData/quickfix/autoImports/delegateNoOperator.test
+++ b/idea/testData/quickfix/autoImports/delegateNoOperator.test
@@ -1,5 +1,5 @@
 // FILE: first.before.kt
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Type 'String' has no method 'getValue(Nothing?, KProperty<*>)' and thus it cannot serve as a delegate
 // ACTION: To raw string literal
 
diff --git a/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt b/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt
index e07f14b17ed..074be421492 100644
--- a/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ACTION: Create extension function 'H?.inc'
 // ACTION: Create member function 'H.inc'
 // ACTION: Replace overloaded operator with function call
diff --git a/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test b/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test
index 0e54b9cdbba..a9aa9582fae 100644
--- a/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test
+++ b/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test
@@ -1,5 +1,5 @@
 // FILE: first.before.kt
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: foo()["str"]
 // ERROR: No get method providing array access
 // ACTION: Create extension function 'Some.get'
diff --git a/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test b/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test
index a28dac72740..b275cbb3ff8 100644
--- a/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test
+++ b/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test
@@ -1,5 +1,5 @@
 // FILE: first.before.kt
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: foo()["str"]
 // ERROR: No set method providing array access
 // ACTION: Convert assignment to assignment expression
diff --git a/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test b/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test
index 198093257ad..57a53a56eed 100644
--- a/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test
+++ b/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test
@@ -1,5 +1,5 @@
 // FILE: first.before.kt
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: foo()["str"]
 // ERROR: No get method providing array access
 // ACTION: Create extension function 'Some.get'
diff --git a/idea/testData/quickfix/autoImports/infixCall2.before.Main.kt b/idea/testData/quickfix/autoImports/infixCall2.before.Main.kt
index 58558bf7e50..220150f8f64 100644
--- a/idea/testData/quickfix/autoImports/infixCall2.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/infixCall2.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: foo
 // ACTION: Create extension function 'H.foo'
 // ACTION: Create member function 'H.foo'
diff --git a/idea/testData/quickfix/autoImports/infixCallAndObject.kt b/idea/testData/quickfix/autoImports/infixCallAndObject.kt
index 84892a0b982..1e92f0dfce5 100644
--- a/idea/testData/quickfix/autoImports/infixCallAndObject.kt
+++ b/idea/testData/quickfix/autoImports/infixCallAndObject.kt
@@ -1,4 +1,5 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
+// IGNORE_IRRELEVANT_ACTIONS
 // ERROR: Unresolved reference: infix
 package x
 
diff --git a/idea/testData/quickfix/autoImports/infixCallAndObject.kt.after b/idea/testData/quickfix/autoImports/infixCallAndObject.kt.after
index ffebcccf7c5..83c9bdc1de4 100644
--- a/idea/testData/quickfix/autoImports/infixCallAndObject.kt.after
+++ b/idea/testData/quickfix/autoImports/infixCallAndObject.kt.after
@@ -1,4 +1,5 @@
 // "Import" "true"
+// IGNORE_IRRELEVANT_ACTIONS
 // ERROR: Unresolved reference: infix
 package x
 
diff --git a/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test b/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test
index 62436f15059..cac9edebc6a 100644
--- a/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test
+++ b/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test
@@ -1,5 +1,5 @@
 // FILE: first.before.kt
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function 'invoke()' is not found
 // ACTION: Create extension function 'Some.invoke'
 // ACTION: Create member function 'Some.invoke'
diff --git a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test
index 347550e7656..cb18338f0b2 100644
--- a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test
+++ b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test
@@ -1,5 +1,5 @@
 // FILE: first.before.kt
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 // ACTION: Create extension function 'Some.component1'
 // ACTION: Create member function 'Some.component1'
diff --git a/idea/testData/quickfix/autoImports/namelessClass.kt b/idea/testData/quickfix/autoImports/namelessClass.kt
index aedbd9ff1fb..35728a8687e 100644
--- a/idea/testData/quickfix/autoImports/namelessClass.kt
+++ b/idea/testData/quickfix/autoImports/namelessClass.kt
@@ -1,4 +1,5 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
+// IGNORE_IRRELEVANT_ACTIONS
 // ERROR: Unresolved reference: TTT
 
 class {
diff --git a/idea/testData/quickfix/autoImports/namelessFunction.kt b/idea/testData/quickfix/autoImports/namelessFunction.kt
index 4e73fb48866..69a7a7d116e 100644
--- a/idea/testData/quickfix/autoImports/namelessFunction.kt
+++ b/idea/testData/quickfix/autoImports/namelessFunction.kt
@@ -1,4 +1,5 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
+// IGNORE_IRRELEVANT_ACTIONS
 // ERROR: Unresolved reference: TTTTT
 // ERROR: Function declaration must have a name
 
diff --git a/idea/testData/quickfix/autoImports/namelessObject.kt b/idea/testData/quickfix/autoImports/namelessObject.kt
index 1938072ed42..c60d8b42cf9 100644
--- a/idea/testData/quickfix/autoImports/namelessObject.kt
+++ b/idea/testData/quickfix/autoImports/namelessObject.kt
@@ -1,4 +1,5 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
+// IGNORE_IRRELEVANT_ACTIONS
 // ERROR: Unresolved reference: TTT
 
 object {
diff --git a/idea/testData/quickfix/autoImports/namelessParameter.kt b/idea/testData/quickfix/autoImports/namelessParameter.kt
index de0d08191af..2818aab71c9 100644
--- a/idea/testData/quickfix/autoImports/namelessParameter.kt
+++ b/idea/testData/quickfix/autoImports/namelessParameter.kt
@@ -1,4 +1,5 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
+// IGNORE_IRRELEVANT_ACTIONS
 // ERROR: Unresolved reference: TTT
 
 fun f(: Int) {
diff --git a/idea/testData/quickfix/autoImports/namelessProperty.kt b/idea/testData/quickfix/autoImports/namelessProperty.kt
index 429b4f87f3f..aa2d9510d80 100644
--- a/idea/testData/quickfix/autoImports/namelessProperty.kt
+++ b/idea/testData/quickfix/autoImports/namelessProperty.kt
@@ -1,4 +1,5 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
+// IGNORE_IRRELEVANT_ACTIONS
 // ERROR: Unresolved reference: TTT
 
 val : Int
diff --git a/idea/testData/quickfix/autoImports/noImportAlreadyImported.kt.after b/idea/testData/quickfix/autoImports/noImportAlreadyImported.kt.after
index d9cc2ec8967..0fe9d0f84bf 100644
--- a/idea/testData/quickfix/autoImports/noImportAlreadyImported.kt.after
+++ b/idea/testData/quickfix/autoImports/noImportAlreadyImported.kt.after
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: some[12]
 // ERROR: No get method providing array access
 
diff --git a/idea/testData/quickfix/autoImports/noImportForAlreadyImported.kt b/idea/testData/quickfix/autoImports/noImportForAlreadyImported.kt
index 1fd143221c7..803e0a59014 100644
--- a/idea/testData/quickfix/autoImports/noImportForAlreadyImported.kt
+++ b/idea/testData/quickfix/autoImports/noImportForAlreadyImported.kt
@@ -1,4 +1,5 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
+// IGNORE_IRRELEVANT_ACTIONS
 // ERROR: Unresolved reference: someFun
 // ERROR: Unresolved reference: test
 
diff --git a/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.after.kt b/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.after.kt
index dd795eecff0..87756e6c90a 100644
--- a/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.after.kt
+++ b/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.after.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: externalFun
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt b/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt
index 8bc93b8b811..cc639ca0339 100644
--- a/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ACTION: Rename reference
 // ACTION: Convert to run
 // ACTION: Convert to with
diff --git a/idea/testData/quickfix/autoImports/noImportForIndex.kt b/idea/testData/quickfix/autoImports/noImportForIndex.kt
index 1f4898fb15f..ec0725dec29 100644
--- a/idea/testData/quickfix/autoImports/noImportForIndex.kt
+++ b/idea/testData/quickfix/autoImports/noImportForIndex.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: some[12]
 // ERROR: No get method providing array access
 
diff --git a/idea/testData/quickfix/autoImports/noImportForIndex.kt.after b/idea/testData/quickfix/autoImports/noImportForIndex.kt.after
index 745fe2444d9..75ccfa39aa9 100644
--- a/idea/testData/quickfix/autoImports/noImportForIndex.kt.after
+++ b/idea/testData/quickfix/autoImports/noImportForIndex.kt.after
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 
 package Teting
 
diff --git a/idea/testData/quickfix/autoImports/noImportForNestedInPrivate.after.kt b/idea/testData/quickfix/autoImports/noImportForNestedInPrivate.after.kt
index 4d664cdaa79..4997959e41e 100644
--- a/idea/testData/quickfix/autoImports/noImportForNestedInPrivate.after.kt
+++ b/idea/testData/quickfix/autoImports/noImportForNestedInPrivate.after.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: Nested
 
 fun test() {
diff --git a/idea/testData/quickfix/autoImports/noImportForNestedInPrivate.before.Main.kt b/idea/testData/quickfix/autoImports/noImportForNestedInPrivate.before.Main.kt
index 83bbff5488e..49ba5f7ca86 100644
--- a/idea/testData/quickfix/autoImports/noImportForNestedInPrivate.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportForNestedInPrivate.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ACTION: Create local variable 'Nested'
 // ACTION: Create object 'Nested'
 // ACTION: Create parameter 'Nested'
diff --git a/idea/testData/quickfix/autoImports/noImportForPrivateClass.after.kt b/idea/testData/quickfix/autoImports/noImportForPrivateClass.after.kt
index 6c72cb1fbc3..64e737968cc 100644
--- a/idea/testData/quickfix/autoImports/noImportForPrivateClass.after.kt
+++ b/idea/testData/quickfix/autoImports/noImportForPrivateClass.after.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: PrivateClass
 
 fun test() {
diff --git a/idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Main.kt b/idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Main.kt
index e9b4fcdaf5b..9bc657a2c62 100644
--- a/idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ACTION: Create local variable 'PrivateClass'
 // ACTION: Create object 'PrivateClass'
 // ACTION: Create parameter 'PrivateClass'
diff --git a/idea/testData/quickfix/autoImports/noImportInImports.after.kt b/idea/testData/quickfix/autoImports/noImportInImports.after.kt
index d65c313b4de..5c3faf9e4a8 100644
--- a/idea/testData/quickfix/autoImports/noImportInImports.after.kt
+++ b/idea/testData/quickfix/autoImports/noImportInImports.after.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/noImportInImports.before.Main.kt b/idea/testData/quickfix/autoImports/noImportInImports.before.Main.kt
index 38507c5e600..038f79eb172 100644
--- a/idea/testData/quickfix/autoImports/noImportInImports.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportInImports.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ACTION: Create annotation 'SomeTest'
 // ACTION: Create class 'SomeTest'
 // ACTION: Create interface 'SomeTest'
diff --git a/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.after.kt b/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.after.kt
index 3b2c9b5440e..9cd3ed822ca 100644
--- a/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.after.kt
+++ b/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.after.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt b/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt
index 6c12a1600bd..27d2974b9d2 100644
--- a/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ACTION: Convert to lazy property
 // ACTION: Convert property initializer to getter
 // ACTION: Create class 'SomeTest'
diff --git a/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.after.kt b/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.after.kt
index f9cf32e1920..2622c46bac5 100644
--- a/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.after.kt
+++ b/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.after.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt b/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt
index 4ad16c20ca2..f187016186a 100644
--- a/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ACTION: Create class 'SomeTest'
 // ACTION: Create interface 'SomeTest'
 // ERROR: Unresolved reference: SomeTest
diff --git a/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.after.kt b/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.after.kt
index 3d9748e92ad..8b499630cf4 100644
--- a/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.after.kt
+++ b/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.after.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: SomeTest
 // ERROR: Expression expected, but a package name found
 // ACTION: Edit intention settings
diff --git a/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt b/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt
index afa5c1cb4af..d04f3cec266 100644
--- a/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: SomeTest
 // ERROR: Expression expected, but a package name found
 // ACTION: Convert to lazy property
diff --git a/idea/testData/quickfix/autoImports/noImportsForClassInExcludedPackage.before.Main.kt b/idea/testData/quickfix/autoImports/noImportsForClassInExcludedPackage.before.Main.kt
index 14cf5690d36..603002ae7a5 100644
--- a/idea/testData/quickfix/autoImports/noImportsForClassInExcludedPackage.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportsForClassInExcludedPackage.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ACTION: Convert to lazy property
 // ACTION: Convert property initializer to getter
 // ACTION: Create class 'SomeClass'
diff --git a/idea/testData/quickfix/autoImports/noImportsForExcludedClass.before.Main.kt b/idea/testData/quickfix/autoImports/noImportsForExcludedClass.before.Main.kt
index 053f4faef18..5389e3dba78 100644
--- a/idea/testData/quickfix/autoImports/noImportsForExcludedClass.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportsForExcludedClass.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ACTION: Convert to lazy property
 // ACTION: Convert property initializer to getter
 // ACTION: Create class 'ExcludedClass'
diff --git a/idea/testData/quickfix/autoImports/noImportsForFunctionInExcludedPackage.before.Main.kt b/idea/testData/quickfix/autoImports/noImportsForFunctionInExcludedPackage.before.Main.kt
index 7f0796ddafc..688de4033ce 100644
--- a/idea/testData/quickfix/autoImports/noImportsForFunctionInExcludedPackage.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportsForFunctionInExcludedPackage.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ACTION: Convert to lazy property
 // ACTION: Convert property initializer to getter
 // ACTION: Create function 'someFunction'
diff --git a/idea/testData/quickfix/autoImports/notForThisLabel.kt b/idea/testData/quickfix/autoImports/notForThisLabel.kt
index 7f99ef327b1..63061907ea3 100644
--- a/idea/testData/quickfix/autoImports/notForThisLabel.kt
+++ b/idea/testData/quickfix/autoImports/notForThisLabel.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference: @String
 
 fun refer() {
diff --git a/idea/testData/quickfix/autoImports/packageClass.before.Main.kt b/idea/testData/quickfix/autoImports/packageClass.before.Main.kt
index 253e1bbf204..1e12995acb9 100644
--- a/idea/testData/quickfix/autoImports/packageClass.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/packageClass.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ACTION: Create function 'FooPackage'
 // ACTION: Create class 'FooPackage'
 // ACTION: Rename reference
diff --git a/idea/testData/quickfix/autoImports/plusOperatorWithTypeMismatch.before.Main.kt b/idea/testData/quickfix/autoImports/plusOperatorWithTypeMismatch.before.Main.kt
index 4f884f5e858..1c1b5c7f21c 100644
--- a/idea/testData/quickfix/autoImports/plusOperatorWithTypeMismatch.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/plusOperatorWithTypeMismatch.before.Main.kt
@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
+// "Import" "false"
 // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 // ACTION: Create extension function 'JustClass.plus'
 // ACTION: Create member function 'JustClass.plus'