Renamed classes

idea/src/org/jetbrains/kotlin/idea/quickfix/ImportFix.kt

@@ -62,7 +62,7 @@ import java.util.*
 /**
  * Check possibility and perform fix for unresolved references.
  */
-internal abstract class AutoImportFixBase<T : KtExpression>(expression: T) :
+internal abstract class ImportFixBase<T : KtExpression>(expression: T) :
         KotlinQuickFixAction<T>(expression), HighPriorityAction, HintAction {
 
     private val modificationCountOnCreate = PsiModificationTracker.SERVICE.getInstance(element.project).modificationCount
@@ -175,7 +175,7 @@ internal abstract class AutoImportFixBase<T : KtExpression>(expression: T) :
     }
 }
 
-internal abstract class AutoImportFixBaseDynamicContext<T : KtExpression>(expression: T) : AutoImportFixBase<T>(expression) {
+internal abstract class OrdinaryImportFixBase<T : KtExpression>(expression: T) : ImportFixBase<T>(expression) {
     override fun fillCandidates(
             name: String,
             callTypeAndReceiver: CallTypeAndReceiver<*, *>,
@@ -207,7 +207,7 @@ internal abstract class AutoImportFixBaseDynamicContext<T : KtExpression>(expres
 
 }
 
-internal class AutoImportFix(expression: KtSimpleNameExpression) : AutoImportFixBaseDynamicContext<KtSimpleNameExpression>(expression) {
+internal class ImportFix(expression: KtSimpleNameExpression) : OrdinaryImportFixBase<KtSimpleNameExpression>(expression) {
     override fun getCallTypeAndReceiver() = CallTypeAndReceiver.detect(element)
 
     override val importNames: Collection<Name> = run {
@@ -240,7 +240,7 @@ internal class AutoImportFix(expression: KtSimpleNameExpression) : AutoImportFix
 
     companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic) =
-                (diagnostic.psiElement as? KtSimpleNameExpression)?.let(::AutoImportFix)
+                (diagnostic.psiElement as? KtSimpleNameExpression)?.let { ImportFix(it) }
 
         override fun isApplicableForCodeFragment() = true
 
@@ -249,7 +249,7 @@ internal class AutoImportFix(expression: KtSimpleNameExpression) : AutoImportFix
 }
 
 
-internal class MissingInvokeAutoImportFix(expression: KtExpression) : AutoImportFixBaseDynamicContext<KtExpression>(expression) {
+internal class InvokeImportFix(expression: KtExpression) : OrdinaryImportFixBase<KtExpression>(expression) {
     override val importNames = OperatorNameConventions.INVOKE.singletonList()
 
     override fun getCallTypeAndReceiver() = CallTypeAndReceiver.OPERATOR(element)
@@ -258,14 +258,14 @@ internal class MissingInvokeAutoImportFix(expression: KtExpression) : AutoImport
 
     companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic) =
-                (diagnostic.psiElement as? KtExpression)?.let(::MissingInvokeAutoImportFix)
+                (diagnostic.psiElement as? KtExpression)?.let { InvokeImportFix(it) }
 
         private val ERRORS by lazy(LazyThreadSafetyMode.PUBLICATION) { QuickFixes.getInstance().getDiagnostics(this) }
     }
 }
 
-internal open class MissingArrayAccessorAutoImportFix(element: KtArrayAccessExpression, override val importNames: Collection<Name>, private val showHint: Boolean) :
+internal open class ArrayAccessorImportFix(element: KtArrayAccessExpression, override val importNames: Collection<Name>, private val showHint: Boolean) :
-        AutoImportFixBaseDynamicContext<KtArrayAccessExpression>(element) {
+        OrdinaryImportFixBase<KtArrayAccessExpression>(element) {
     override fun getCallTypeAndReceiver() =
             CallTypeAndReceiver.OPERATOR(element.arrayExpression!!)
 
@@ -288,7 +288,7 @@ internal open class MissingArrayAccessorAutoImportFix(element: KtArrayAccessExpr
 
             val element = diagnostic.psiElement
             if (element is KtArrayAccessExpression && element.arrayExpression != null) {
-                return MissingArrayAccessorAutoImportFix(element, importName(diagnostic).singletonList(), true)
+                return ArrayAccessorImportFix(element, importName(diagnostic).singletonList(), true)
             }
 
             return null
@@ -298,9 +298,9 @@ internal open class MissingArrayAccessorAutoImportFix(element: KtArrayAccessExpr
     }
 }
 
-internal class MissingDelegateAccessorsAutoImportFix(
+internal class DelegateAccessorsImportFix(
         element: KtExpression, override val importNames: Collection<Name>, private val solveSeveralProblems: Boolean) :
-        AutoImportFixBaseDynamicContext<KtExpression>(element) {
+        OrdinaryImportFixBase<KtExpression>(element) {
     override fun getCallTypeAndReceiver() = CallTypeAndReceiver.DELEGATE(element)
 
     override fun createAction(project: Project, editor: Editor): KotlinAddImportAction {
@@ -326,22 +326,22 @@ internal class MissingDelegateAccessorsAutoImportFix(
 
         override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtExpression>? {
             return (diagnostic.psiElement as? KtExpression)?.let {
-                MissingDelegateAccessorsAutoImportFix(it, importNames(diagnostic.singletonList()), false)
+                DelegateAccessorsImportFix(it, importNames(diagnostic.singletonList()), false)
             }
         }
 
         override fun doCreateActionsForAllProblems(sameTypeDiagnostics: Collection<Diagnostic>): List<IntentionAction> {
             val element = sameTypeDiagnostics.first().psiElement
             val names = importNames(sameTypeDiagnostics)
-            return (element as? KtExpression)?.let { MissingDelegateAccessorsAutoImportFix(it, names, true) }.singletonOrEmptyList()
+            return (element as? KtExpression)?.let { DelegateAccessorsImportFix(it, names, true) }.singletonOrEmptyList()
         }
 
         private val ERRORS by lazy(LazyThreadSafetyMode.PUBLICATION) { QuickFixes.getInstance().getDiagnostics(this) }
     }
 }
 
-internal class MissingComponentsAutoImportFix(element: KtExpression, override val importNames: Collection<Name>, private val solveSeveralProblems: Boolean) :
+internal class ComponentsImportFix(element: KtExpression, override val importNames: Collection<Name>, private val solveSeveralProblems: Boolean) :
-        AutoImportFixBaseDynamicContext<KtExpression>(element) {
+        OrdinaryImportFixBase<KtExpression>(element) {
     override fun getCallTypeAndReceiver() = CallTypeAndReceiver.OPERATOR(element)
 
     override fun createAction(project: Project, editor: Editor): KotlinAddImportAction {
@@ -360,7 +360,7 @@ internal class MissingComponentsAutoImportFix(element: KtExpression, override va
 
         override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtExpression>? {
             return (diagnostic.psiElement as? KtExpression)?.let {
-                MissingComponentsAutoImportFix(it, importNames(diagnostic.singletonList()), false)
+                ComponentsImportFix(it, importNames(diagnostic.singletonList()), false)
             }
         }
 
@@ -368,14 +368,14 @@ internal class MissingComponentsAutoImportFix(element: KtExpression, override va
             val element = sameTypeDiagnostics.first().psiElement
             val names = importNames(sameTypeDiagnostics)
             val solveSeveralProblems = sameTypeDiagnostics.size > 1
-            return (element as? KtExpression)?.let { MissingComponentsAutoImportFix(it, names, solveSeveralProblems) }.singletonOrEmptyList()
+            return (element as? KtExpression)?.let { ComponentsImportFix(it, names, solveSeveralProblems) }.singletonOrEmptyList()
         }
 
         private val ERRORS by lazy(LazyThreadSafetyMode.PUBLICATION) { QuickFixes.getInstance().getDiagnostics(this) }
     }
 }
 
-internal class AutoImportMemberFix(expression: KtSimpleNameExpression) : AutoImportFixBase<KtSimpleNameExpression>(expression) {
+internal class ImportMemberFix(expression: KtSimpleNameExpression) : ImportFixBase<KtSimpleNameExpression>(expression) {
 
     override fun getText() = "Import member"
 
@@ -426,7 +426,7 @@ internal class AutoImportMemberFix(expression: KtSimpleNameExpression) : AutoImp
 
     companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic) =
-                (diagnostic.psiElement as? KtSimpleNameExpression)?.let(::AutoImportMemberFix)
+                (diagnostic.psiElement as? KtSimpleNameExpression)?.let(::ImportMemberFix)
 
         override fun isApplicableForCodeFragment() = true
 
@@ -435,7 +435,7 @@ internal class AutoImportMemberFix(expression: KtSimpleNameExpression) : AutoImp
 
 }
 
-object AutoImportForMissingOperatorFactory : KotlinSingleIntentionActionFactory() {
+object ImportForMissingOperatorFactory : KotlinSingleIntentionActionFactory() {
     override fun createAction(diagnostic: Diagnostic): IntentionAction? {
         val element = diagnostic.psiElement as? KtExpression ?: return null
         val operatorDescriptor = Errors.OPERATOR_MODIFIER_REQUIRED.cast(diagnostic).a
@@ -443,7 +443,7 @@ object AutoImportForMissingOperatorFactory : KotlinSingleIntentionActionFactory(
         when (name) {
             OperatorNameConventions.GET, OperatorNameConventions.SET -> {
                 if (element is KtArrayAccessExpression) {
-                    return object : MissingArrayAccessorAutoImportFix(element, name.singletonList(), false) {
+                    return object : ArrayAccessorImportFix(element, name.singletonList(), false) {
                         override fun getSupportedErrors() = Errors.OPERATOR_MODIFIER_REQUIRED.singletonList()
                     }
                 }

idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinReferenceImporter.kt

@@ -87,7 +87,7 @@ class KotlinReferenceImporter : ReferenceImporter {
             val bindingContext = analyze(BodyResolveMode.PARTIAL)
             if (mainReference.resolveToDescriptors(bindingContext).isNotEmpty()) return false
 
-            val suggestions = AutoImportFix(this).computeSuggestions()
+            val suggestions = ImportFix(this).computeSuggestions()
 
             if (suggestions.distinctBy { it.importableFqName!! }.size != 1) return false
 

idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt

@@ -128,20 +128,20 @@ class QuickFixRegistrar : QuickFixContributor {
         NON_PRIVATE_CONSTRUCTOR_IN_ENUM.registerFactory(removeModifierFactory)
         NON_PRIVATE_CONSTRUCTOR_IN_SEALED.registerFactory(removeModifierFactory)
 
-        UNRESOLVED_REFERENCE.registerFactory(AutoImportMemberFix)
+        UNRESOLVED_REFERENCE.registerFactory(ImportMemberFix)
-        UNRESOLVED_REFERENCE.registerFactory(AutoImportFix)
+        UNRESOLVED_REFERENCE.registerFactory(ImportFix)
 
         UNRESOLVED_REFERENCE.registerFactory(AddTestLibQuickFix)
 
-        UNRESOLVED_REFERENCE_WRONG_RECEIVER.registerFactory(AutoImportFix)
+        UNRESOLVED_REFERENCE_WRONG_RECEIVER.registerFactory(ImportFix)
 
-        FUNCTION_EXPECTED.registerFactory(MissingInvokeAutoImportFix)
+        FUNCTION_EXPECTED.registerFactory(InvokeImportFix)
 
-        DELEGATE_SPECIAL_FUNCTION_MISSING.registerFactory(MissingDelegateAccessorsAutoImportFix)
+        DELEGATE_SPECIAL_FUNCTION_MISSING.registerFactory(DelegateAccessorsImportFix)
-        COMPONENT_FUNCTION_MISSING.registerFactory(MissingComponentsAutoImportFix)
+        COMPONENT_FUNCTION_MISSING.registerFactory(ComponentsImportFix)
 
-        NO_GET_METHOD.registerFactory(MissingArrayAccessorAutoImportFix)
+        NO_GET_METHOD.registerFactory(ArrayAccessorImportFix)
-        NO_SET_METHOD.registerFactory(MissingArrayAccessorAutoImportFix)
+        NO_SET_METHOD.registerFactory(ArrayAccessorImportFix)
 
         CONFLICTING_IMPORT.registerFactory(RemovePsiElementSimpleFix.RemoveImportFactory)
 
@@ -373,7 +373,7 @@ class QuickFixRegistrar : QuickFixContributor {
         NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION.registerFactory(ConstFixFactory)
 
         OPERATOR_MODIFIER_REQUIRED.registerFactory(AddModifierFixFactory(KtTokens.OPERATOR_KEYWORD))
-        OPERATOR_MODIFIER_REQUIRED.registerFactory(AutoImportForMissingOperatorFactory)
+        OPERATOR_MODIFIER_REQUIRED.registerFactory(ImportForMissingOperatorFactory)
 
         INFIX_MODIFIER_REQUIRED.registerFactory(AddModifierFixFactory(KtTokens.INFIX_KEYWORD))
         INFIX_MODIFIER_REQUIRED.registerFactory(InfixCallFix)

idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 
 // KT-3165 Weird stack overflow in IDE
 // ERROR: Unresolved reference: Bar

idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt.after

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // KT-3165 Weird stack overflow in IDE
 // ERROR: Unresolved reference: Bar
 // ERROR: Unresolved reference: SomeImpossibleName

idea/testData/quickfix/autoImports/infixCallAndObject.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: infix
 package x
 

idea/testData/quickfix/autoImports/memberImportJavaField.test

@@ -9,14 +9,15 @@ fun f() {
 }
 
 
-// FILE: Bar.java
+// FILE: foo/Bar.java
+package foo;
 
 public class Bar {
     public static final String foobar = "foobar";
 }
 
 // FILE: first.after.kt
-import Bar.foobar
+import foo.Bar.foobar
 
 // "Import member" "true"
 // ERROR: Unresolved reference: foobar

idea/testData/quickfix/autoImports/memberImportJavaMethod.test

@@ -9,7 +9,8 @@ fun f() {
 }
 
 
-// FILE: Bar.java
+// FILE: foo/Bar.java
+package foo;
 
 public class Bar {
     public static void foobar()
@@ -19,7 +20,7 @@ public class Bar {
 }
 
 // FILE: first.after.kt
-import Bar.foobar
+import foo.Bar.foobar
 
 // "Import member" "true"
 // ERROR: Unresolved reference: foobar

idea/testData/quickfix/autoImports/memberImportNotForClassFunction.test

@@ -1,5 +1,5 @@
 // FILE: main.before.kt
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportMemberFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
 // ERROR: Unresolved reference: foobar
 // ACTION: Create function 'foobar'
 // ACTION: Rename reference
@@ -20,7 +20,7 @@ class Foo {
 }
 
 //FILE: main.after.kt
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportMemberFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
 // ERROR: Unresolved reference: foobar
 // ACTION: Create function 'foobar'
 // ACTION: Rename reference

idea/testData/quickfix/autoImports/memberImportNotForClassProperty.test

@@ -1,5 +1,5 @@
 // FILE: main.before.kt
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportMemberFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
 // ERROR: Unresolved reference: foobar
 // ACTION: Create local variable 'foobar'
 // ACTION: Create property 'foobar'
@@ -21,7 +21,7 @@ class Foo {
 }
 
 //FILE: main.after.kt
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportMemberFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
 // ERROR: Unresolved reference: foobar
 // ACTION: Create local variable 'foobar'
 // ACTION: Create property 'foobar'

idea/testData/quickfix/autoImports/memberImportNotForJavaNonStaticField.test

@@ -1,5 +1,5 @@
 // FILE: main.before.kt
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportMemberFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
 // ERROR: Unresolved reference: foobar
 // ACTION: Create local variable 'foobar'
 // ACTION: Create property 'foobar'
@@ -21,7 +21,7 @@ public class Foo {
 }
 
 //FILE: main.after.kt
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportMemberFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
 // ERROR: Unresolved reference: foobar
 // ACTION: Create local variable 'foobar'
 // ACTION: Create property 'foobar'

idea/testData/quickfix/autoImports/memberImportNotForJavaNonStaticMethod.test

@@ -1,5 +1,5 @@
 // FILE: main.before.kt
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportMemberFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
 // ERROR: Unresolved reference: foobar
 // ACTION: Create function 'foobar'
 // ACTION: Rename reference
@@ -21,7 +21,7 @@ public class Foo {
 }
 
 //FILE: main.after.kt
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportMemberFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
 // ERROR: Unresolved reference: foobar
 // ACTION: Create function 'foobar'
 // ACTION: Rename reference

idea/testData/quickfix/autoImports/memberImportNotForTopLevelFunction.test

@@ -1,5 +1,5 @@
 // FILE: main.before.kt
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportMemberFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
 // ERROR: Unresolved reference: foobar
 // ACTION: Create function 'foobar'
 // ACTION: Import
@@ -19,7 +19,7 @@ fun foobar() {
 }
 
 //FILE: main.after.kt
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportMemberFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportMemberFix" "false"
 // ERROR: Unresolved reference: foobar
 // ACTION: Create function 'foobar'
 // ACTION: Rename reference

idea/testData/quickfix/autoImports/namelessClass.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: TTT
 
 class {

idea/testData/quickfix/autoImports/namelessFunction.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: TTTTT
 // ERROR: Function declaration must have a name
 

idea/testData/quickfix/autoImports/namelessObject.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: TTT
 
 object {

idea/testData/quickfix/autoImports/namelessParameter.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: TTT
 
 fun f(: Int) {

idea/testData/quickfix/autoImports/namelessProperty.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: TTT
 
 val : Int

idea/testData/quickfix/autoImports/noImportAlreadyImported.kt.after

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: some[12]
 // ERROR: No get method providing array access
 

idea/testData/quickfix/autoImports/noImportForAlreadyImported.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: someFun
 // ERROR: Unresolved reference: test
 

idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.after.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: externalFun
 
 package testing

idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ACTION: Rename reference
 // ERROR: Unresolved reference: externalFun
 

idea/testData/quickfix/autoImports/noImportForIndex.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: some[12]
 // ERROR: No get method providing array access
 

idea/testData/quickfix/autoImports/noImportForIndex.kt.after

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 
 package Teting
 

idea/testData/quickfix/autoImports/noImportForNestedInPrivate.after.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: Nested
 
 fun test() {

idea/testData/quickfix/autoImports/noImportForNestedInPrivate.before.Main.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ACTION: Create local variable 'Nested'
 // ACTION: Create object 'Nested'
 // ACTION: Create parameter 'Nested'

idea/testData/quickfix/autoImports/noImportForPrivateClass.after.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: PrivateClass
 
 fun test() {

idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Main.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ACTION: Create local variable 'PrivateClass'
 // ACTION: Create object 'PrivateClass'
 // ACTION: Create parameter 'PrivateClass'

idea/testData/quickfix/autoImports/noImportInImports.after.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing

idea/testData/quickfix/autoImports/noImportInImports.before.Main.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ACTION: Create annotation 'SomeTest'
 // ACTION: Create class 'SomeTest'
 // ACTION: Create interface 'SomeTest'

idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.after.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing

idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ACTION: Convert property initializer to getter
 // ACTION: Create class 'SomeTest'
 // ACTION: Rename reference

idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.after.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing

idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ACTION: Create interface 'SomeTest'
 // ERROR: Unresolved reference: SomeTest
 

idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.after.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: SomeTest
 // ERROR: Expression expected, but a package name found
 // ACTION: Edit intention settings

idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: SomeTest
 // ERROR: Expression expected, but a package name found
 // ACTION: Convert property initializer to getter

idea/testData/quickfix/autoImports/noImportsForClassInExcludedPackage.before.Main.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ACTION: Convert property initializer to getter
 // ACTION: Create class 'SomeClass'
 // ACTION: Create function 'SomeClass'

idea/testData/quickfix/autoImports/noImportsForExcludedClass.before.Main.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ACTION: Convert property initializer to getter
 // ACTION: Create class 'ExcludedClass'
 // ACTION: Create function 'ExcludedClass'

idea/testData/quickfix/autoImports/noImportsForFunctionInExcludedPackage.before.Main.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ACTION: Convert property initializer to getter
 // ACTION: Create function 'someFunction'
 // ACTION: Rename reference

idea/testData/quickfix/autoImports/notForThisLabel.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ERROR: Unresolved reference: @String
 
 fun refer() {

idea/testData/quickfix/autoImports/packageClass.before.Main.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// "class org.jetbrains.kotlin.idea.quickfix.ImportFix" "false"
 // ACTION: Create function 'FooPackage'
 // ACTION: Create class 'FooPackage'
 // ACTION: Rename reference