FIR IDE: use IGNORE_FIR instead of FIR_COMPARISON in hl quick fix tests

To explicitly specify which test are failing

idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt

@@ -15,9 +15,9 @@ import java.nio.file.Paths
 
 abstract class AbstractHighLevelQuickFixTest : AbstractQuickFixTest() {
     override fun doTest(beforeFileName: String) {
-        IgnoreTests.runTestIfEnabledByFileDirective(
+        IgnoreTests.runTestIfNotDisabledByFileDirective(
             Paths.get(beforeFileName),
-            enableTestDirective = IgnoreTests.DIRECTIVES.FIR_COMPARISON_MULTILINE_COMMENT,
+            disableTestDirective = IgnoreTests.DIRECTIVES.IGNORE_FIR_MULTILINE_COMMENT,
             directivePosition = IgnoreTests.DirectivePosition.LAST_LINE_IN_FILE,
             additionalFilesExtensions = arrayOf("after")
         ) {

idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt

@@ -175,7 +175,10 @@ object IgnoreTests {
     object DIRECTIVES {
         const val FIR_COMPARISON = "// FIR_COMPARISON"
         const val FIR_COMPARISON_MULTILINE_COMMENT = "/* FIR_COMPARISON */"
+
         const val IGNORE_FIR = "// IGNORE_FIR"
+        const val IGNORE_FIR_MULTILINE_COMMENT = "/* IGNORE_FIR */"
+
         const val FIX_ME = "// FIX_ME: "
         const val FIR_IDENTICAL = "// FIR_IDENTICAL"
     }

idea/testData/checker/regression/Jet53.kt

@@ -1,4 +1,3 @@
-// FIR_IDENTICAL
 import java.util.Collections
 
 fun <T> checkSubtype(t: T) = t

idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt

@@ -2,4 +2,3 @@
 class A() {
     <caret>abstract fun foo() {}
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt.after

@@ -2,4 +2,3 @@
 class A() {
     fun foo() {}
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractFunctionWithBody.kt

@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo() {}
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractFunctionWithBody.kt.after

@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo()
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt

@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo() : Any { return "a" }
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt.after

@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo() : Any
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt

@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo() : Any = 1
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt.after

@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo() : Any
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt

@@ -4,3 +4,5 @@ abstract class A() {
         // 3
     }
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt.after

@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo() /*1*/
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt

@@ -3,3 +3,5 @@ abstract class A() {
     <caret>abstract fun foo() = /*1*/
             { "" /*2*/ } // 3
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt.after

@@ -3,3 +3,5 @@ abstract class A() {
     /*1*/
     abstract fun foo()  // 3
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractPropertyInCompanionObject.kt

@@ -8,4 +8,3 @@ class Owner {
         <caret>abstract val x: Int
     }
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt

@@ -2,4 +2,3 @@
 class A() {
     <caret>abstract var i : Int
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after

@@ -2,4 +2,3 @@
 abstract class A() {
     <caret>abstract var i : Int
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt

@@ -2,4 +2,3 @@
 class A() {
     <caret>abstract var i : Int = 0
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt.after

@@ -2,4 +2,3 @@
 class A() {
     var i : Int = 0
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt

@@ -2,4 +2,3 @@
 public class A() {
     <caret>abstract var i : Int
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after

@@ -2,4 +2,3 @@
 public abstract class A() {
     <caret>abstract var i : Int
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt

@@ -1,2 +1,3 @@
 // "Make 'i' not abstract" "true"
-class A(<caret>abstract val i: Int) {}
+class A(<caret>abstract val i: Int) {}
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt.after

@@ -1,2 +1,3 @@
 // "Make 'i' not abstract" "true"
-class A(<caret>val i: Int) {}
+class A(<caret>val i: Int) {}
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt

@@ -1,2 +1,3 @@
 // "Make 'i' not abstract" "true"
-<caret>abstract val i: Int = 1
+<caret>abstract val i: Int = 1
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt.after

@@ -1,2 +1,3 @@
 // "Make 'i' not abstract" "true"
-<caret>val i: Int = 1
+<caret>val i: Int = 1
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt

@@ -2,3 +2,5 @@
 abstract class A {
     abstract var i = 0<caret>
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt.after

@@ -2,3 +2,5 @@
 abstract class A {
     abstract var i: Int
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt

@@ -2,3 +2,5 @@
 abstract class A {
     abstract var i : Int = 0<caret>
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt.after

@@ -2,3 +2,5 @@
 abstract class A {
     abstract var i: Int<caret>
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt

@@ -3,4 +3,3 @@ class B {
     <caret>abstract val i: Int = 0
         get() = field
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after

@@ -3,4 +3,3 @@ class B {
     val i: Int = 0
         get() = field
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt

@@ -2,4 +2,5 @@
 abstract class B {
     abstract val i = <caret>0
         get() = field
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt.after

@@ -2,4 +2,5 @@
 abstract class B {
     abstract val i: Int<caret>
 
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt

@@ -2,4 +2,3 @@
 class A {
     <caret>abstract var i = 0
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt.after

@@ -2,4 +2,3 @@
 class A {
     <caret>var i = 0
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt

@@ -3,4 +3,3 @@ class B {
     abstract<caret> var j: Int = 0
         set(v: Int) {}
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt.after

@@ -3,4 +3,3 @@ class B {
     var j: Int = 0
         set(v: Int) {}
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt

@@ -7,4 +7,3 @@ enum class E {
 
     abstract fun foo()
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/makeInlineClassAbstract.kt

@@ -10,4 +10,3 @@ interface I {
 }
 
 inline class A<caret> : I
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt

@@ -8,4 +8,3 @@
 object O {
     <caret>fun foo()
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/makeTopLevelAbstract.kt

@@ -6,4 +6,3 @@
 // ERROR: Function 'foo' must have a body
 
 <caret>fun foo()
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/manyImpl.kt

@@ -19,4 +19,3 @@ object Impl : D, E {
 }
 
 <caret>class X : D by Impl, E by Impl {}
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt

@@ -2,3 +2,5 @@
 abstract class A() {
     var <caret>i : Int
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt.after

@@ -2,3 +2,5 @@
 abstract class A() {
     abstract var <caret>i : Int
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt

@@ -2,3 +2,5 @@
 class A() {
     var <caret>i : Int
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt.after

@@ -2,3 +2,5 @@
 abstract class A() {
     abstract var <caret>i : Int
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt

@@ -2,3 +2,5 @@
 open class A() {
     var <caret>i : Int
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt.after

@@ -2,3 +2,5 @@
 abstract class A() {
     abstract var <caret>i : Int
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt

@@ -2,4 +2,3 @@
 sealed class A() {
     fun <caret>i() : Int
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt.after

@@ -2,4 +2,3 @@
 sealed class A() {
     abstract fun <caret>i() : Int
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt

@@ -2,4 +2,3 @@
 class A() {
     fun <caret>foo()
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after

@@ -2,4 +2,3 @@
 class A() {
     fun <caret>foo() {}
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt

@@ -1,2 +1,3 @@
 // "Make 'foo' not abstract" "true"
-<caret>abstract fun foo() {}
+<caret>abstract fun foo() {}
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt.after

@@ -1,2 +1,3 @@
 // "Make 'foo' not abstract" "true"
-fun foo() {}
+fun foo() {}
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt

@@ -1,2 +1,4 @@
 // "Add function body" "true"
 fun <caret>foo()
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt.after

@@ -1,2 +1,4 @@
 // "Add function body" "true"
 fun foo() {}
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/notImplementedMember.kt

@@ -5,3 +5,5 @@ interface I {
 
 <caret>class A : I {
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/notImplementedMember.kt.after

@@ -5,3 +5,5 @@ interface I {
 
 abstract class A : I {
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt

@@ -5,3 +5,5 @@ abstract class A {
 
 <caret>class B : A() {
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after

@@ -5,3 +5,5 @@ abstract class A {
 
 abstract class B : A() {
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/abstract/replaceOpen.kt

@@ -2,4 +2,3 @@
 abstract class B() {
     open fun <caret>foo()
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/abstract/replaceOpen.kt.after

@@ -2,4 +2,3 @@
 abstract class B() {
     abstract fun <caret>foo()
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/expressions/fixNullableBinaryWithExclExcl.kt

@@ -6,4 +6,5 @@ class SafeType {
 
 fun safeB(p: SafeType?) {
     val v = p <caret>+ 42
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/fixNullableBinaryWithExclExcl.kt.after

@@ -6,4 +6,5 @@ class SafeType {
 
 fun safeB(p: SafeType?) {
     val v = p!! + 42
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/fixNullableInfixWithExclExcl.kt

@@ -6,4 +6,5 @@ class SafeType {
 
 fun safeB(p: SafeType?) {
     val v = p <caret>op 42
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/fixNullableInfixWithExclExcl.kt.after

@@ -6,4 +6,5 @@ class SafeType {
 
 fun safeB(p: SafeType?) {
     val v = p!! op 42
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/fixNullableIterableGenericWithExclExcl.kt

@@ -2,3 +2,5 @@
 fun <T: Collection<Int>?> foo(c: T) {
     for (i in <caret>c) { }
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/fixNullableIterableGenericWithExclExcl.kt.after

@@ -2,3 +2,5 @@
 fun <T: Collection<Int>?> foo(c: T) {
     for (i in c!!) { }
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/fixNullableIterableWithExclExcl.kt

@@ -3,3 +3,5 @@ fun foo() {
     val test : Collection<Int>? = null!!
     for (i in <caret>test) { }
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/fixNullableIterableWithExclExcl.kt.after

@@ -3,3 +3,5 @@ fun foo() {
     val test : Collection<Int>? = null!!
     for (i in <caret>test!!) { }
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/fixNullableUnaryWithExclExcl.kt

@@ -6,4 +6,5 @@ class SafeType {
 
 fun safeB(p: SafeType?) {
     val v = <caret>-p
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/fixNullableUnaryWithExclExcl.kt.after

@@ -6,4 +6,5 @@ class SafeType {
 
 fun safeB(p: SafeType?) {
     val v = -p!!
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/fixNullableWithExclExclAbsentWithBadIterator.kt

@@ -11,4 +11,3 @@ fun foo() {
     val test: Some? = Some()
     for (i in <caret>test) { }
 }
-/* FIR_COMPARISON */

idea/testData/quickfix/expressions/fixNullableWithIteratorWithExclExcl.kt

@@ -7,3 +7,5 @@ fun foo() {
     val test: Some? = Some()
     for (i in <caret>test) { }
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/fixNullableWithIteratorWithExclExcl.kt.after

@@ -7,3 +7,5 @@ fun foo() {
     val test: Some? = Some()
     for (i in test!!) { }
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/kt11594.kt

@@ -4,4 +4,5 @@ fun callMe(p: String) {}
 
 fun callIt(p: Any) {
     callMe(<caret>p as String?)
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/kt11594.kt.after

@@ -4,4 +4,5 @@ fun callMe(p: String) {}
 
 fun callIt(p: Any) {
     callMe(<caret>(p as String?)!!)
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCast.kt

@@ -2,3 +2,5 @@
 fun foo(a: String) {
     val b = a <caret>as String
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCast.kt.after

@@ -2,3 +2,5 @@
 fun foo(a: String) {
     val b = a
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens1.kt

@@ -1,4 +1,5 @@
 // "Remove useless cast" "true"
 fun test() {
     ({ "" } as<caret> () -> String)
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens1.kt.after

@@ -1,4 +1,5 @@
 // "Remove useless cast" "true"
 fun test() {
     { "" }
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens2.kt

@@ -5,4 +5,5 @@ fun test() {
     foo()
     // comment
     ({ "" } as<caret> () -> String)
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens2.kt.after

@@ -5,4 +5,5 @@ fun test() {
     foo()
     // comment
     ({ "" })
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens3.kt

@@ -6,4 +6,5 @@ class A {
 fun test() {
     A().foo()
     ({ "" } as<caret> () -> String)
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens3.kt.after

@@ -6,4 +6,5 @@ class A {
 fun test() {
     A().foo()
     ({ "" })
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens4.kt

@@ -2,4 +2,5 @@
 fun test() {
     class A()
     ({ "" } as<caret> () -> String)
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens4.kt.after

@@ -2,4 +2,5 @@
 fun test() {
     class A()
     ({ "" })
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens5.kt

@@ -4,4 +4,5 @@ open class A
 fun test() {
     class B : A()
     ({ "" } as<caret> () -> String)
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens5.kt.after

@@ -4,4 +4,5 @@ open class A
 fun test() {
     class B : A()
     ({ "" })
-}
+}
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens6.kt

@@ -5,3 +5,5 @@ fun main() {
     foo();
     ({ "" } as<caret> () -> String)
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens6.kt.after

@@ -5,3 +5,5 @@ fun main() {
     foo();
     { "" }
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastInParens.kt

@@ -5,3 +5,5 @@ fun test(x: Any): Int {
     }
     return -1
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastInParens.kt.after

@@ -5,3 +5,5 @@ fun test(x: Any): Int {
     }
     return -1
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt

@@ -5,3 +5,5 @@ fun test(x: Any): String? {
     }
     return null
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt.after

@@ -5,3 +5,5 @@ fun test(x: Any): String? {
     }
     return null
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessIsCheck.kt

@@ -4,3 +4,5 @@ fun foo(a: String) {
 
     }
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessIsCheck.kt.after

@@ -4,3 +4,5 @@ fun foo(a: String) {
 
     }
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessIsCheckInWhen.kt

@@ -9,3 +9,5 @@ fun foo(bar: Base):Int {
         else -> 1
     }
 }
+
+/* IGNORE_FIR */

idea/testData/quickfix/expressions/removeUselessIsCheckInWhen.kt.after

@@ -8,3 +8,5 @@ fun foo(bar: Base):Int {
         else -> 42
     }
 }
+
+/* IGNORE_FIR */