From e33fa46872aac2e466ce4f38975b5f25e3000a02 Mon Sep 17 00:00:00 2001
From: Roman Golyshev <roman.golyshev@jetbrains.com>
Date: Wed, 7 Aug 2024 16:33:14 +0200
Subject: [PATCH] KTIJ-26423 [kotlin] Enable passing "Optimize Imports" tests

GitOrigin-RevId: 9e567c40e11ec361b7710623733df277beee8f82
---
 .../tests/testData/editor/optimizeImports/common/KT13689.kt     | 1 -
 .../testData/editor/optimizeImports/common/KT13689.kt.after     | 2 --
 .../testData/editor/optimizeImports/common/KeywordNames.kt      | 1 -
 .../editor/optimizeImports/common/KeywordNames.kt.after         | 1 -
 .../testData/editor/optimizeImports/common/MemberImports.kt     | 1 -
 .../editor/optimizeImports/common/MemberImports.kt.after        | 1 -
 .../testData/editor/optimizeImports/jvm/AlreadyOptimized.kt     | 1 -
 .../editor/optimizeImports/jvm/AlreadyOptimized.kt.after        | 1 -
 .../editor/optimizeImports/jvm/DoNotTouchIfNoChanges.kt         | 1 -
 .../editor/optimizeImports/jvm/DoNotTouchIfNoChanges.kt.after   | 1 -
 .../testData/editor/optimizeImports/jvm/DuplicatedImports.kt    | 1 -
 .../editor/optimizeImports/jvm/DuplicatedImports.kt.after       | 2 --
 .../editor/optimizeImports/jvm/ExplicitImportOfDefault.kt       | 1 -
 .../editor/optimizeImports/jvm/ExplicitImportOfDefault.kt.after | 2 --
 .../tests/testData/editor/optimizeImports/jvm/KDocReference.kt  | 1 -
 .../testData/editor/optimizeImports/jvm/KDocReference.kt.after  | 1 -
 .../idea/tests/testData/editor/optimizeImports/jvm/Operators.kt | 1 -
 .../testData/editor/optimizeImports/jvm/Operators.kt.after      | 1 -
 .../tests/testData/editor/optimizeImports/jvm/SamConstructor.kt | 1 -
 .../testData/editor/optimizeImports/jvm/SamConstructor.kt.after | 1 -
 .../tests/testData/editor/optimizeImports/jvm/TrivialAlias.kt   | 1 -
 .../testData/editor/optimizeImports/jvm/TrivialAlias.kt.after   | 1 -
 .../editor/optimizeImports/jvm/TypeAliasVsUnderlyingClass.kt    | 1 -
 .../optimizeImports/jvm/TypeAliasVsUnderlyingClass.kt.after     | 1 -
 .../tests/testData/editor/optimizeImports/jvm/UnusedImports.kt  | 1 -
 .../testData/editor/optimizeImports/jvm/UnusedImports.kt.after  | 1 -
 .../tests/testData/editor/optimizeImports/jvm/WithAliases.kt    | 1 -
 .../testData/editor/optimizeImports/jvm/WithAliases.kt.after    | 2 --
 .../optimizeImports/jvm/allUnderImports/ClassNameConflict.kt    | 1 -
 .../jvm/allUnderImports/ClassNameConflict.kt.after              | 1 -
 .../optimizeImports/jvm/allUnderImports/ClassNameConflict3.kt   | 1 -
 .../jvm/allUnderImports/ClassNameConflict3.kt.after             | 1 -
 .../jvm/allUnderImports/ClassNameConflictWithCurrentPackage2.kt | 1 -
 .../ClassNameConflictWithCurrentPackage2.kt.after               | 1 -
 .../allUnderImports/ClassNameConflictWithinDefaultImports.kt    | 1 -
 .../ClassNameConflictWithinDefaultImports.kt.after              | 1 -
 .../JavaAnnotationWithValueParameterIsProperlyResolved.kt       | 1 -
 .../JavaAnnotationWithValueParameterIsProperlyResolved.kt.after | 1 -
 .../KotlinAnnotationWithSingleArgumentIsProperlyResolved.kt     | 1 -
 ...otlinAnnotationWithSingleArgumentIsProperlyResolved.kt.after | 1 -
 .../optimizeImports/jvm/allUnderImports/NameCountSetting.kt     | 1 -
 .../jvm/allUnderImports/NameCountSetting.kt.after               | 1 -
 .../allUnderImports/NameCountSettingWithUnresolvedReference.kt  | 1 -
 .../NameCountSettingWithUnresolvedReference.kt.after            | 1 -
 .../jvm/allUnderImports/PackagesToUseStarImport.kt              | 1 -
 .../jvm/allUnderImports/PackagesToUseStarImport.kt.after        | 1 -
 .../idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt | 1 -
 .../testData/quickfix/optimizeImports/fileRuntime.kt.after      | 1 -
 48 files changed, 52 deletions(-)

diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KT13689.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KT13689.kt
index fb0f6b04d499..23c3ef723c20 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KT13689.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KT13689.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import kotlin.Any
 
 fun foo(): Any  {
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KT13689.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KT13689.kt.after
index f1ede0079948..27c7029047da 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KT13689.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KT13689.kt.after
@@ -1,5 +1,3 @@
-// IGNORE_K2
-
 fun foo(): Any  {
     throw UnsupportedOperationException()
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KeywordNames.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KeywordNames.kt
index 428222a6a5af..0dbb26e6b908 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KeywordNames.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KeywordNames.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import foo.`val`.*
 
 var v: `var`? = null
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KeywordNames.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KeywordNames.kt.after
index 5aa9e7df8020..0d76a16fb130 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KeywordNames.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/KeywordNames.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import foo.`val`.`var`
 
 var v: `var`? = null
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/MemberImports.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/MemberImports.kt
index 5582a4433e2d..859a2f0498f4 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/MemberImports.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/MemberImports.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS: 2
 package test
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/MemberImports.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/MemberImports.kt.after
index 2396b93b6c5a..f64e16d5a3f5 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/MemberImports.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/common/MemberImports.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS: 2
 package test
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/AlreadyOptimized.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/AlreadyOptimized.kt
index bba4f98209a1..1ab78c34e713 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/AlreadyOptimized.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/AlreadyOptimized.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 /**
 Comment 1
  */
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/AlreadyOptimized.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/AlreadyOptimized.kt.after
index 16adf1b23b7b..3971e7324e1b 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/AlreadyOptimized.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/AlreadyOptimized.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 /**
 Comment 1
  */
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DoNotTouchIfNoChanges.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DoNotTouchIfNoChanges.kt
index 062e1a5175f0..3e616668460f 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DoNotTouchIfNoChanges.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DoNotTouchIfNoChanges.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import java.util.ArrayList
 // some comment
 import java.util.HashSet
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DoNotTouchIfNoChanges.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DoNotTouchIfNoChanges.kt.after
index d8dbd791c529..62cd58ee0db0 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DoNotTouchIfNoChanges.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DoNotTouchIfNoChanges.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // some comment
 
 val v: HashSet<ArrayList<String>>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DuplicatedImports.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DuplicatedImports.kt
index eee10b8d91da..26a57bd184f1 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DuplicatedImports.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DuplicatedImports.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import java.util.ArrayList
 import java.util.ArrayList
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DuplicatedImports.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DuplicatedImports.kt.after
index 4918469a660e..669f931a5857 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DuplicatedImports.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/DuplicatedImports.kt.after
@@ -1,5 +1,3 @@
-// IGNORE_K2
-
 class Action {
     fun test() {
         val test : ArrayList<Int>? = null
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/ExplicitImportOfDefault.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/ExplicitImportOfDefault.kt
index cf4f85702c32..25acbad08a75 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/ExplicitImportOfDefault.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/ExplicitImportOfDefault.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import java.lang.IllegalArgumentException
 import kotlin.run
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/ExplicitImportOfDefault.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/ExplicitImportOfDefault.kt.after
index 78e27a44bd7f..9c44674c6f87 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/ExplicitImportOfDefault.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/ExplicitImportOfDefault.kt.after
@@ -1,5 +1,3 @@
-// IGNORE_K2
-
 fun main(args: Array<String>) {
     run {
         throw IllegalArgumentException()
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/KDocReference.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/KDocReference.kt
index 3d6efdc21a8d..3240b27bd439 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/KDocReference.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/KDocReference.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // TODO: it is quite similar to KDocRefernece.kt for K2 except no default imported ArrayList, see KTIJ-26751
 import kotlin.concurrent.fixedRateTimer
 import kotlin.concurrent.read
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/KDocReference.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/KDocReference.kt.after
index 04f82f10ed7e..145ca379568f 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/KDocReference.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/KDocReference.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // TODO: it is quite similar to KDocRefernece.kt for K2 except no default imported ArrayList, see KTIJ-26751
 import java.util.concurrent.locks.Lock
 import kotlin.concurrent.fixedRateTimer
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Operators.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Operators.kt
index 24864c4b7702..2db6b3550da4 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Operators.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Operators.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 5
 import p1.*
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Operators.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Operators.kt.after
index 6366e5053dce..cb0cf11c81d8 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Operators.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Operators.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 5
 import p1.div
 import p1.plus
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/SamConstructor.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/SamConstructor.kt
index 18d89b8ac469..ddeb404ffaeb 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/SamConstructor.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/SamConstructor.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import java.util.concurrent.*
 
 val c = Callable { -> 1 }
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/SamConstructor.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/SamConstructor.kt.after
index ad80e53365c8..6d16bde730ce 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/SamConstructor.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/SamConstructor.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import java.util.concurrent.Callable
 
 val c = Callable { -> 1 }
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TrivialAlias.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TrivialAlias.kt
index a815216796f0..604be716b64d 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TrivialAlias.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TrivialAlias.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import java.io.File as File
 
 val file: File
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TrivialAlias.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TrivialAlias.kt.after
index 7d5aa42ff186..606e7c25f592 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TrivialAlias.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TrivialAlias.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import java.io.File
 
 val file: File
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TypeAliasVsUnderlyingClass.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TypeAliasVsUnderlyingClass.kt
index 4dffc6b42bbd..7d867298b52a 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TypeAliasVsUnderlyingClass.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TypeAliasVsUnderlyingClass.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import dep1.A
 import dep1.B
 import dep2.*
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TypeAliasVsUnderlyingClass.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TypeAliasVsUnderlyingClass.kt.after
index ad92dc9e824b..920da7bf25c9 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TypeAliasVsUnderlyingClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/TypeAliasVsUnderlyingClass.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import dep1.A
 import dep1.B
 import dep2.BBB
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/UnusedImports.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/UnusedImports.kt
index a4eceb324058..5f0994874e41 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/UnusedImports.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/UnusedImports.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import com.sun.corba.se.impl.util.JDKBridge
 import com.sun.org.apache.xpath.internal.operations.And
 import java.lang.StringBuilder
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/UnusedImports.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/UnusedImports.kt.after
index e46900781b3c..bf98c6072b59 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/UnusedImports.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/UnusedImports.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import kotlin.system.measureTimeMillis
 import kotlin.test.Asserter
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/WithAliases.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/WithAliases.kt
index 39208fc08033..1d408fc05b68 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/WithAliases.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/WithAliases.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 import java.io as JavaIO
 import java.util.ArrayList
 import java.util.ArrayList as SomeThing
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/WithAliases.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/WithAliases.kt.after
index 4918469a660e..669f931a5857 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/WithAliases.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/WithAliases.kt.after
@@ -1,5 +1,3 @@
-// IGNORE_K2
-
 class Action {
     fun test() {
         val test : ArrayList<Int>? = null
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict.kt
index 13d67a997cf8..aef50bd46446 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 1
 package ppp
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict.kt.after
index b8ad4d2cc487..0ebf15f37567 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 1
 package ppp
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict3.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict3.kt
index 76be32e21793..8be7359e2a73 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict3.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict3.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 1
 package ppp
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict3.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict3.kt.after
index 790ea4cfa70c..5294980c3e39 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflict3.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 1
 package ppp
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithCurrentPackage2.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithCurrentPackage2.kt
index ea72a6ed361e..fe398b82d25e 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithCurrentPackage2.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithCurrentPackage2.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 1
 package ppp
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithCurrentPackage2.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithCurrentPackage2.kt.after
index 4522e040e48f..3d11f393e48e 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithCurrentPackage2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithCurrentPackage2.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 1
 package ppp
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt
index c0dd82753e88..328e7f7b9a34 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 1
 import java.lang.Character.*
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt.after
index d74886d56c68..d29294db141a 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 1
 import java.lang.Character.UPPERCASE_LETTER
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/JavaAnnotationWithValueParameterIsProperlyResolved.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/JavaAnnotationWithValueParameterIsProperlyResolved.kt
index b20e470ec017..00e0bce1f2d0 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/JavaAnnotationWithValueParameterIsProperlyResolved.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/JavaAnnotationWithValueParameterIsProperlyResolved.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 package test
 
 import JavaAnnotationWithValue
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/JavaAnnotationWithValueParameterIsProperlyResolved.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/JavaAnnotationWithValueParameterIsProperlyResolved.kt.after
index 25e7f10e19b1..94a15c7b5ba8 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/JavaAnnotationWithValueParameterIsProperlyResolved.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/JavaAnnotationWithValueParameterIsProperlyResolved.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 package test
 
 import JavaAnnotationWithValue
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/KotlinAnnotationWithSingleArgumentIsProperlyResolved.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/KotlinAnnotationWithSingleArgumentIsProperlyResolved.kt
index 258255aaca2b..44a0d25600c0 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/KotlinAnnotationWithSingleArgumentIsProperlyResolved.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/KotlinAnnotationWithSingleArgumentIsProperlyResolved.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 package test
 
 import java.io.*
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/KotlinAnnotationWithSingleArgumentIsProperlyResolved.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/KotlinAnnotationWithSingleArgumentIsProperlyResolved.kt.after
index b69a42938c10..dbffd0767deb 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/KotlinAnnotationWithSingleArgumentIsProperlyResolved.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/KotlinAnnotationWithSingleArgumentIsProperlyResolved.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 package test
 
 import java.io.File
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSetting.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSetting.kt
index 83b0207c5f50..bf3100bbd32a 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSetting.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSetting.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 2
 package ppp
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSetting.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSetting.kt.after
index 87b80916e637..6090568b3d6f 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSetting.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSetting.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 2
 package ppp
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSettingWithUnresolvedReference.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSettingWithUnresolvedReference.kt
index 9da2ad18e058..c9cab940e1e6 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSettingWithUnresolvedReference.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSettingWithUnresolvedReference.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 2
 package ppp
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSettingWithUnresolvedReference.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSettingWithUnresolvedReference.kt.after
index eb58c64415db..ddcf04941b32 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSettingWithUnresolvedReference.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NameCountSettingWithUnresolvedReference.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // NAME_COUNT_TO_USE_STAR_IMPORT: 2
 package ppp
 
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/PackagesToUseStarImport.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/PackagesToUseStarImport.kt
index 1b930ffbabb6..eaa00c89882d 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/PackagesToUseStarImport.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/PackagesToUseStarImport.kt
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // PACKAGE_TO_USE_STAR_IMPORTS: java
 // PACKAGE_TO_USE_STAR_IMPORTS: java.io
 // PACKAGES_TO_USE_STAR_IMPORTS: java.util.concurrent
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/PackagesToUseStarImport.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/PackagesToUseStarImport.kt.after
index 2ffe944d9acf..c4e7bd845afa 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/PackagesToUseStarImport.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/PackagesToUseStarImport.kt.after
@@ -1,4 +1,3 @@
-// IGNORE_K2
 // PACKAGE_TO_USE_STAR_IMPORTS: java
 // PACKAGE_TO_USE_STAR_IMPORTS: java.io
 // PACKAGES_TO_USE_STAR_IMPORTS: java.util.concurrent
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt
index e4a580864b97..65b5b284d931 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt
@@ -1,6 +1,5 @@
 // "Optimize imports" "true"
 // WITH_STDLIB
-// IGNORE_K2
 
 <caret>import java.io.*
 import java.util.*
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 e7092efe3805..c5a5689ce713 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/fileRuntime.kt.after
@@ -1,6 +1,5 @@
 // "Optimize imports" "true"
 // WITH_STDLIB
-// IGNORE_K2
 
 fun foo(list: ArrayList<String>) {
     list.add("")