[kotlin] Use IGNORE_K2 instead of IGNORE_FIR

GitOrigin-RevId: e380b6203a00315f718b7e08d1048ec284dce1a3

plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2InspectionTest.kt

@@ -19,7 +19,7 @@ abstract class AbstractK2InspectionTest : AbstractInspectionTest() {
     }
 
     override fun doTest(path: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(Path(path), IgnoreTests.DIRECTIVES.IGNORE_FIR) {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(Path(path), IgnoreTests.DIRECTIVES.IGNORE_K2) {
             super.doTest(path)
         }
     }

plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2LocalInspectionTest.kt

@@ -30,7 +30,7 @@ abstract class AbstractK2LocalInspectionTest : AbstractLocalInspectionTest() {
     }
 
     override fun doTestFor(mainFile: File, inspection: LocalInspectionTool, fileText: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(mainFile.toPath(), IgnoreTests.DIRECTIVES.IGNORE_FIR, "after") {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(mainFile.toPath(), IgnoreTests.DIRECTIVES.IGNORE_K2, "after") {
             doTestForInternal(mainFile, inspection, fileText)
         }
     }

plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2MultiFileLocalInspectionTest.kt

@@ -27,7 +27,7 @@ abstract class AbstractK2MultiFileLocalInspectionTest: AbstractMultiFileLocalIns
 
     override fun doTest(pathInString: String) {
         val path = Path(pathInString)
-        IgnoreTests.runTestIfNotDisabledByFileDirective(path, IgnoreTests.DIRECTIVES.IGNORE_FIR, "after") {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(path, IgnoreTests.DIRECTIVES.IGNORE_K2, "after") {
             super.doTest(pathInString)
         }
     }

plugins/kotlin/code-insight/inspections-k2/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt

@@ -9,4 +9,4 @@ fun main() {
     val c = my.simple.name.Foo()
 }
 
-// IGNORE_FIR
+// IGNORE_K2

plugins/kotlin/code-insight/inspections-k2/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt.after

@@ -9,4 +9,4 @@ fun main() {
     val c = Foo()
 }
 
-// IGNORE_FIR
+// IGNORE_K2

plugins/kotlin/code-insight/inspections-shared/tests/k2/test/org/jetbrains/kotlin/idea/k2/codeInsight/inspections/shared/AbstractK2SharedQuickFixTest.kt

@@ -6,8 +6,6 @@ import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixTest
 import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
-import org.jetbrains.kotlin.test.utils.IgnoreTests
-import kotlin.io.path.Path
 
 abstract class AbstractK2SharedQuickFixTest : AbstractQuickFixTest() {
     override fun checkForUnexpectedErrors() {}
@@ -24,10 +22,4 @@ abstract class AbstractK2SharedQuickFixTest : AbstractQuickFixTest() {
           { super.tearDown() }
         )
     }
-
-    override fun doTest(beforeFileName: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(Path(beforeFileName), IgnoreTests.DIRECTIVES.IGNORE_K2) {
-            super.doTest(beforeFileName)
-        }
-    }
 }

plugins/kotlin/code-insight/intentions-k2/tests/test/org/jetbrains/kotlin/idea/k2/intentions/tests/AbstractK2IntentionTest.kt

@@ -28,7 +28,7 @@ abstract class AbstractK2IntentionTest : AbstractIntentionTestBase() {
     }
 
     override fun doTestFor(mainFile: File, pathToFiles: Map<String, PsiFile>, intentionAction: IntentionAction, fileText: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(mainFile.toPath(), IgnoreTests.DIRECTIVES.IGNORE_FIR) {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(mainFile.toPath(), IgnoreTests.DIRECTIVES.IGNORE_K2) {
             super.doTestFor(mainFile, pathToFiles, intentionAction, fileText)
         }
     }

plugins/kotlin/code-insight/line-markers/test/org/jetbrains/kotlin/idea/k2/codeInsight/lineMarkers/test/AbstractLineMarkersK2Test.kt

@@ -21,7 +21,7 @@ import kotlin.io.path.Path
 
 abstract class AbstractLineMarkersK2Test : AbstractLineMarkersTest() {
     override fun doTest(path: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(Path(path), IgnoreTests.DIRECTIVES.IGNORE_FIR) {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(Path(path), IgnoreTests.DIRECTIVES.IGNORE_K2) {
             super.doTest(path)
         }
     }

plugins/kotlin/code-insight/postfix-templates/test/org/jetbrains/kotlin/idea/k2/codeInsight/postfix/test/AbstractKotlinPostfixTemplateTest.kt

@@ -24,7 +24,7 @@ abstract class AbstractKotlinPostfixTemplateTest : NewLightKotlinCodeInsightFixt
     }
 
     protected fun performTest() {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(testRootPath.resolve(testMethodPath), IgnoreTests.DIRECTIVES.IGNORE_FIR, "after") {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(testRootPath.resolve(testMethodPath), IgnoreTests.DIRECTIVES.IGNORE_K2, "after") {
             myFixture.configureByDefaultFile()
             myFixture.type(".$templateName\t")
             myFixture.checkContentByExpectedPath(".after")

plugins/kotlin/code-insight/postfix-templates/testData/expansion/assert/call.kt

@@ -6,4 +6,4 @@ object Processor {
     fun shouldProcess(): Boolean = true
 }
 
-// IGNORE_FIR
+// IGNORE_K2

plugins/kotlin/completion/tests-shared/test/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt

@@ -155,7 +155,7 @@ object ExpectedCompletionUtils {
         BLOCK_CODE_FRAGMENT,
         AstAccessControl.ALLOW_AST_ACCESS_DIRECTIVE,
         IgnoreTests.DIRECTIVES.FIR_COMPARISON,
-        IgnoreTests.DIRECTIVES.IGNORE_FIR,
+        IgnoreTests.DIRECTIVES.IGNORE_K2,
         IgnoreTests.DIRECTIVES.FIR_IDENTICAL,
         IgnoreTests.DIRECTIVES.FIR_COMPARISON_MULTILINE_COMMENT,
         IgnoreTests.DIRECTIVES.IGNORE_FE10,

plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/parameterInfo/AbstractFirParameterInfoTest.kt

@@ -19,7 +19,7 @@ abstract class AbstractFirParameterInfoTest : AbstractParameterInfoTest() {
     }
 
     override fun doTest(fileName: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(Paths.get(fileName), IgnoreTests.DIRECTIVES.IGNORE_FIR) {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(Paths.get(fileName), IgnoreTests.DIRECTIVES.IGNORE_K2) {
             super.doTest(fileName)
         }
     }

plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixMultiFileTest.kt

@@ -22,7 +22,7 @@ abstract class AbstractHighLevelQuickFixMultiFileTest : AbstractQuickFixMultiFil
     override fun doTestWithExtraFile(beforeFileName: String) {
         IgnoreTests.runTestIfNotDisabledByFileDirective(
             Paths.get(beforeFileName),
-            disableTestDirective = IgnoreTests.DIRECTIVES.IGNORE_FIR_MULTILINE_COMMENT,
+            disableTestDirective = IgnoreTests.DIRECTIVES.IGNORE_K2_MULTILINE_COMMENT,
             directivePosition = IgnoreTests.DirectivePosition.LAST_LINE_IN_FILE,
             computeAdditionalFiles = { mainTestFile -> listOfNotNull(mainTestFile.getAfterFileIfExists()) },
             test = { super.doTestWithExtraFile(beforeFileName) }

plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixTest.kt

@@ -27,7 +27,7 @@ abstract class AbstractHighLevelQuickFixTest : AbstractQuickFixTest() {
 
     }
 
-    override val disableTestDirective: String get() =  IgnoreTests.DIRECTIVES.IGNORE_FIR_MULTILINE_COMMENT
+    override val disableTestDirective: String get() =  IgnoreTests.DIRECTIVES.IGNORE_K2_MULTILINE_COMMENT
 
     override fun doTest(beforeFileName: String) {
         val firBeforeFileName = getFirBeforeFileName(beforeFileName)

plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/shortenRefs/AbstractFirShortenRefsTest.kt

@@ -58,7 +58,7 @@ abstract class AbstractFirShortenRefsTest : AbstractImportsTest() {
     override val runTestInWriteCommand: Boolean = false
 
     protected fun doTestWithMuting(unused: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(dataFile().toPath(), IgnoreTests.DIRECTIVES.IGNORE_FIR, ".after") {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(dataFile().toPath(), IgnoreTests.DIRECTIVES.IGNORE_K2, ".after") {
             doTest(unused)
         }
     }

plugins/kotlin/frontend-independent/tests/test/org/jetbrains/kotlin/test/utils/IgnoreTests.kt

@@ -229,18 +229,23 @@ object IgnoreTests {
     }
 
     object DIRECTIVES {
-        @Deprecated(message = "use IGNORE_FIR instead")
+        @Deprecated(message = "use IGNORE_K2 instead")
         const val FIR_COMPARISON = "// FIR_COMPARISON"
-        @Deprecated(message = "use IGNORE_FIR instead")
+        @Deprecated(message = "use IGNORE_K2 instead")
         const val FIR_COMPARISON_MULTILINE_COMMENT = "/* FIR_COMPARISON */"
 
-        const val IGNORE_FIR_LOG = "// IGNORE_FIR_LOG"
-
-        const val IGNORE_FIR = "// IGNORE_FIR"
         const val IGNORE_K2 = "// IGNORE_K2"
+        const val IGNORE_K2_MULTILINE_COMMENT = "/* IGNORE_K2 */"
+        const val IGNORE_K2_LOG = "// IGNORE_K2_LOG"
+
+        @Deprecated(message = "use IGNORE_K2 instead")
+        const val IGNORE_FIR = "// IGNORE_FIR"
+        @Deprecated(message = "use IGNORE_K2_MULTILINE_COMMENT instead")
         const val IGNORE_FIR_MULTILINE_COMMENT = "/* IGNORE_FIR */"
 
         const val FIX_ME = "// FIX_ME: "
+
+        @Deprecated(message = "use IGNORE_K2 instead")
         const val FIR_IDENTICAL = "// FIR_IDENTICAL"
 
         const val IGNORE_FE10_BINDING_BY_FIR = "// IGNORE_FE10_BINDING_BY_FIR"

plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/AbstractK2HighlightingMetaInfoTest.kt

@@ -29,7 +29,7 @@ abstract class AbstractK2HighlightingMetaInfoTest : AbstractHighlightingMetaInfo
 
         IgnoreTests.runTestIfNotDisabledByFileDirective(
             testKtFile.toPath(),
-            disableTestDirective = IgnoreTests.DIRECTIVES.IGNORE_FIR,
+            disableTestDirective = IgnoreTests.DIRECTIVES.IGNORE_K2,
             additionalFilesExtensions = arrayOf(HIGHLIGHTING_EXTENSION, HIGHLIGHTING_FIR_EXTENSION)
         ) {
             // warnings are not supported yet

plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt

@@ -126,7 +126,7 @@ abstract class AbstractOverrideImplementTest<T : ClassMember> : KotlinLightCodeI
     }
 
     private fun doMultiOverrideImplement(handler: AbstractGenerateMembersHandler<T>) {
-        if (isFirPlugin && InTextDirectivesUtils.isDirectiveDefined(myFixture.file.text, IgnoreTests.DIRECTIVES.IGNORE_FIR)) {
+        if (isFirPlugin && InTextDirectivesUtils.isDirectiveDefined(myFixture.file.text, IgnoreTests.DIRECTIVES.IGNORE_K2)) {
             return
         }
         val elementAtCaret = myFixture.file.findElementAt(myFixture.editor.caretModel.offset)
@@ -176,7 +176,7 @@ abstract class AbstractOverrideImplementTest<T : ClassMember> : KotlinLightCodeI
         val resultFile = if (isFirPlugin) {
             if (InTextDirectivesUtils.isDirectiveDefined(
                     goldenResultFile.readText(StandardCharsets.UTF_8),
-                    IgnoreTests.DIRECTIVES.IGNORE_FIR
+                    IgnoreTests.DIRECTIVES.IGNORE_K2
                 )
             ) {
                 return

plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt

@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.idea.test.KotlinTestUtils
 import org.jetbrains.kotlin.idea.test.configureCodeStyleAndRun
 import org.jetbrains.kotlin.test.utils.IgnoreTests
 import java.io.File
-import kotlin.io.path.Path
 
 abstract class AbstractMoveStatementTest : AbstractCodeMoverTest() {
     protected fun doTestClassBodyDeclaration(unused: String) {
@@ -45,7 +44,7 @@ abstract class AbstractMoveStatementTest : AbstractCodeMoverTest() {
     }
 
     private fun doTest(defaultMoverClass: Class<out StatementUpDownMover>, trailingComma: Boolean = false) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(dataFile().toPath(), IgnoreTests.DIRECTIVES.IGNORE_FIR) {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(dataFile().toPath(), IgnoreTests.DIRECTIVES.IGNORE_K2) {
             doTest(trailingComma) { isApplicableExpected, direction ->
                 val movers = Extensions.getExtensions(StatementUpDownMover.STATEMENT_UP_DOWN_MOVER_EP)
                 val info = StatementUpDownMover.MoveInfo()

plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt

@@ -96,7 +96,7 @@ abstract class AbstractQuickFixTest : KotlinLightCodeInsightFixtureTestCase(), Q
     }
 
     protected open val disableTestDirective: String
-        get() = if (isFirPlugin) IgnoreTests.DIRECTIVES.IGNORE_FIR else IgnoreTests.DIRECTIVES.IGNORE_FE10
+        get() = if (isFirPlugin) IgnoreTests.DIRECTIVES.IGNORE_K2 else IgnoreTests.DIRECTIVES.IGNORE_FE10
 
 
     protected open fun doTest(beforeFileName: String) {

plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.kt

@@ -31,7 +31,7 @@ abstract class AbstractReferenceResolveTest : KotlinLightCodeInsightFixtureTestC
     protected open fun doTest(path: String) {
         configureTest()
         val controlDirective = if (isFirPlugin()) {
-            IgnoreTests.DIRECTIVES.IGNORE_FIR
+            IgnoreTests.DIRECTIVES.IGNORE_K2
         } else {
             IgnoreTests.DIRECTIVES.IGNORE_FE10
         }

plugins/kotlin/idea/tests/testData/checker/diagnosticsMessage/incompleteTypeArgumentList.fir.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 
 interface ApplicationFeature<in P : Pipeline<*>, B : Any, V>
 open class Pipeline<TSubject : Any>()

plugins/kotlin/idea/tests/testData/checker/regression/javaStyleClassLiteralInAnnotationArguments.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 annotation class A
 
 class B

plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor3.kt

@@ -7,4 +7,4 @@ var x: String
         // test
     }
 
-// IGNORE_FIR
+// IGNORE_K2

plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor4.kt

@@ -7,4 +7,4 @@ var x: String
         // test
     }
 
-// IGNORE_FIR
+// IGNORE_K2

plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 import foo.A
 
 class B : A() {

plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.after

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 import foo.A
 
 class B : A() {

plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt

@@ -1,3 +1,3 @@
-// IGNORE_FIR
+// IGNORE_K2
 @JvmInline
 value class <caret>V(val v: Int)

plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt.after

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 @JvmInline
 value class V(val v: Int) {
     override fun toString(): String {

plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -XXLanguage:+GenericInlineClassParameter
 @JvmInline
 value class <caret>V(val v: Int)

plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt.after

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -XXLanguage:+GenericInlineClassParameter
 @JvmInline
 value class V(val v: Int) {

plugins/kotlin/idea/tests/testData/editor/autoImport/extFunctionWithGenerics/extFunctionWithGenerics.kt

@@ -7,4 +7,4 @@ fun some() {
     r.foo("")
 }<caret>
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */

plugins/kotlin/idea/tests/testData/editor/autoImport/extFunctionWithGenerics/extFunctionWithGenerics.kt.after

@@ -8,4 +8,4 @@ fun some() {
     r.foo("")
 }<caret>
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */

plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/ConventionUsages.0.java

@@ -6,4 +6,4 @@ public class Small {
     }
 }
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/JavaWithGroovyInvoke.0.java

@@ -12,4 +12,4 @@ public class JavaWithGroovyInvoke_0 {
 
 // CRI_IGNORE
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/MismatchedAccessor.0.java

@@ -11,4 +11,4 @@ public class Bar {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaComponentFunctions.0.java

@@ -11,4 +11,4 @@ public class JavaClass {
     }
 }
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaInvoke.0.java

@@ -25,4 +25,4 @@ public class JavaClassInvoke {
     }
 }
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaInvokeWithStaticImport.0.java

@@ -11,4 +11,4 @@ public class JavaClassWI {
     }
 }
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/compareTo.0.kt

@@ -21,4 +21,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/SAM.0.kt

@@ -8,4 +8,4 @@ data class A(val <caret>a: Int, val b: String)
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/callableReferences.0.kt

@@ -28,4 +28,4 @@ fun foo(x: X) {
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/companionObjectAccess.0.kt

@@ -16,4 +16,4 @@ fun foo() {
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType1.0.kt

@@ -15,4 +15,4 @@ fun test() {
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType2.0.kt

@@ -22,4 +22,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClass.0.kt

@@ -30,4 +30,4 @@ fun <T> T.getThis(): T = this
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.0.kt

@@ -13,4 +13,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRefLocal.0.kt

@@ -12,4 +12,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt

@@ -19,4 +19,4 @@ fun f(b: B, c: C) {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/extensionComponentFun.0.kt

@@ -32,4 +32,4 @@ fun g(z1: Z1, z2: Z2) {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/for.0.kt

@@ -14,4 +14,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt

@@ -17,4 +17,4 @@ fun y(o: Any) {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/lambdas.0.kt

@@ -43,4 +43,4 @@ fun f() {
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.0.kt

@@ -35,4 +35,4 @@ fun y3(a: A) {
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/memberComponentFun.0.kt

@@ -30,4 +30,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/operators.0.kt

@@ -18,4 +18,4 @@ fun f(b1: B, b2: B) {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.0.kt

@@ -11,4 +11,4 @@ fun f(a: A) {
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.0.kt

@@ -11,4 +11,4 @@ fun f(a: A) {
     val (a1, s) = b
 }
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/when.0.kt

@@ -28,4 +28,4 @@ fun when2(o: Any) {
     }
 }
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/contains.0.kt

@@ -17,4 +17,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/forIteration.0.kt

@@ -22,4 +22,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/get.0.kt

@@ -20,4 +20,4 @@ typealias DescriptorData = C<B.Key>
 class C<T>
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.0.kt

@@ -11,4 +11,4 @@ class Delegate() {
 val p: String by Delegate()
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/inc.0.kt

@@ -14,4 +14,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtension.0.kt

@@ -15,4 +15,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtensionWithSmartCast.0.kt

@@ -19,4 +19,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeInObjectAsFunction.0.kt

@@ -13,4 +13,4 @@ fun test() {
     Foo()
 }
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeExtension.0.kt

@@ -13,4 +13,4 @@ fun f(p: P) {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeWithVarArg.0.kt

@@ -16,4 +16,4 @@ fun f(p: P) {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plus.0.kt

@@ -24,4 +24,4 @@ fun test(array: Array<A>) {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plusAssign.0.kt

@@ -20,4 +20,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.0.kt

@@ -15,4 +15,4 @@ class Delegate() {
 var p: String by Delegate()
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/severalOperators.0.kt

@@ -41,4 +41,4 @@ fun test4() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/unaryMinus.0.kt

@@ -12,4 +12,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt

@@ -6,4 +6,4 @@ package test
 public data class KotlinDataClass(val <caret>foo: Int, val bar: String)
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG

plugins/kotlin/idea/tests/testData/highlighter/Annotations.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // EXPECTED_DUPLICATED_HIGHLIGHTING
 
 <symbolName descr="null" textAttributesKey="KOTLIN_ANNOTATION">@Target</symbolName>(<symbolName descr="null" textAttributesKey="KOTLIN_ENUM">AnnotationTarget</symbolName>.<symbolName descr="null" textAttributesKey="KOTLIN_ENUM_ENTRY">CLASS</symbolName>, <symbolName descr="null" textAttributesKey="KOTLIN_ENUM">AnnotationTarget</symbolName>.<symbolName descr="null" textAttributesKey="KOTLIN_ENUM_ENTRY">EXPRESSION</symbolName>)

plugins/kotlin/idea/tests/testData/highlighter/DelegateFunctionMissing.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 class <symbolName descr="null">X</symbolName><<symbolName descr="null">T</symbolName>>{}
 fun <<symbolName descr="null">T</symbolName>> <symbolName descr="null">foo</symbolName>() : <symbolName descr="null">X</symbolName><<symbolName descr="null">T</symbolName>> {<error descr="[NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY] A 'return' expression required in a function with a block body ('{...}')">}</error>
 val x <symbolName descr="null">by</symbolName> <error descr="[DELEGATE_SPECIAL_FUNCTION_MISSING] Type 'X<TypeVariable(T)>' has no method 'getValue(Nothing?, KProperty<*>)' and thus it cannot serve as a delegate" textAttributesKey="ERRORS_ATTRIBUTES">foo<<error descr="Type expected">></error>()</error>

plugins/kotlin/idea/tests/testData/highlighter/DelegatingCtor.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 
 <symbolName descr="null" textAttributesKey="KOTLIN_BUILTIN_ANNOTATION">open</symbolName> class <symbolName descr="null" textAttributesKey="KOTLIN_CLASS">Foo</symbolName> {
     <symbolName descr="null" textAttributesKey="KOTLIN_KEYWORD">constructor</symbolName>(<warning descr="[UNUSED_PARAMETER] Parameter 'i' is never used" textAttributesKey="NOT_USED_ELEMENT_ATTRIBUTES"><symbolName descr="null" textAttributesKey="KOTLIN_PARAMETER">i</symbolName></warning>: <symbolName descr="null" textAttributesKey="KOTLIN_CLASS">Int</symbolName>)

plugins/kotlin/idea/tests/testData/highlighter/Destructuring.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // EXPECTED_DUPLICATED_HIGHLIGHTING
 
 <symbolName descr="null">data</symbolName> class <symbolName descr="null">Box</symbolName>(val <symbolName descr="null">v</symbolName>: <symbolName descr="null">Int</symbolName>)

plugins/kotlin/idea/tests/testData/highlighter/Dynamic.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 package testing
 
 fun <symbolName textAttributesKey="KOTLIN_FUNCTION_DECLARATION">tst</symbolName>(<symbolName textAttributesKey="KOTLIN_PARAMETER">d</symbolName>: <error><symbolName>dynamic</symbolName></error>) {

plugins/kotlin/idea/tests/testData/highlighter/InaccessibleExpression.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 
 interface <symbolName textAttributesKey="KOTLIN_TRAIT">Zoo</symbolName><<symbolName textAttributesKey="KOTLIN_TYPE_PARAMETER">T</symbolName>> {
     <error descr="[WRONG_MODIFIER_TARGET] Modifier 'inner' is not applicable to 'enum class'" textAttributesKey="ERRORS_ATTRIBUTES"><symbolName textAttributesKey="KOTLIN_BUILTIN_ANNOTATION">inner</symbolName></error> <symbolName textAttributesKey="KOTLIN_BUILTIN_ANNOTATION">enum</symbolName> class <symbolName textAttributesKey="KOTLIN_ENUM">Var</symbolName> : <symbolName textAttributesKey="KOTLIN_TRAIT">Zoo</symbolName><<error descr="[INACCESSIBLE_OUTER_CLASS_EXPRESSION] Expression is inaccessible from a nested class 'Var'" textAttributesKey="ERRORS_ATTRIBUTES"><symbolName descr="null" textAttributesKey="KOTLIN_TYPE_PARAMETER">T</symbolName></error>>

plugins/kotlin/idea/tests/testData/highlighter/KotlinInjection.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 package language_injection
 
 <symbolName descr="null">import</symbolName> org.intellij.lang.annotations.<symbolName descr="null">Language</symbolName>

plugins/kotlin/idea/tests/testData/highlighter/RecursiveTypes.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // EXPECTED_DUPLICATED_HIGHLIGHTING
 // ISSUE: KT-42263
 

plugins/kotlin/idea/tests/testData/highlighter/SmartCast.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 class <symbolName textAttributesKey="KOTLIN_CLASS">My</symbolName>(val <symbolName textAttributesKey="KOTLIN_INSTANCE_PROPERTY">x</symbolName>: <symbolName textAttributesKey="KOTLIN_CLASS">Int</symbolName>?)
 
 fun <symbolName textAttributesKey="KOTLIN_CLASS">My</symbolName>?.<symbolName textAttributesKey="KOTLIN_FUNCTION_DECLARATION">foo</symbolName>(): <symbolName textAttributesKey="KOTLIN_CLASS">Int</symbolName> {

plugins/kotlin/idea/tests/testData/highlighter/Suspend.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // EXPECTED_DUPLICATED_HIGHLIGHTING
 
 val <symbolName descr="null" textAttributesKey="KOTLIN_PACKAGE_PROPERTY">fnType</symbolName> : <symbolName descr="null" textAttributesKey="KOTLIN_BUILTIN_ANNOTATION">suspend</symbolName> () -> <symbolName descr="null" textAttributesKey="KOTLIN_OBJECT">Unit</symbolName> = {}

plugins/kotlin/idea/tests/testData/highlighter/SyntheticExtensionProperty.kt

@@ -1,2 +1,2 @@
-// IGNORE_FIR
+// IGNORE_K2
 val <symbolName textAttributesKey="KOTLIN_PACKAGE_PROPERTY">weekYear</symbolName> = java.util.<symbolName textAttributesKey="KOTLIN_ABSTRACT_CLASS">Calendar</symbolName>.<symbolName textAttributesKey="KOTLIN_FUNCTION_CALL">getInstance</symbolName>().<symbolName textAttributesKey="KOTLIN_SYNTHETIC_EXTENSION_PROPERTY">weekYear</symbolName>

plugins/kotlin/idea/tests/testData/highlighter/TooManyArguments.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 fun <symbolName descr="null">fooxxx</symbolName>() {}
 
 fun <symbolName descr="null">main</symbolName>() {

plugins/kotlin/idea/tests/testData/highlighter/TopLevelDestructuring.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 
 val <error descr="Destructuring declarations are only allowed for local variables/values">(a, b)</error> by <error descr="[DEBUG] Reference is not resolved to anything, but is not marked unresolved">lazy</error> { <error descr="[DEBUG] Reference is not resolved to anything, but is not marked unresolved">Pair</error>(1, 2) }
 val <error descr="Destructuring declarations are only allowed for local variables/values">(c, d)</error> = <error descr="[DEBUG] Reference is not resolved to anything, but is not marked unresolved">run</error> { <error descr="[DEBUG] Reference is not resolved to anything, but is not marked unresolved">Pair</error>(3, 4) }

plugins/kotlin/idea/tests/testData/highlighter/TopLevelOpenSuspendFun.kt

@@ -1,2 +1,2 @@
-// IGNORE_FIR
+// IGNORE_K2
 <error descr="[WRONG_MODIFIER_TARGET] Modifier 'open' is not applicable to 'top level function'"><symbolName descr="null">open</symbolName></error> <symbolName descr="null">suspend</symbolName> fun <symbolName descr="null">f</symbolName>() {}

plugins/kotlin/idea/tests/testData/highlighter/TypeAlias2.kt

@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 
 <symbolName textAttributesKey="KOTLIN_BUILTIN_ANNOTATION">annotation</symbolName> class <symbolName textAttributesKey="KOTLIN_ANNOTATION">Anno</symbolName>
 typealias <symbolName textAttributesKey="KOTLIN_ANNOTATION">AnnoAlias</symbolName> = <symbolName textAttributesKey="KOTLIN_ANNOTATION">Anno</symbolName>

plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/class/inspectionData/inspections.test

@@ -1,4 +1,4 @@
 // INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.UnusedSymbolInspection
 // K2_INSPECTION_CLASS: org.jetbrains.kotlin.idea.k2.codeinsight.inspections.UnusedSymbolInspection
 // RUNTIME_WITH_FULL_JDK
-// IGNORE_FIR
+// IGNORE_K2

plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/enum/inspectionData/inspections.test

@@ -2,4 +2,4 @@
 // K2_INSPECTION_CLASS: org.jetbrains.kotlin.idea.k2.codeinsight.inspections.UnusedSymbolInspection
 // COMPILER_ARGUMENTS: -XXLanguage:+EnumEntries -opt-in=kotlin.ExperimentalStdlibApi
 // WITH_STDLIB
-// IGNORE_FIR
+// IGNORE_K2

plugins/kotlin/idea/tests/testData/inspectionsLocal/conventionNameCalls/replaceGetOrSet/setWithVararg.kt

@@ -1,6 +1,6 @@
 // PROBLEM: none
 // ERROR: 'operator' modifier is inapplicable on this function: last parameter should not have a default value or be a vararg
-// IGNORE_FIR
+// IGNORE_K2
 
 class C {
     operator fun set(s: String, vararg value: Int): Boolean = true

plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithCast.kt

@@ -8,4 +8,4 @@ enum class EnumClass {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2

plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithCast.kt.after

@@ -8,4 +8,4 @@ enum class EnumClass {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2

plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithoutCast.kt

@@ -8,4 +8,4 @@ enum class EnumClass {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2

plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithoutCast.kt.after

@@ -8,4 +8,4 @@ enum class EnumClass {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2

plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/forEachInsideEnumBody.kt

@@ -9,4 +9,4 @@ enum class EnumClass {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2

plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/forEachInsideEnumBody.kt.after

@@ -9,4 +9,4 @@ enum class EnumClass {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2

plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam.kt

@@ -10,4 +10,4 @@ class With<caret>Constructor(x: Int, s: String) {
     override fun hashCode(): Int = 1
 }
 
-// IGNORE_FIR
+// IGNORE_K2