From bd38363077c29cc7065c6329126da1cbd996b600 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 29 Mar 2021 13:35:48 +0200
Subject: [PATCH] FIR IDE: use IGNORE_FIR instead of FIR_COMPARISON in hl quick
 fix tests

To explicitly specify which test are failing
---
 .../kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt     | 4 ++--
 .../tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt      | 3 +++
 idea/testData/checker/regression/Jet53.kt                     | 1 -
 .../quickfix/abstract/abstractFunctionInNonAbstractClass.kt   | 1 -
 .../abstract/abstractFunctionInNonAbstractClass.kt.after      | 1 -
 idea/testData/quickfix/abstract/abstractFunctionWithBody.kt   | 2 ++
 .../quickfix/abstract/abstractFunctionWithBody.kt.after       | 2 ++
 idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt  | 2 ++
 .../quickfix/abstract/abstractFunctionWithBody2.kt.after      | 2 ++
 idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt  | 2 ++
 .../quickfix/abstract/abstractFunctionWithBody3.kt.after      | 2 ++
 .../quickfix/abstract/abstractFunctionWithBodyWithComments.kt | 2 ++
 .../abstract/abstractFunctionWithBodyWithComments.kt.after    | 2 ++
 .../abstract/abstractFunctionWithBodyWithComments2.kt         | 2 ++
 .../abstract/abstractFunctionWithBodyWithComments2.kt.after   | 2 ++
 .../quickfix/abstract/abstractPropertyInCompanionObject.kt    | 1 -
 .../quickfix/abstract/abstractPropertyInNonAbstractClass1.kt  | 1 -
 .../abstract/abstractPropertyInNonAbstractClass1.kt.after     | 1 -
 .../quickfix/abstract/abstractPropertyInNonAbstractClass2.kt  | 1 -
 .../abstract/abstractPropertyInNonAbstractClass2.kt.after     | 1 -
 .../quickfix/abstract/abstractPropertyInNonAbstractClass3.kt  | 1 -
 .../abstract/abstractPropertyInNonAbstractClass3.kt.after     | 1 -
 .../abstractPropertyInPrimaryConstructorParameters.kt         | 3 ++-
 .../abstractPropertyInPrimaryConstructorParameters.kt.after   | 3 ++-
 idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt | 3 ++-
 .../quickfix/abstract/abstractPropertyNotInClass.kt.after     | 3 ++-
 .../quickfix/abstract/abstractPropertyWIthInitializer2.kt     | 2 ++
 .../abstract/abstractPropertyWIthInitializer2.kt.after        | 2 ++
 .../quickfix/abstract/abstractPropertyWIthInitializer3.kt     | 2 ++
 .../abstract/abstractPropertyWIthInitializer3.kt.after        | 2 ++
 .../testData/quickfix/abstract/abstractPropertyWithGetter1.kt | 1 -
 .../quickfix/abstract/abstractPropertyWithGetter1.kt.after    | 1 -
 .../testData/quickfix/abstract/abstractPropertyWithGetter2.kt | 3 ++-
 .../quickfix/abstract/abstractPropertyWithGetter2.kt.after    | 3 ++-
 .../quickfix/abstract/abstractPropertyWithInitializer1.kt     | 1 -
 .../abstract/abstractPropertyWithInitializer1.kt.after        | 1 -
 idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt | 1 -
 .../quickfix/abstract/abstractPropertyWithSetter.kt.after     | 1 -
 idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt      | 1 -
 idea/testData/quickfix/abstract/makeInlineClassAbstract.kt    | 1 -
 idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt   | 1 -
 idea/testData/quickfix/abstract/makeTopLevelAbstract.kt       | 1 -
 idea/testData/quickfix/abstract/manyImpl.kt                   | 1 -
 .../quickfix/abstract/mustBeInitializedOrBeAbstract.kt        | 2 ++
 .../quickfix/abstract/mustBeInitializedOrBeAbstract.kt.after  | 2 ++
 .../abstract/mustBeInitializedOrBeAbstractInFinalClass.kt     | 2 ++
 .../mustBeInitializedOrBeAbstractInFinalClass.kt.after        | 2 ++
 .../abstract/mustBeInitializedOrBeAbstractInOpenClass.kt      | 2 ++
 .../mustBeInitializedOrBeAbstractInOpenClass.kt.after         | 2 ++
 .../abstract/mustBeInitializedOrBeAbstractInSealedClass.kt    | 1 -
 .../mustBeInitializedOrBeAbstractInSealedClass.kt.after       | 1 -
 .../quickfix/abstract/nonAbstractFunctionWithNoBody.kt        | 1 -
 .../quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after  | 1 -
 idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt  | 3 ++-
 .../quickfix/abstract/nonMemberAbstractFunction.kt.after      | 3 ++-
 idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt    | 2 ++
 .../quickfix/abstract/nonMemberFunctionNoBody.kt.after        | 2 ++
 idea/testData/quickfix/abstract/notImplementedMember.kt       | 2 ++
 idea/testData/quickfix/abstract/notImplementedMember.kt.after | 2 ++
 .../abstract/notImplementedMemberFromAbstractClass.kt         | 2 ++
 .../abstract/notImplementedMemberFromAbstractClass.kt.after   | 2 ++
 idea/testData/quickfix/abstract/replaceOpen.kt                | 1 -
 idea/testData/quickfix/abstract/replaceOpen.kt.after          | 1 -
 .../quickfix/expressions/fixNullableBinaryWithExclExcl.kt     | 3 ++-
 .../expressions/fixNullableBinaryWithExclExcl.kt.after        | 3 ++-
 .../quickfix/expressions/fixNullableInfixWithExclExcl.kt      | 3 ++-
 .../expressions/fixNullableInfixWithExclExcl.kt.after         | 3 ++-
 .../expressions/fixNullableIterableGenericWithExclExcl.kt     | 2 ++
 .../fixNullableIterableGenericWithExclExcl.kt.after           | 2 ++
 .../quickfix/expressions/fixNullableIterableWithExclExcl.kt   | 2 ++
 .../expressions/fixNullableIterableWithExclExcl.kt.after      | 2 ++
 .../quickfix/expressions/fixNullableUnaryWithExclExcl.kt      | 3 ++-
 .../expressions/fixNullableUnaryWithExclExcl.kt.after         | 3 ++-
 .../fixNullableWithExclExclAbsentWithBadIterator.kt           | 1 -
 .../expressions/fixNullableWithIteratorWithExclExcl.kt        | 2 ++
 .../expressions/fixNullableWithIteratorWithExclExcl.kt.after  | 2 ++
 idea/testData/quickfix/expressions/kt11594.kt                 | 3 ++-
 idea/testData/quickfix/expressions/kt11594.kt.after           | 3 ++-
 idea/testData/quickfix/expressions/removeUselessCast.kt       | 2 ++
 idea/testData/quickfix/expressions/removeUselessCast.kt.after | 2 ++
 .../expressions/removeUselessCastForLambdaInParens1.kt        | 3 ++-
 .../expressions/removeUselessCastForLambdaInParens1.kt.after  | 3 ++-
 .../expressions/removeUselessCastForLambdaInParens2.kt        | 3 ++-
 .../expressions/removeUselessCastForLambdaInParens2.kt.after  | 3 ++-
 .../expressions/removeUselessCastForLambdaInParens3.kt        | 3 ++-
 .../expressions/removeUselessCastForLambdaInParens3.kt.after  | 3 ++-
 .../expressions/removeUselessCastForLambdaInParens4.kt        | 3 ++-
 .../expressions/removeUselessCastForLambdaInParens4.kt.after  | 3 ++-
 .../expressions/removeUselessCastForLambdaInParens5.kt        | 3 ++-
 .../expressions/removeUselessCastForLambdaInParens5.kt.after  | 3 ++-
 .../expressions/removeUselessCastForLambdaInParens6.kt        | 2 ++
 .../expressions/removeUselessCastForLambdaInParens6.kt.after  | 2 ++
 .../quickfix/expressions/removeUselessCastInParens.kt         | 2 ++
 .../quickfix/expressions/removeUselessCastInParens.kt.after   | 2 ++
 .../quickfix/expressions/removeUselessCastUnderSmartCast.kt   | 2 ++
 .../expressions/removeUselessCastUnderSmartCast.kt.after      | 2 ++
 idea/testData/quickfix/expressions/removeUselessIsCheck.kt    | 2 ++
 .../quickfix/expressions/removeUselessIsCheck.kt.after        | 2 ++
 .../quickfix/expressions/removeUselessIsCheckInWhen.kt        | 2 ++
 .../quickfix/expressions/removeUselessIsCheckInWhen.kt.after  | 2 ++
 .../expressions/removeUselessIsCheckInWhenExpressionless.kt   | 3 ++-
 .../removeUselessIsCheckInWhenExpressionless.kt.after         | 3 ++-
 .../removeUselessIsCheckInWhenExpressionlessNegate.kt         | 3 ++-
 .../removeUselessIsCheckInWhenExpressionlessNegate.kt.after   | 3 ++-
 .../quickfix/expressions/removeUselessIsCheckInWhenNegate.kt  | 2 ++
 .../expressions/removeUselessIsCheckInWhenNegate.kt.after     | 2 ++
 .../quickfix/expressions/removeUselessIsCheckNegate.kt        | 2 ++
 .../quickfix/expressions/removeUselessIsCheckNegate.kt.after  | 2 ++
 .../quickfix/expressions/unnecessaryNonNullAssertion1.kt      | 2 ++
 .../expressions/unnecessaryNonNullAssertion1.kt.after         | 2 ++
 .../quickfix/expressions/unnecessaryNonNullAssertion2.kt      | 2 ++
 .../expressions/unnecessaryNonNullAssertion2.kt.after         | 2 ++
 .../quickfix/expressions/unnecessaryNonNullAssertion3.kt      | 2 ++
 .../expressions/unnecessaryNonNullAssertion3.kt.after         | 2 ++
 idea/testData/quickfix/expressions/unnecessarySafeCall1.kt    | 2 ++
 .../quickfix/expressions/unnecessarySafeCall1.kt.after        | 2 ++
 idea/testData/quickfix/expressions/unsafeCall1.kt             | 3 ++-
 idea/testData/quickfix/expressions/unsafeCall1.kt.after       | 3 ++-
 idea/testData/quickfix/expressions/unsafeCall2.kt             | 2 ++
 idea/testData/quickfix/expressions/unsafeCall2.kt.after       | 2 ++
 idea/testData/quickfix/expressions/unsafeCall3.kt             | 2 ++
 idea/testData/quickfix/expressions/unsafeCall3.kt.after       | 2 ++
 idea/testData/quickfix/expressions/unsafeCall4.kt             | 3 ++-
 idea/testData/quickfix/expressions/unsafeCall4.kt.after       | 3 ++-
 idea/testData/quickfix/expressions/unsafeCall5.kt             | 3 ++-
 idea/testData/quickfix/expressions/unsafeCall5.kt.after       | 3 ++-
 .../quickfix/expressions/uselessCastStaticAssertIsFine.kt     | 2 ++
 .../expressions/uselessCastStaticAssertIsFine.kt.after        | 2 ++
 idea/testData/quickfix/expressions/uselessElvis.kt            | 2 ++
 idea/testData/quickfix/expressions/uselessElvis.kt.after      | 2 ++
 idea/testData/quickfix/lateinit/nullable.kt                   | 3 ++-
 idea/testData/quickfix/lateinit/nullable.kt.after             | 3 ++-
 idea/testData/quickfix/lateinit/val.kt                        | 1 -
 idea/testData/quickfix/lateinit/val.kt.after                  | 1 -
 idea/testData/quickfix/lateinit/withGetter.kt                 | 3 ++-
 idea/testData/quickfix/lateinit/withGetter.kt.after           | 3 ++-
 idea/testData/quickfix/lateinit/withGetterSetter.kt           | 3 ++-
 idea/testData/quickfix/lateinit/withGetterSetter.kt.after     | 3 ++-
 idea/testData/quickfix/lateinit/withInitializer.kt            | 3 ++-
 idea/testData/quickfix/lateinit/withInitializer.kt.after      | 3 ++-
 idea/testData/quickfix/lateinit/withSetter.kt                 | 3 ++-
 idea/testData/quickfix/lateinit/withSetter.kt.after           | 3 ++-
 idea/testData/quickfix/modifiers/abstractModifierInEnum.kt    | 2 ++
 .../quickfix/modifiers/abstractModifierInEnum.kt.after        | 2 ++
 .../quickfix/modifiers/abstractVarWithPrivateSetter.kt        | 1 -
 .../quickfix/modifiers/abstractVarWithPrivateSetter.kt.after  | 1 -
 idea/testData/quickfix/modifiers/addLateinit.kt               | 3 ++-
 idea/testData/quickfix/modifiers/addLateinit.kt.after         | 3 ++-
 idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt | 1 -
 idea/testData/quickfix/modifiers/finalTrait.kt                | 3 ++-
 idea/testData/quickfix/modifiers/finalTrait.kt.after          | 3 ++-
 idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt    | 2 ++
 .../quickfix/modifiers/illegalEnumAnnotation1.kt.after        | 2 ++
 idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt    | 2 ++
 .../quickfix/modifiers/illegalEnumAnnotation2.kt.after        | 2 ++
 idea/testData/quickfix/modifiers/infixModifier.kt             | 3 ++-
 idea/testData/quickfix/modifiers/infixModifier.kt.after       | 3 ++-
 idea/testData/quickfix/modifiers/kt10409.kt                   | 2 ++
 idea/testData/quickfix/modifiers/kt10409.kt.after             | 2 ++
 idea/testData/quickfix/modifiers/nestedAbstractClass.kt       | 1 -
 idea/testData/quickfix/modifiers/nestedAbstractClass.kt.after | 1 -
 idea/testData/quickfix/modifiers/nestedAnnotationClass.kt     | 1 -
 idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt     | 1 -
 .../quickfix/modifiers/nestedClassNotAllowed.kt.after         | 1 -
 idea/testData/quickfix/modifiers/nestedDataClass.kt           | 1 -
 idea/testData/quickfix/modifiers/nestedEnumClass.kt           | 1 -
 idea/testData/quickfix/modifiers/nestedInterface.kt           | 1 -
 idea/testData/quickfix/modifiers/nestedObject.kt              | 1 -
 idea/testData/quickfix/modifiers/nestedSealedClass.kt         | 1 -
 .../quickfix/modifiers/noAbstractForAnonymousObject.kt        | 1 -
 idea/testData/quickfix/modifiers/noAbstractForObject.kt       | 1 -
 idea/testData/quickfix/modifiers/noLateinitOnNullable.kt      | 1 -
 idea/testData/quickfix/modifiers/noLateinitOnPrimitive.kt     | 1 -
 idea/testData/quickfix/modifiers/notAnAnnotationClass.kt      | 2 ++
 .../testData/quickfix/modifiers/notAnAnnotationClass.kt.after | 2 ++
 idea/testData/quickfix/modifiers/openCompanionObject.kt       | 3 ++-
 idea/testData/quickfix/modifiers/openCompanionObject.kt.after | 3 ++-
 idea/testData/quickfix/modifiers/openCompanionObject2.kt      | 3 ++-
 .../testData/quickfix/modifiers/openCompanionObject2.kt.after | 3 ++-
 idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt   | 1 -
 .../quickfix/modifiers/openMemberInFinalClass1.kt.after       | 1 -
 idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt   | 1 -
 .../quickfix/modifiers/openMemberInFinalClass2.kt.after       | 1 -
 idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt   | 1 -
 .../quickfix/modifiers/openMemberInFinalClass3.kt.after       | 1 -
 idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt   | 1 -
 .../quickfix/modifiers/openMemberInFinalClass4.kt.after       | 1 -
 idea/testData/quickfix/modifiers/openModifierInEnum.kt        | 2 ++
 idea/testData/quickfix/modifiers/openModifierInEnum.kt.after  | 2 ++
 idea/testData/quickfix/modifiers/openObject.kt                | 3 ++-
 idea/testData/quickfix/modifiers/openObject.kt.after          | 3 ++-
 idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt | 1 -
 .../quickfix/modifiers/openVarWithPrivateSetter1.kt.after     | 1 -
 idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt | 1 -
 .../quickfix/modifiers/openVarWithPrivateSetter2.kt.after     | 1 -
 idea/testData/quickfix/modifiers/operatorModifier.kt          | 2 ++
 idea/testData/quickfix/modifiers/operatorModifier.kt.after    | 2 ++
 .../testData/quickfix/modifiers/operatorModifierCollection.kt | 2 ++
 .../quickfix/modifiers/operatorModifierCollection.kt.after    | 2 ++
 idea/testData/quickfix/modifiers/operatorModifierComponent.kt | 2 ++
 .../quickfix/modifiers/operatorModifierComponent.kt.after     | 2 ++
 idea/testData/quickfix/modifiers/operatorModifierGet.kt       | 2 ++
 idea/testData/quickfix/modifiers/operatorModifierGet.kt.after | 2 ++
 idea/testData/quickfix/modifiers/operatorModifierInherited.kt | 2 ++
 .../quickfix/modifiers/operatorModifierInherited.kt.after     | 2 ++
 .../testData/quickfix/modifiers/overrideWithPrivateSetter1.kt | 1 -
 .../quickfix/modifiers/overrideWithPrivateSetter1.kt.after    | 1 -
 .../testData/quickfix/modifiers/overrideWithPrivateSetter2.kt | 1 -
 .../quickfix/modifiers/overrideWithPrivateSetter2.kt.after    | 1 -
 .../quickfix/modifiers/packageMemberCannotBeProtected.kt      | 2 ++
 .../modifiers/packageMemberCannotBeProtected.kt.after         | 2 ++
 idea/testData/quickfix/modifiers/redundantOpenInInterface.kt  | 1 -
 .../quickfix/modifiers/redundantOpenInInterface.kt.after      | 1 -
 idea/testData/quickfix/modifiers/removeAbstractModifier.kt    | 2 ++
 .../quickfix/modifiers/removeAbstractModifier.kt.after        | 2 ++
 idea/testData/quickfix/modifiers/removeConst.kt               | 3 ++-
 idea/testData/quickfix/modifiers/removeConst.kt.after         | 3 ++-
 idea/testData/quickfix/modifiers/removeExternalModifier.kt    | 3 ++-
 .../quickfix/modifiers/removeExternalModifier.kt.after        | 3 ++-
 .../testData/quickfix/modifiers/removeIncompatibleModifier.kt | 1 -
 .../quickfix/modifiers/removeIncompatibleModifier.kt.after    | 1 -
 .../testData/quickfix/modifiers/removeInnerForClassInTrait.kt | 2 ++
 .../quickfix/modifiers/removeInnerForClassInTrait.kt.after    | 2 ++
 .../modifiers/removeModifierFromForbiddenOperatorMod.kt       | 3 ++-
 .../modifiers/removeModifierFromForbiddenOperatorMod.kt.after | 3 ++-
 .../quickfix/modifiers/removeModifierFromOperatorMod.kt       | 3 ++-
 .../quickfix/modifiers/removeModifierFromOperatorMod.kt.after | 3 ++-
 .../quickfix/modifiers/removeModifierFromOperatorModAssign.kt | 3 ++-
 .../modifiers/removeModifierFromOperatorModAssign.kt.after    | 3 ++-
 idea/testData/quickfix/modifiers/removeProtectedModifier.kt   | 1 -
 .../quickfix/modifiers/removeProtectedModifier.kt.after       | 1 -
 idea/testData/quickfix/modifiers/removeRedundantModifier1.kt  | 1 -
 .../quickfix/modifiers/removeRedundantModifier1.kt.after      | 1 -
 idea/testData/quickfix/modifiers/removeRedundantModifier2.kt  | 1 -
 .../quickfix/modifiers/removeRedundantModifier2.kt.after      | 1 -
 idea/testData/quickfix/modifiers/removeRedundantModifier3.kt  | 1 -
 .../quickfix/modifiers/removeRedundantModifier3.kt.after      | 1 -
 idea/testData/quickfix/modifiers/removeSupertype1.kt          | 2 ++
 idea/testData/quickfix/modifiers/removeSupertype1.kt.after    | 2 ++
 idea/testData/quickfix/modifiers/removeSupertype2.kt          | 2 ++
 idea/testData/quickfix/modifiers/removeSupertype2.kt.after    | 2 ++
 idea/testData/quickfix/modifiers/removeSupertype3.kt          | 2 ++
 idea/testData/quickfix/modifiers/removeSupertype3.kt.after    | 2 ++
 idea/testData/quickfix/modifiers/removeSupertype4.kt          | 2 ++
 idea/testData/quickfix/modifiers/removeSupertype4.kt.after    | 2 ++
 idea/testData/quickfix/modifiers/visibilityModifer1.kt        | 2 ++
 idea/testData/quickfix/modifiers/visibilityModifer1.kt.after  | 2 ++
 idea/testData/quickfix/modifiers/visibilityModifer2.kt        | 2 ++
 idea/testData/quickfix/modifiers/visibilityModifer2.kt.after  | 2 ++
 .../modifiers/visibilityModiferOverrideJavaRuntime.kt         | 2 ++
 .../modifiers/visibilityModiferOverrideJavaRuntime.kt.after   | 2 ++
 .../testData/quickfix/modifiers/visibilityModiferParameter.kt | 3 ++-
 .../quickfix/modifiers/visibilityModiferParameter.kt.after    | 3 ++-
 .../quickfix/modifiers/withAnnotationAndBlockComment.kt       | 3 ++-
 .../quickfix/modifiers/withAnnotationAndBlockComment.kt.after | 3 ++-
 .../quickfix/modifiers/withAnnotationAndEolComment.kt         | 3 ++-
 .../quickfix/modifiers/withAnnotationAndEolComment.kt.after   | 3 ++-
 .../quickfix/modifiers/withAnnotationAndEolComment2.kt        | 3 ++-
 .../quickfix/modifiers/withAnnotationAndEolComment2.kt.after  | 3 ++-
 .../quickfix/modifiers/withAnnotationAndEolComment3.kt        | 3 ++-
 .../quickfix/modifiers/withAnnotationAndEolComment3.kt.after  | 3 ++-
 .../cantChangeMultipleOverriddenPropertiesTypes.kt            | 1 -
 ...ntChangeOverriddenPropertyTypeToMatchOverridingProperty.kt | 1 -
 .../cantChangePropertyTypeToMatchOverridenProperties.kt       | 1 -
 .../cantChangeReturnTypeOfOverriddenFunction.kt               | 1 -
 .../typeMismatchOnOverride/changeOverriddenPropertyType1.kt   | 1 -
 .../changeOverriddenPropertyType1.kt.after                    | 1 -
 .../typeMismatchOnOverride/changeOverriddenPropertyType2.kt   | 1 -
 .../changeOverriddenPropertyType2.kt.after                    | 1 -
 .../changeOverriddenPropertyTypeFromCtorParameter.kt          | 1 -
 .../changeOverriddenPropertyTypeFromCtorParameter.kt.after    | 1 -
 .../changeOverridingCtorParameterType.kt                      | 1 -
 .../changeOverridingCtorParameterType.kt.after                | 1 -
 .../changeOverridingPropertyTypeToFunctionType.kt             | 1 -
 .../changeOverridingPropertyTypeToFunctionType.kt.after       | 1 -
 .../changeReturnTypeOfOverriddenFunction.kt                   | 1 -
 .../changeReturnTypeOfOverriddenFunction.kt.after             | 1 -
 .../namedFunctionReturnOverrideInsideVariableInitializer.kt   | 2 ++
 ...edFunctionReturnOverrideInsideVariableInitializer.kt.after | 2 ++
 .../override/typeMismatchOnOverride/objectInsideBody.kt       | 3 ++-
 .../override/typeMismatchOnOverride/objectInsideBody.kt.after | 3 ++-
 .../propertyReturnTypeMismatchOnOverride.kt                   | 1 -
 .../propertyReturnTypeMismatchOnOverride.kt.after             | 1 -
 .../propertyTypeMismatchOnOverrideIntLong.kt                  | 1 -
 .../propertyTypeMismatchOnOverrideIntLong.kt.after            | 1 -
 .../propertyTypeMismatchOnOverrideIntUnit.kt                  | 2 ++
 .../propertyTypeMismatchOnOverrideIntUnit.kt.after            | 2 ++
 .../returnTypeMismatchOnMultipleOverride.kt                   | 1 -
 .../returnTypeMismatchOnMultipleOverride.kt.after             | 1 -
 .../returnTypeMismatchOnMultipleOverrideAmbiguity.kt          | 1 -
 .../returnTypeMismatchOnOverrideIntLong.kt                    | 1 -
 .../returnTypeMismatchOnOverrideIntLong.kt.after              | 1 -
 .../returnTypeMismatchOnOverrideIntUnit.kt                    | 1 -
 .../returnTypeMismatchOnOverrideIntUnit.kt.after              | 1 -
 .../returnTypeMismatchOnOverrideUnitInt.kt                    | 1 -
 .../returnTypeMismatchOnOverrideUnitInt.kt.after              | 1 -
 idea/testData/quickfix/replaceWithSafeCall/apply.kt           | 1 -
 idea/testData/quickfix/replaceWithSafeCall/apply.kt.after     | 1 -
 .../replaceWithSafeCall/applyWithImplicitParameter.kt         | 1 -
 .../replaceWithSafeCall/applyWithImplicitParameter.kt.after   | 1 -
 .../applyWithImplicitParameterFunctionCall.kt                 | 3 ++-
 .../applyWithImplicitParameterFunctionCall.kt.after           | 3 ++-
 idea/testData/quickfix/replaceWithSafeCall/assignment.kt      | 1 -
 .../testData/quickfix/replaceWithSafeCall/assignment.kt.after | 1 -
 .../replaceWithSafeCall/assignmentFromImplicitParameter.kt    | 1 -
 .../assignmentFromImplicitParameter.kt.after                  | 1 -
 .../quickfix/replaceWithSafeCall/assignmentToNullable.kt      | 1 -
 .../replaceWithSafeCall/assignmentToNullable.kt.after         | 1 -
 .../quickfix/replaceWithSafeCall/assignmentToProperty.kt      | 1 -
 .../replaceWithSafeCall/assignmentToProperty.kt.after         | 1 -
 .../assignmentToPropertyWithNoExplicitType.kt                 | 1 -
 .../assignmentToPropertyWithNoExplicitType.kt.after           | 1 -
 .../assignmentToPropertyWithNoExplicitType.kt.fir.after       | 1 -
 idea/testData/quickfix/replaceWithSafeCall/comment.kt         | 1 -
 idea/testData/quickfix/replaceWithSafeCall/comment.kt.after   | 1 -
 .../quickfix/replaceWithSafeCall/comment.kt.fir.after         | 1 -
 idea/testData/quickfix/replaceWithSafeCall/expression.kt      | 1 -
 .../testData/quickfix/replaceWithSafeCall/expression.kt.after | 1 -
 idea/testData/quickfix/replaceWithSafeCall/extFunction.kt     | 3 ++-
 .../quickfix/replaceWithSafeCall/extFunction.kt.after         | 3 ++-
 idea/testData/quickfix/replaceWithSafeCall/functionCall.kt    | 3 ++-
 .../quickfix/replaceWithSafeCall/functionCall.kt.after        | 3 ++-
 .../quickfix/replaceWithSafeCall/functionExpressionBody.kt    | 1 -
 .../replaceWithSafeCall/functionExpressionBody.kt.after       | 1 -
 .../replaceWithSafeCall/functionExpressionBody.kt.fir.after   | 1 -
 .../functionExpressionBodyWithNoExplicitType.kt               | 1 -
 .../functionExpressionBodyWithNoExplicitType.kt.after         | 1 -
 .../functionExpressionBodyWithNoExplicitType.kt.fir.after     | 1 -
 idea/testData/quickfix/replaceWithSafeCall/hasElvis.kt        | 1 -
 idea/testData/quickfix/replaceWithSafeCall/hasElvis.kt.after  | 1 -
 idea/testData/quickfix/replaceWithSafeCall/hasElvis2.kt       | 1 -
 idea/testData/quickfix/replaceWithSafeCall/hasElvis2.kt.after | 1 -
 idea/testData/quickfix/replaceWithSafeCall/invokeOperator.kt  | 3 ++-
 .../quickfix/replaceWithSafeCall/invokeOperator.kt.after      | 3 ++-
 idea/testData/quickfix/replaceWithSafeCall/let.kt             | 1 -
 idea/testData/quickfix/replaceWithSafeCall/let.kt.after       | 1 -
 .../testData/quickfix/replaceWithSafeCall/letWithParameter.kt | 1 -
 .../quickfix/replaceWithSafeCall/letWithParameter.kt.after    | 1 -
 idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt       | 1 -
 idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt.after | 1 -
 .../quickfix/replaceWithSafeCall/lineBreak.kt.fir.after       | 1 -
 .../noReplaceWithSafeCallForImplicitReceiver.kt               | 1 -
 idea/testData/quickfix/replaceWithSafeCall/normal.kt          | 1 -
 idea/testData/quickfix/replaceWithSafeCall/normal.kt.after    | 1 -
 .../quickfix/variables/changeMutability/canBeVal/const.kt     | 1 -
 .../variables/changeMutability/canBeVal/const.kt.after        | 1 -
 .../variables/changeMutability/canBeVal/delegatedProperty.kt  | 3 ++-
 .../changeMutability/canBeVal/delegatedProperty.kt.after      | 3 ++-
 .../variables/changeMutability/canBeVal/delegatedProperty2.kt | 1 -
 .../variables/changeMutability/canBeVal/delegatedProperty3.kt | 1 -
 .../variables/changeMutability/canBeVal/multiVariable.kt      | 3 ++-
 .../changeMutability/canBeVal/multiVariable.kt.after          | 3 ++-
 .../variables/changeMutability/canBeVal/singleVariable.kt     | 3 ++-
 .../changeMutability/canBeVal/singleVariable.kt.after         | 3 ++-
 .../changeMutability/canBeVal/uninitializedWithGetter.kt      | 2 +-
 .../canBeVal/uninitializedWithGetter.kt.after                 | 2 +-
 .../changeMutability/canBeVal/uninitializedWithGetter2.kt     | 1 -
 .../canBeVal/uninitializedWithGetter2.kt.after                | 1 -
 .../changeMutability/canBeVal/uninitializedWithGetter3.kt     | 1 -
 .../changeMutability/capturedMemberValInitialization.kt       | 3 ++-
 .../changeMutability/capturedMemberValInitialization.kt.after | 3 ++-
 .../variables/changeMutability/capturedValInitialization.kt   | 2 ++
 .../changeMutability/capturedValInitialization.kt.after       | 2 ++
 idea/testData/quickfix/variables/changeMutability/const.kt    | 3 ++-
 .../quickfix/variables/changeMutability/const.kt.after        | 3 ++-
 .../quickfix/variables/changeMutability/funParameter.kt       | 1 -
 .../quickfix/variables/changeMutability/localInGetter.kt      | 3 ++-
 .../variables/changeMutability/localInGetter.kt.after         | 3 ++-
 .../quickfix/variables/changeMutability/valOverrideVar.kt     | 1 -
 .../variables/changeMutability/valOverrideVar.kt.after        | 1 -
 .../changeMutability/valOverrideVarConstructorParameter.kt    | 1 -
 .../valOverrideVarConstructorParameter.kt.after               | 1 -
 .../variables/changeMutability/valReassignmentLocal.kt        | 2 ++
 .../variables/changeMutability/valReassignmentLocal.kt.after  | 2 ++
 .../variables/changeMutability/valReassignmentOuterDecl.kt    | 2 ++
 .../changeMutability/valReassignmentOuterDecl.kt.after        | 2 ++
 .../variables/changeMutability/valReassignmentProperty.kt     | 2 ++
 .../changeMutability/valReassignmentProperty.kt.after         | 2 ++
 .../valReassignmentPropertyConstructorParameter.kt            | 2 ++
 .../valReassignmentPropertyConstructorParameter.kt.after      | 2 ++
 .../quickfix/variables/changeMutability/valWithSetter.kt      | 1 -
 .../variables/changeMutability/valWithSetter.kt.after         | 1 -
 .../variables/changeMutability/varAnnotationParameter.kt      | 1 -
 .../changeMutability/varAnnotationParameter.kt.after          | 1 -
 384 files changed, 447 insertions(+), 264 deletions(-)

diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt
index 61a728fa05d..2fdd4f3b558 100644
--- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt
+++ b/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")
         ) {
diff --git a/idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt b/idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt
index 398624fa5be..7a889b651b0 100644
--- a/idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt
+++ b/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"
     }
diff --git a/idea/testData/checker/regression/Jet53.kt b/idea/testData/checker/regression/Jet53.kt
index 985de058084..e7a7f0c8db9 100644
--- a/idea/testData/checker/regression/Jet53.kt
+++ b/idea/testData/checker/regression/Jet53.kt
@@ -1,4 +1,3 @@
-// FIR_IDENTICAL
 import java.util.Collections
 
 fun <T> checkSubtype(t: T) = t
diff --git a/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt b/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt
index f596c528519..28353b1fff9 100644
--- a/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt
+++ b/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt
@@ -2,4 +2,3 @@
 class A() {
     <caret>abstract fun foo() {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt.after b/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt.after
index 6701f9c8659..edc2ca91704 100644
--- a/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt.after
+++ b/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt.after
@@ -2,4 +2,3 @@
 class A() {
     fun foo() {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractFunctionWithBody.kt b/idea/testData/quickfix/abstract/abstractFunctionWithBody.kt
index 0d0d468f1a0..19d80291b37 100644
--- a/idea/testData/quickfix/abstract/abstractFunctionWithBody.kt
+++ b/idea/testData/quickfix/abstract/abstractFunctionWithBody.kt
@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo() {}
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractFunctionWithBody.kt.after b/idea/testData/quickfix/abstract/abstractFunctionWithBody.kt.after
index f2086d5f409..cbce6456512 100644
--- a/idea/testData/quickfix/abstract/abstractFunctionWithBody.kt.after
+++ b/idea/testData/quickfix/abstract/abstractFunctionWithBody.kt.after
@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo()
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt b/idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt
index 70a03c43058..5758dec5634 100644
--- a/idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt
+++ b/idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt
@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo() : Any { return "a" }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt.after b/idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt.after
index 1712a56945f..3a03846b685 100644
--- a/idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt.after
+++ b/idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt.after
@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo() : Any
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt b/idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt
index f15fe523b9c..c803d15f862 100644
--- a/idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt
+++ b/idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt
@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo() : Any = 1
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt.after b/idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt.after
index 1712a56945f..3a03846b685 100644
--- a/idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt.after
+++ b/idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt.after
@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo() : Any
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt b/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt
index b0c93f60fd5..58ac318c7df 100644
--- a/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt
+++ b/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt
@@ -4,3 +4,5 @@ abstract class A() {
         // 3
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt.after b/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt.after
index bd4e0f8f427..10d4da72d8c 100644
--- a/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt.after
+++ b/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt.after
@@ -2,3 +2,5 @@
 abstract class A() {
     <caret>abstract fun foo() /*1*/
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt b/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt
index 27eb6f12a58..31bbbbe9c87 100644
--- a/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt
+++ b/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt
@@ -3,3 +3,5 @@ abstract class A() {
     <caret>abstract fun foo() = /*1*/
             { "" /*2*/ } // 3
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt.after b/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt.after
index d8abe132fd4..b5cbb23f0a9 100644
--- a/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt.after
+++ b/idea/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt.after
@@ -3,3 +3,5 @@ abstract class A() {
     /*1*/
     abstract fun foo()  // 3
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyInCompanionObject.kt b/idea/testData/quickfix/abstract/abstractPropertyInCompanionObject.kt
index 332f3655469..e7080e3dbf9 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyInCompanionObject.kt
+++ b/idea/testData/quickfix/abstract/abstractPropertyInCompanionObject.kt
@@ -8,4 +8,3 @@ class Owner {
         <caret>abstract val x: Int
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt
index a47f5f7ad4d..0b4e86bfe1e 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt
+++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt
@@ -2,4 +2,3 @@
 class A() {
     <caret>abstract var i : Int
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after
index bb4b5b405bb..d847caf85e2 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after
+++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after
@@ -2,4 +2,3 @@
 abstract class A() {
     <caret>abstract var i : Int
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt
index 48d5285c98f..cdb5a47b594 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt
+++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt
@@ -2,4 +2,3 @@
 class A() {
     <caret>abstract var i : Int = 0
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt.after b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt.after
index 68e8cc772cd..773ad489ec7 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt.after
+++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt.after
@@ -2,4 +2,3 @@
 class A() {
     var i : Int = 0
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt
index 72926fc3369..ca64a4e54b0 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt
+++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt
@@ -2,4 +2,3 @@
 public class A() {
     <caret>abstract var i : Int
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after
index 02dcf43e416..6ae6136242b 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after
+++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after
@@ -2,4 +2,3 @@
 public abstract class A() {
     <caret>abstract var i : Int
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt b/idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt
index cfb081250c7..67d493fc0b3 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt
+++ b/idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt
@@ -1,2 +1,3 @@
 // "Make 'i' not abstract" "true"
-class A(<caret>abstract val i: Int) {}
\ No newline at end of file
+class A(<caret>abstract val i: Int) {}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt.after b/idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt.after
index 8bb9648d6fa..17ef7cc1936 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt.after
+++ b/idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt.after
@@ -1,2 +1,3 @@
 // "Make 'i' not abstract" "true"
-class A(<caret>val i: Int) {}
\ No newline at end of file
+class A(<caret>val i: Int) {}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt b/idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt
index 0355005d55c..8d3bf32bdf0 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt
+++ b/idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt
@@ -1,2 +1,3 @@
 // "Make 'i' not abstract" "true"
-<caret>abstract val i: Int = 1
\ No newline at end of file
+<caret>abstract val i: Int = 1
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt.after b/idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt.after
index d4db626ee31..eeb7fc54d1a 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt.after
+++ b/idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt.after
@@ -1,2 +1,3 @@
 // "Make 'i' not abstract" "true"
-<caret>val i: Int = 1
\ No newline at end of file
+<caret>val i: Int = 1
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt b/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt
index bfd6c3ad884..8e807d7c156 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt
+++ b/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt
@@ -2,3 +2,5 @@
 abstract class A {
     abstract var i = 0<caret>
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt.after b/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt.after
index b0d71d4c919..9f5892e15e8 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt.after
+++ b/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt.after
@@ -2,3 +2,5 @@
 abstract class A {
     abstract var i: Int
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt b/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt
index 1cfb78a0ed2..0178913bdf5 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt
+++ b/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt
@@ -2,3 +2,5 @@
 abstract class A {
     abstract var i : Int = 0<caret>
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt.after b/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt.after
index 29135db44b4..06e3e4fabd4 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt.after
+++ b/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt.after
@@ -2,3 +2,5 @@
 abstract class A {
     abstract var i: Int<caret>
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt
index 67b8f784138..d276aeb5715 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt
+++ b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt
@@ -3,4 +3,3 @@ class B {
     <caret>abstract val i: Int = 0
         get() = field
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after
index 814fcd8df0f..95bdf7a46a5 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after
+++ b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after
@@ -3,4 +3,3 @@ class B {
     val i: Int = 0
         get() = field
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt b/idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt
index 9ebc33d5215..b926f7264dc 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt
+++ b/idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt
@@ -2,4 +2,5 @@
 abstract class B {
     abstract val i = <caret>0
         get() = field
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt.after b/idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt.after
index 1269746cdab..b7b8219ddd7 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt.after
+++ b/idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt.after
@@ -2,4 +2,5 @@
 abstract class B {
     abstract val i: Int<caret>
 
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt b/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt
index ad44fc325c8..c56a70cde06 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt
+++ b/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt
@@ -2,4 +2,3 @@
 class A {
     <caret>abstract var i = 0
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt.after b/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt.after
index 742e0d21e94..01d5197a882 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt.after
+++ b/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt.after
@@ -2,4 +2,3 @@
 class A {
     <caret>var i = 0
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt b/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt
index ddfd942e895..cdfb4051f39 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt
+++ b/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt
@@ -3,4 +3,3 @@ class B {
     abstract<caret> var j: Int = 0
         set(v: Int) {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt.after b/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt.after
index f7bf68969b2..cd83c943c58 100644
--- a/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt.after
+++ b/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt.after
@@ -3,4 +3,3 @@ class B {
     var j: Int = 0
         set(v: Int) {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt b/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt
index 580b039f070..283b5036fc2 100644
--- a/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt
+++ b/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt
@@ -7,4 +7,3 @@ enum class E {
 
     abstract fun foo()
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/makeInlineClassAbstract.kt b/idea/testData/quickfix/abstract/makeInlineClassAbstract.kt
index 00c00b07821..526b1087f90 100644
--- a/idea/testData/quickfix/abstract/makeInlineClassAbstract.kt
+++ b/idea/testData/quickfix/abstract/makeInlineClassAbstract.kt
@@ -10,4 +10,3 @@ interface I {
 }
 
 inline class A<caret> : I
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt b/idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt
index 9ae6e1bf3d8..13497895750 100644
--- a/idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt
+++ b/idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt
@@ -8,4 +8,3 @@
 object O {
     <caret>fun foo()
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/makeTopLevelAbstract.kt b/idea/testData/quickfix/abstract/makeTopLevelAbstract.kt
index fcf4ea00a7a..51dc6c4b57e 100644
--- a/idea/testData/quickfix/abstract/makeTopLevelAbstract.kt
+++ b/idea/testData/quickfix/abstract/makeTopLevelAbstract.kt
@@ -6,4 +6,3 @@
 // ERROR: Function 'foo' must have a body
 
 <caret>fun foo()
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/manyImpl.kt b/idea/testData/quickfix/abstract/manyImpl.kt
index b8141607861..09d33ff85b1 100644
--- a/idea/testData/quickfix/abstract/manyImpl.kt
+++ b/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 */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt
index 1e580e0c92b..7086a2cf84c 100644
--- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt
+++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt
@@ -2,3 +2,5 @@
 abstract class A() {
     var <caret>i : Int
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt.after b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt.after
index 4f5c47a4130..b7b7f592a97 100644
--- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt.after
+++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt.after
@@ -2,3 +2,5 @@
 abstract class A() {
     abstract var <caret>i : Int
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt
index 41e9d0c07e5..8dc4c132ab9 100644
--- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt
+++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt
@@ -2,3 +2,5 @@
 class A() {
     var <caret>i : Int
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt.after b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt.after
index 4f5c47a4130..b7b7f592a97 100644
--- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt.after
+++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInFinalClass.kt.after
@@ -2,3 +2,5 @@
 abstract class A() {
     abstract var <caret>i : Int
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt
index 9e70f1c1528..e3182c60c06 100644
--- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt
+++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt
@@ -2,3 +2,5 @@
 open class A() {
     var <caret>i : Int
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt.after b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt.after
index 4f5c47a4130..b7b7f592a97 100644
--- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt.after
+++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInOpenClass.kt.after
@@ -2,3 +2,5 @@
 abstract class A() {
     abstract var <caret>i : Int
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt
index e65dad7f76b..acde93f0824 100644
--- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt
+++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt
@@ -2,4 +2,3 @@
 sealed class A() {
     fun <caret>i() : Int
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt.after b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt.after
index d008cc348e8..f80634358e0 100644
--- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt.after
+++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt.after
@@ -2,4 +2,3 @@
 sealed class A() {
     abstract fun <caret>i() : Int
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt b/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt
index 7f2ce6a007d..0e070005a49 100644
--- a/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt
+++ b/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt
@@ -2,4 +2,3 @@
 class A() {
     fun <caret>foo()
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after b/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after
index ed303785cb1..59958ef927e 100644
--- a/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after
+++ b/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after
@@ -2,4 +2,3 @@
 class A() {
     fun <caret>foo() {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt b/idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt
index b6144cefffc..cd51bdd35d5 100644
--- a/idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt
+++ b/idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt
@@ -1,2 +1,3 @@
 // "Make 'foo' not abstract" "true"
-<caret>abstract fun foo() {}
\ No newline at end of file
+<caret>abstract fun foo() {}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt.after b/idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt.after
index 6ed7d9ab2d9..815769f1446 100644
--- a/idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt.after
+++ b/idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt.after
@@ -1,2 +1,3 @@
 // "Make 'foo' not abstract" "true"
-fun foo() {}
\ No newline at end of file
+fun foo() {}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt b/idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt
index 6847c5912ad..0e52ec0679d 100644
--- a/idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt
+++ b/idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt
@@ -1,2 +1,4 @@
 // "Add function body" "true"
 fun <caret>foo()
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt.after b/idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt.after
index 6a650abbcbf..7f2a5711c41 100644
--- a/idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt.after
+++ b/idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt.after
@@ -1,2 +1,4 @@
 // "Add function body" "true"
 fun foo() {}
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/notImplementedMember.kt b/idea/testData/quickfix/abstract/notImplementedMember.kt
index 2bc93859e0a..2b2b640657d 100644
--- a/idea/testData/quickfix/abstract/notImplementedMember.kt
+++ b/idea/testData/quickfix/abstract/notImplementedMember.kt
@@ -5,3 +5,5 @@ interface I {
 
 <caret>class A : I {
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/notImplementedMember.kt.after b/idea/testData/quickfix/abstract/notImplementedMember.kt.after
index 85bac3999b8..c9648d83f48 100644
--- a/idea/testData/quickfix/abstract/notImplementedMember.kt.after
+++ b/idea/testData/quickfix/abstract/notImplementedMember.kt.after
@@ -5,3 +5,5 @@ interface I {
 
 abstract class A : I {
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt b/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt
index 270fac78b6d..47d9e924d39 100644
--- a/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt
+++ b/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt
@@ -5,3 +5,5 @@ abstract class A {
 
 <caret>class B : A() {
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after b/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after
index c62f1f13e37..2aa314a6f3d 100644
--- a/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after
+++ b/idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after
@@ -5,3 +5,5 @@ abstract class A {
 
 abstract class B : A() {
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/replaceOpen.kt b/idea/testData/quickfix/abstract/replaceOpen.kt
index 8d7828c66d9..13f21216b92 100644
--- a/idea/testData/quickfix/abstract/replaceOpen.kt
+++ b/idea/testData/quickfix/abstract/replaceOpen.kt
@@ -2,4 +2,3 @@
 abstract class B() {
     open fun <caret>foo()
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/replaceOpen.kt.after b/idea/testData/quickfix/abstract/replaceOpen.kt.after
index 5bb50aaa194..6f9b5323658 100644
--- a/idea/testData/quickfix/abstract/replaceOpen.kt.after
+++ b/idea/testData/quickfix/abstract/replaceOpen.kt.after
@@ -2,4 +2,3 @@
 abstract class B() {
     abstract fun <caret>foo()
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/fixNullableBinaryWithExclExcl.kt b/idea/testData/quickfix/expressions/fixNullableBinaryWithExclExcl.kt
index 954602f2570..92b0ed56fb8 100644
--- a/idea/testData/quickfix/expressions/fixNullableBinaryWithExclExcl.kt
+++ b/idea/testData/quickfix/expressions/fixNullableBinaryWithExclExcl.kt
@@ -6,4 +6,5 @@ class SafeType {
 
 fun safeB(p: SafeType?) {
     val v = p <caret>+ 42
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/fixNullableBinaryWithExclExcl.kt.after b/idea/testData/quickfix/expressions/fixNullableBinaryWithExclExcl.kt.after
index b043b8cefb6..73701431d53 100644
--- a/idea/testData/quickfix/expressions/fixNullableBinaryWithExclExcl.kt.after
+++ b/idea/testData/quickfix/expressions/fixNullableBinaryWithExclExcl.kt.after
@@ -6,4 +6,5 @@ class SafeType {
 
 fun safeB(p: SafeType?) {
     val v = p!! + 42
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/fixNullableInfixWithExclExcl.kt b/idea/testData/quickfix/expressions/fixNullableInfixWithExclExcl.kt
index 91a68a295c1..024da4d5ca6 100644
--- a/idea/testData/quickfix/expressions/fixNullableInfixWithExclExcl.kt
+++ b/idea/testData/quickfix/expressions/fixNullableInfixWithExclExcl.kt
@@ -6,4 +6,5 @@ class SafeType {
 
 fun safeB(p: SafeType?) {
     val v = p <caret>op 42
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/fixNullableInfixWithExclExcl.kt.after b/idea/testData/quickfix/expressions/fixNullableInfixWithExclExcl.kt.after
index 72f9f0b990e..67b5bcbddfb 100644
--- a/idea/testData/quickfix/expressions/fixNullableInfixWithExclExcl.kt.after
+++ b/idea/testData/quickfix/expressions/fixNullableInfixWithExclExcl.kt.after
@@ -6,4 +6,5 @@ class SafeType {
 
 fun safeB(p: SafeType?) {
     val v = p!! op 42
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/fixNullableIterableGenericWithExclExcl.kt b/idea/testData/quickfix/expressions/fixNullableIterableGenericWithExclExcl.kt
index f2fdadec041..d50d7f1699e 100644
--- a/idea/testData/quickfix/expressions/fixNullableIterableGenericWithExclExcl.kt
+++ b/idea/testData/quickfix/expressions/fixNullableIterableGenericWithExclExcl.kt
@@ -2,3 +2,5 @@
 fun <T: Collection<Int>?> foo(c: T) {
     for (i in <caret>c) { }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/fixNullableIterableGenericWithExclExcl.kt.after b/idea/testData/quickfix/expressions/fixNullableIterableGenericWithExclExcl.kt.after
index 055b350994d..397093c3d02 100644
--- a/idea/testData/quickfix/expressions/fixNullableIterableGenericWithExclExcl.kt.after
+++ b/idea/testData/quickfix/expressions/fixNullableIterableGenericWithExclExcl.kt.after
@@ -2,3 +2,5 @@
 fun <T: Collection<Int>?> foo(c: T) {
     for (i in c!!) { }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/fixNullableIterableWithExclExcl.kt b/idea/testData/quickfix/expressions/fixNullableIterableWithExclExcl.kt
index 81300ec1baf..a545177a312 100644
--- a/idea/testData/quickfix/expressions/fixNullableIterableWithExclExcl.kt
+++ b/idea/testData/quickfix/expressions/fixNullableIterableWithExclExcl.kt
@@ -3,3 +3,5 @@ fun foo() {
     val test : Collection<Int>? = null!!
     for (i in <caret>test) { }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/fixNullableIterableWithExclExcl.kt.after b/idea/testData/quickfix/expressions/fixNullableIterableWithExclExcl.kt.after
index 8f04def8148..180c3fb10bf 100644
--- a/idea/testData/quickfix/expressions/fixNullableIterableWithExclExcl.kt.after
+++ b/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 */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/fixNullableUnaryWithExclExcl.kt b/idea/testData/quickfix/expressions/fixNullableUnaryWithExclExcl.kt
index 6c2c3833c58..45628cb31ed 100644
--- a/idea/testData/quickfix/expressions/fixNullableUnaryWithExclExcl.kt
+++ b/idea/testData/quickfix/expressions/fixNullableUnaryWithExclExcl.kt
@@ -6,4 +6,5 @@ class SafeType {
 
 fun safeB(p: SafeType?) {
     val v = <caret>-p
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/fixNullableUnaryWithExclExcl.kt.after b/idea/testData/quickfix/expressions/fixNullableUnaryWithExclExcl.kt.after
index e426a49017e..d0cf0abdd92 100644
--- a/idea/testData/quickfix/expressions/fixNullableUnaryWithExclExcl.kt.after
+++ b/idea/testData/quickfix/expressions/fixNullableUnaryWithExclExcl.kt.after
@@ -6,4 +6,5 @@ class SafeType {
 
 fun safeB(p: SafeType?) {
     val v = -p!!
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/fixNullableWithExclExclAbsentWithBadIterator.kt b/idea/testData/quickfix/expressions/fixNullableWithExclExclAbsentWithBadIterator.kt
index f161cdc73ab..1fe4c8366b0 100644
--- a/idea/testData/quickfix/expressions/fixNullableWithExclExclAbsentWithBadIterator.kt
+++ b/idea/testData/quickfix/expressions/fixNullableWithExclExclAbsentWithBadIterator.kt
@@ -11,4 +11,3 @@ fun foo() {
     val test: Some? = Some()
     for (i in <caret>test) { }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/fixNullableWithIteratorWithExclExcl.kt b/idea/testData/quickfix/expressions/fixNullableWithIteratorWithExclExcl.kt
index 217cce1350a..0505fe32c19 100644
--- a/idea/testData/quickfix/expressions/fixNullableWithIteratorWithExclExcl.kt
+++ b/idea/testData/quickfix/expressions/fixNullableWithIteratorWithExclExcl.kt
@@ -7,3 +7,5 @@ fun foo() {
     val test: Some? = Some()
     for (i in <caret>test) { }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/fixNullableWithIteratorWithExclExcl.kt.after b/idea/testData/quickfix/expressions/fixNullableWithIteratorWithExclExcl.kt.after
index 68e9b442fa3..961c3bf2814 100644
--- a/idea/testData/quickfix/expressions/fixNullableWithIteratorWithExclExcl.kt.after
+++ b/idea/testData/quickfix/expressions/fixNullableWithIteratorWithExclExcl.kt.after
@@ -7,3 +7,5 @@ fun foo() {
     val test: Some? = Some()
     for (i in test!!) { }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/kt11594.kt b/idea/testData/quickfix/expressions/kt11594.kt
index 8931f89bec4..b0af268840c 100644
--- a/idea/testData/quickfix/expressions/kt11594.kt
+++ b/idea/testData/quickfix/expressions/kt11594.kt
@@ -4,4 +4,5 @@ fun callMe(p: String) {}
 
 fun callIt(p: Any) {
     callMe(<caret>p as String?)
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/kt11594.kt.after b/idea/testData/quickfix/expressions/kt11594.kt.after
index 43f7f0cd4b1..fd57789ce6c 100644
--- a/idea/testData/quickfix/expressions/kt11594.kt.after
+++ b/idea/testData/quickfix/expressions/kt11594.kt.after
@@ -4,4 +4,5 @@ fun callMe(p: String) {}
 
 fun callIt(p: Any) {
     callMe(<caret>(p as String?)!!)
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCast.kt b/idea/testData/quickfix/expressions/removeUselessCast.kt
index 80cdd135727..f10844780f7 100644
--- a/idea/testData/quickfix/expressions/removeUselessCast.kt
+++ b/idea/testData/quickfix/expressions/removeUselessCast.kt
@@ -2,3 +2,5 @@
 fun foo(a: String) {
     val b = a <caret>as String
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCast.kt.after b/idea/testData/quickfix/expressions/removeUselessCast.kt.after
index 43b6e6b76fc..184ffbdf8ca 100644
--- a/idea/testData/quickfix/expressions/removeUselessCast.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessCast.kt.after
@@ -2,3 +2,5 @@
 fun foo(a: String) {
     val b = a
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens1.kt b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens1.kt
index 6a59aee2ffc..3a4b3792c0f 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens1.kt
+++ b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens1.kt
@@ -1,4 +1,5 @@
 // "Remove useless cast" "true"
 fun test() {
     ({ "" } as<caret> () -> String)
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens1.kt.after b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens1.kt.after
index e4038d4b644..9939faaaaec 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens1.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens1.kt.after
@@ -1,4 +1,5 @@
 // "Remove useless cast" "true"
 fun test() {
     { "" }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens2.kt b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens2.kt
index a9135199793..0651244a19a 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens2.kt
+++ b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens2.kt
@@ -5,4 +5,5 @@ fun test() {
     foo()
     // comment
     ({ "" } as<caret> () -> String)
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens2.kt.after b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens2.kt.after
index 370e99c7de7..fb1192c5a1e 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens2.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens2.kt.after
@@ -5,4 +5,5 @@ fun test() {
     foo()
     // comment
     ({ "" })
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens3.kt b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens3.kt
index ea4f8e4ccab..61ca1bba9ce 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens3.kt
+++ b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens3.kt
@@ -6,4 +6,5 @@ class A {
 fun test() {
     A().foo()
     ({ "" } as<caret> () -> String)
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens3.kt.after b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens3.kt.after
index e03f360d5a0..c64a42e6e91 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens3.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens3.kt.after
@@ -6,4 +6,5 @@ class A {
 fun test() {
     A().foo()
     ({ "" })
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens4.kt b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens4.kt
index e00d9d50169..887b82e0daa 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens4.kt
+++ b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens4.kt
@@ -2,4 +2,5 @@
 fun test() {
     class A()
     ({ "" } as<caret> () -> String)
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens4.kt.after b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens4.kt.after
index f9949426d4d..361e168543a 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens4.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens4.kt.after
@@ -2,4 +2,5 @@
 fun test() {
     class A()
     ({ "" })
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens5.kt b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens5.kt
index 1edb7b01f75..8c11a1cddc0 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens5.kt
+++ b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens5.kt
@@ -4,4 +4,5 @@ open class A
 fun test() {
     class B : A()
     ({ "" } as<caret> () -> String)
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens5.kt.after b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens5.kt.after
index 53ec2a04545..30f966573e3 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens5.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens5.kt.after
@@ -4,4 +4,5 @@ open class A
 fun test() {
     class B : A()
     ({ "" })
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens6.kt b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens6.kt
index d2d36bc830f..40cc6194182 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens6.kt
+++ b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens6.kt
@@ -5,3 +5,5 @@ fun main() {
     foo();
     ({ "" } as<caret> () -> String)
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens6.kt.after b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens6.kt.after
index 905016fc723..754a714fa06 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens6.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessCastForLambdaInParens6.kt.after
@@ -5,3 +5,5 @@ fun main() {
     foo();
     { "" }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastInParens.kt b/idea/testData/quickfix/expressions/removeUselessCastInParens.kt
index 1b2c25399ab..5af1dc32e9b 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastInParens.kt
+++ b/idea/testData/quickfix/expressions/removeUselessCastInParens.kt
@@ -5,3 +5,5 @@ fun test(x: Any): Int {
     }
     return -1
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastInParens.kt.after b/idea/testData/quickfix/expressions/removeUselessCastInParens.kt.after
index f1f47bff5d2..3c49e654ca4 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastInParens.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessCastInParens.kt.after
@@ -5,3 +5,5 @@ fun test(x: Any): Int {
     }
     return -1
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt b/idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt
index 41d7a3e15cd..d93cc82d1a9 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt
+++ b/idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt
@@ -5,3 +5,5 @@ fun test(x: Any): String? {
     }
     return null
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt.after b/idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt.after
index 4c37c56df6f..0955d43b1c6 100644
--- a/idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt.after
@@ -5,3 +5,5 @@ fun test(x: Any): String? {
     }
     return null
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessIsCheck.kt b/idea/testData/quickfix/expressions/removeUselessIsCheck.kt
index d674aa9020f..410fffb6d3b 100644
--- a/idea/testData/quickfix/expressions/removeUselessIsCheck.kt
+++ b/idea/testData/quickfix/expressions/removeUselessIsCheck.kt
@@ -4,3 +4,5 @@ fun foo(a: String) {
 
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessIsCheck.kt.after b/idea/testData/quickfix/expressions/removeUselessIsCheck.kt.after
index 383695353a8..616d1e3f994 100644
--- a/idea/testData/quickfix/expressions/removeUselessIsCheck.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessIsCheck.kt.after
@@ -4,3 +4,5 @@ fun foo(a: String) {
 
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhen.kt b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhen.kt
index 3b60e662ed6..e7c27c5a936 100644
--- a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhen.kt
+++ b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhen.kt
@@ -9,3 +9,5 @@ fun foo(bar: Base):Int {
         else -> 1
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhen.kt.after b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhen.kt.after
index d8cfd234bd0..e86491c757d 100644
--- a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhen.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhen.kt.after
@@ -8,3 +8,5 @@ fun foo(bar: Base):Int {
         else -> 42
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionless.kt b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionless.kt
index 00309c6c359..c65e9cb3b2a 100644
--- a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionless.kt
+++ b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionless.kt
@@ -9,4 +9,5 @@ fun foo(bar: Base):Int {
         bar <caret>is Base -> 42
         else -> 1
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionless.kt.after b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionless.kt.after
index c8673c835e7..f570cf0d5fd 100644
--- a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionless.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionless.kt.after
@@ -9,4 +9,5 @@ fun foo(bar: Base):Int {
         true -> 42
         else -> 1
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegate.kt b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegate.kt
index e62165714d3..8e19703516e 100644
--- a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegate.kt
+++ b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegate.kt
@@ -9,4 +9,5 @@ fun foo(bar: Base):Int {
         bar <caret>!is Base -> 42
         else -> 1
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegate.kt.after b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegate.kt.after
index f014460df3a..dd9aff0053d 100644
--- a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegate.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegate.kt.after
@@ -9,4 +9,5 @@ fun foo(bar: Base):Int {
         false -> 42
         else -> 1
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenNegate.kt b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenNegate.kt
index bb246ccdb69..adbc2f2d357 100644
--- a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenNegate.kt
+++ b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenNegate.kt
@@ -9,3 +9,5 @@ fun foo(bar: Base):Int {
         else -> 1
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenNegate.kt.after b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenNegate.kt.after
index 6d32eb7385b..9d5ec45de6b 100644
--- a/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenNegate.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessIsCheckInWhenNegate.kt.after
@@ -8,3 +8,5 @@ fun foo(bar: Base):Int {
         else -> 1
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessIsCheckNegate.kt b/idea/testData/quickfix/expressions/removeUselessIsCheckNegate.kt
index 8bba73dadc2..d13eab35de4 100644
--- a/idea/testData/quickfix/expressions/removeUselessIsCheckNegate.kt
+++ b/idea/testData/quickfix/expressions/removeUselessIsCheckNegate.kt
@@ -4,3 +4,5 @@ fun foo(a: String) {
 
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/removeUselessIsCheckNegate.kt.after b/idea/testData/quickfix/expressions/removeUselessIsCheckNegate.kt.after
index 640d386ef3b..412f8848e33 100644
--- a/idea/testData/quickfix/expressions/removeUselessIsCheckNegate.kt.after
+++ b/idea/testData/quickfix/expressions/removeUselessIsCheckNegate.kt.after
@@ -4,3 +4,5 @@ fun foo(a: String) {
 
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt
index 997fb077345..e2109e58dde 100644
--- a/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt
+++ b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt
@@ -2,3 +2,5 @@
 fun test(value : Int) : Int {
     return value<caret>!!
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt.after b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt.after
index 3f6e5bd7ffe..6350d1a7d46 100644
--- a/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt.after
+++ b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt.after
@@ -2,3 +2,5 @@
 fun test(value : Int) : Int {
     return value<caret>
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt
index 93a8d4b69cc..4ce4283a8d6 100644
--- a/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt
+++ b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt
@@ -2,3 +2,5 @@
 fun test(value : String) {
     value!!<caret>.equals("test")
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt.after b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt.after
index 1f12846abb6..751cd87d6f0 100644
--- a/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt.after
+++ b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt.after
@@ -2,3 +2,5 @@
 fun test(value : String) {
     value<caret>.equals("test")
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt
index 2422453b1cb..4f952130c6a 100644
--- a/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt
+++ b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt
@@ -2,3 +2,5 @@
 fun test(value : String) : Int {
     return value<caret>!!.length
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt.after b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt.after
index 9872deea316..bd3218f77a5 100644
--- a/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt.after
+++ b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt.after
@@ -2,3 +2,5 @@
 fun test(value : String) : Int {
     return value<caret>.length
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unnecessarySafeCall1.kt b/idea/testData/quickfix/expressions/unnecessarySafeCall1.kt
index e9e0c31da15..6962edcd53b 100644
--- a/idea/testData/quickfix/expressions/unnecessarySafeCall1.kt
+++ b/idea/testData/quickfix/expressions/unnecessarySafeCall1.kt
@@ -2,3 +2,5 @@
 fun foo(a: Any) {
     a<caret>?.equals(0)
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unnecessarySafeCall1.kt.after b/idea/testData/quickfix/expressions/unnecessarySafeCall1.kt.after
index 6c1ad9fe270..4cdd8f60099 100644
--- a/idea/testData/quickfix/expressions/unnecessarySafeCall1.kt.after
+++ b/idea/testData/quickfix/expressions/unnecessarySafeCall1.kt.after
@@ -2,3 +2,5 @@
 fun foo(a: Any) {
     a<caret>.equals(0)
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unsafeCall1.kt b/idea/testData/quickfix/expressions/unsafeCall1.kt
index 39005f2dffd..807cd97e0f3 100644
--- a/idea/testData/quickfix/expressions/unsafeCall1.kt
+++ b/idea/testData/quickfix/expressions/unsafeCall1.kt
@@ -1,4 +1,5 @@
 // "Replace with safe (?.) call" "true"
 fun foo(a: Int?) {
     a<caret>.plus(1)
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unsafeCall1.kt.after b/idea/testData/quickfix/expressions/unsafeCall1.kt.after
index 29fdce55a65..9dfdd27f5c8 100644
--- a/idea/testData/quickfix/expressions/unsafeCall1.kt.after
+++ b/idea/testData/quickfix/expressions/unsafeCall1.kt.after
@@ -1,4 +1,5 @@
 // "Replace with safe (?.) call" "true"
 fun foo(a: Int?) {
     a?.plus(1)
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unsafeCall2.kt b/idea/testData/quickfix/expressions/unsafeCall2.kt
index 25866b37c4b..8f0680d3468 100644
--- a/idea/testData/quickfix/expressions/unsafeCall2.kt
+++ b/idea/testData/quickfix/expressions/unsafeCall2.kt
@@ -2,3 +2,5 @@
 fun foo(a: Int?) {
     a<caret>.plus(1)
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unsafeCall2.kt.after b/idea/testData/quickfix/expressions/unsafeCall2.kt.after
index 656198dc506..0f9e9f3a652 100644
--- a/idea/testData/quickfix/expressions/unsafeCall2.kt.after
+++ b/idea/testData/quickfix/expressions/unsafeCall2.kt.after
@@ -2,3 +2,5 @@
 fun foo(a: Int?) {
     a!!.plus(1)
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unsafeCall3.kt b/idea/testData/quickfix/expressions/unsafeCall3.kt
index 946185f33ea..487c19ceb62 100644
--- a/idea/testData/quickfix/expressions/unsafeCall3.kt
+++ b/idea/testData/quickfix/expressions/unsafeCall3.kt
@@ -2,3 +2,5 @@
 fun foo(a: Int?) {
     a.<caret>plus(1)
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unsafeCall3.kt.after b/idea/testData/quickfix/expressions/unsafeCall3.kt.after
index 656198dc506..0f9e9f3a652 100644
--- a/idea/testData/quickfix/expressions/unsafeCall3.kt.after
+++ b/idea/testData/quickfix/expressions/unsafeCall3.kt.after
@@ -2,3 +2,5 @@
 fun foo(a: Int?) {
     a!!.plus(1)
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unsafeCall4.kt b/idea/testData/quickfix/expressions/unsafeCall4.kt
index 717f7d19054..d1b03fba852 100644
--- a/idea/testData/quickfix/expressions/unsafeCall4.kt
+++ b/idea/testData/quickfix/expressions/unsafeCall4.kt
@@ -1,4 +1,5 @@
 // "Add non-null asserted (!!) call" "true"
 
 operator fun Int.get(row: Int, column: Int) = this
-fun foo(arg: Int?) = arg<caret>[42, 13]
\ No newline at end of file
+fun foo(arg: Int?) = arg<caret>[42, 13]
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unsafeCall4.kt.after b/idea/testData/quickfix/expressions/unsafeCall4.kt.after
index 396f7527767..8e62dc9572e 100644
--- a/idea/testData/quickfix/expressions/unsafeCall4.kt.after
+++ b/idea/testData/quickfix/expressions/unsafeCall4.kt.after
@@ -1,4 +1,5 @@
 // "Add non-null asserted (!!) call" "true"
 
 operator fun Int.get(row: Int, column: Int) = this
-fun foo(arg: Int?) = arg!![42, 13]
\ No newline at end of file
+fun foo(arg: Int?) = arg!![42, 13]
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unsafeCall5.kt b/idea/testData/quickfix/expressions/unsafeCall5.kt
index e4a779259ac..c39b8c2fc31 100644
--- a/idea/testData/quickfix/expressions/unsafeCall5.kt
+++ b/idea/testData/quickfix/expressions/unsafeCall5.kt
@@ -1,4 +1,5 @@
 // "Add non-null asserted (!!) call" "true"
 
 operator fun Int.get(row: Int, column: Int) = if (row == column) this else null
-fun foo(arg: Int) = arg[42, 13]<caret>.hashCode()
\ No newline at end of file
+fun foo(arg: Int) = arg[42, 13]<caret>.hashCode()
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/unsafeCall5.kt.after b/idea/testData/quickfix/expressions/unsafeCall5.kt.after
index d2d4f2c030b..aee70c522a6 100644
--- a/idea/testData/quickfix/expressions/unsafeCall5.kt.after
+++ b/idea/testData/quickfix/expressions/unsafeCall5.kt.after
@@ -1,4 +1,5 @@
 // "Add non-null asserted (!!) call" "true"
 
 operator fun Int.get(row: Int, column: Int) = if (row == column) this else null
-fun foo(arg: Int) = arg[42, 13]!!.hashCode()
\ No newline at end of file
+fun foo(arg: Int) = arg[42, 13]!!.hashCode()
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt b/idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt
index cdd50202fa3..5c9a46ea261 100644
--- a/idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt
+++ b/idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt
@@ -2,3 +2,5 @@
 fun foo(a: Any) {
     val b = a <caret>as Any
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt.after b/idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt.after
index ebe6e75ebfd..ccd6a10e2c8 100644
--- a/idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt.after
+++ b/idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt.after
@@ -2,3 +2,5 @@
 fun foo(a: Any) {
     val b = a<caret>
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/uselessElvis.kt b/idea/testData/quickfix/expressions/uselessElvis.kt
index 97eb6b5bb36..1b644fe4f9a 100644
--- a/idea/testData/quickfix/expressions/uselessElvis.kt
+++ b/idea/testData/quickfix/expressions/uselessElvis.kt
@@ -2,3 +2,5 @@
 fun foo(a: String) {
     val b : String = a <caret>?: "s"
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/expressions/uselessElvis.kt.after b/idea/testData/quickfix/expressions/uselessElvis.kt.after
index 8ed7ed0f216..5fe807fc120 100644
--- a/idea/testData/quickfix/expressions/uselessElvis.kt.after
+++ b/idea/testData/quickfix/expressions/uselessElvis.kt.after
@@ -2,3 +2,5 @@
 fun foo(a: String) {
     val b : String = a<caret>
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/lateinit/nullable.kt b/idea/testData/quickfix/lateinit/nullable.kt
index 845cc34778a..8cbadc9000f 100644
--- a/idea/testData/quickfix/lateinit/nullable.kt
+++ b/idea/testData/quickfix/lateinit/nullable.kt
@@ -2,4 +2,5 @@
 
 class A() {
     <caret>lateinit var foo: String?
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/lateinit/nullable.kt.after b/idea/testData/quickfix/lateinit/nullable.kt.after
index ad81581c0c2..92d5c378856 100644
--- a/idea/testData/quickfix/lateinit/nullable.kt.after
+++ b/idea/testData/quickfix/lateinit/nullable.kt.after
@@ -2,4 +2,5 @@
 
 class A() {
     <caret>lateinit var foo: String
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/lateinit/val.kt b/idea/testData/quickfix/lateinit/val.kt
index 07ea795d46d..043e76d4ecb 100644
--- a/idea/testData/quickfix/lateinit/val.kt
+++ b/idea/testData/quickfix/lateinit/val.kt
@@ -3,4 +3,3 @@
 class A() {
     <caret>lateinit val foo: String
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/lateinit/val.kt.after b/idea/testData/quickfix/lateinit/val.kt.after
index be37d2414fd..3a8e7132ec2 100644
--- a/idea/testData/quickfix/lateinit/val.kt.after
+++ b/idea/testData/quickfix/lateinit/val.kt.after
@@ -3,4 +3,3 @@
 class A() {
     <caret>lateinit var foo: String
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/lateinit/withGetter.kt b/idea/testData/quickfix/lateinit/withGetter.kt
index 198aab17e0d..136fce159b4 100644
--- a/idea/testData/quickfix/lateinit/withGetter.kt
+++ b/idea/testData/quickfix/lateinit/withGetter.kt
@@ -3,4 +3,5 @@
 class A {
     <caret>lateinit var str: String
         get() = ""
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/lateinit/withGetter.kt.after b/idea/testData/quickfix/lateinit/withGetter.kt.after
index 9569b3b1e29..457e75278fe 100644
--- a/idea/testData/quickfix/lateinit/withGetter.kt.after
+++ b/idea/testData/quickfix/lateinit/withGetter.kt.after
@@ -3,4 +3,5 @@
 class A {
     <caret>lateinit var str: String
         
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/lateinit/withGetterSetter.kt b/idea/testData/quickfix/lateinit/withGetterSetter.kt
index b7fdf0ff95a..fa91c791527 100644
--- a/idea/testData/quickfix/lateinit/withGetterSetter.kt
+++ b/idea/testData/quickfix/lateinit/withGetterSetter.kt
@@ -4,4 +4,5 @@ class A {
     <caret>lateinit var str: String
         get() = ""
         set(value) {}
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/lateinit/withGetterSetter.kt.after b/idea/testData/quickfix/lateinit/withGetterSetter.kt.after
index 17542b060ab..d1f6c9d7dc9 100644
--- a/idea/testData/quickfix/lateinit/withGetterSetter.kt.after
+++ b/idea/testData/quickfix/lateinit/withGetterSetter.kt.after
@@ -3,4 +3,5 @@
 class A {
     <caret>lateinit var str: String
 
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/lateinit/withInitializer.kt b/idea/testData/quickfix/lateinit/withInitializer.kt
index 18ad2b5d7d2..1d85e9f372d 100644
--- a/idea/testData/quickfix/lateinit/withInitializer.kt
+++ b/idea/testData/quickfix/lateinit/withInitializer.kt
@@ -2,4 +2,5 @@
 
 class A {
     <caret>lateinit var str = ""
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/lateinit/withInitializer.kt.after b/idea/testData/quickfix/lateinit/withInitializer.kt.after
index b44ecb8bfb8..23a929c3b41 100644
--- a/idea/testData/quickfix/lateinit/withInitializer.kt.after
+++ b/idea/testData/quickfix/lateinit/withInitializer.kt.after
@@ -2,4 +2,5 @@
 
 class A {
     lateinit var str: String<caret>
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/lateinit/withSetter.kt b/idea/testData/quickfix/lateinit/withSetter.kt
index 3548ee72331..77a9365eecd 100644
--- a/idea/testData/quickfix/lateinit/withSetter.kt
+++ b/idea/testData/quickfix/lateinit/withSetter.kt
@@ -3,4 +3,5 @@
 class A {
     <caret>lateinit var str: String
         set(value) {}
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/lateinit/withSetter.kt.after b/idea/testData/quickfix/lateinit/withSetter.kt.after
index 8cba5136811..f72edd3c8c9 100644
--- a/idea/testData/quickfix/lateinit/withSetter.kt.after
+++ b/idea/testData/quickfix/lateinit/withSetter.kt.after
@@ -3,4 +3,5 @@
 class A {
     <caret>lateinit var str: String
         
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/abstractModifierInEnum.kt b/idea/testData/quickfix/modifiers/abstractModifierInEnum.kt
index e3d23cb96ac..c43560cf0ed 100644
--- a/idea/testData/quickfix/modifiers/abstractModifierInEnum.kt
+++ b/idea/testData/quickfix/modifiers/abstractModifierInEnum.kt
@@ -1,3 +1,5 @@
 // "Make 'A' not abstract" "true"
 <caret>abstract enum class A() {
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/abstractModifierInEnum.kt.after b/idea/testData/quickfix/modifiers/abstractModifierInEnum.kt.after
index 04c450ead7d..e22c42c4cf6 100644
--- a/idea/testData/quickfix/modifiers/abstractModifierInEnum.kt.after
+++ b/idea/testData/quickfix/modifiers/abstractModifierInEnum.kt.after
@@ -1,3 +1,5 @@
 // "Make 'A' not abstract" "true"
 <caret>enum class A() {
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt b/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt
index 6f9cf01b6e8..88652b475be 100644
--- a/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt
+++ b/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt
@@ -3,4 +3,3 @@ abstract class My {
     abstract var foo: Int
         <caret>private set
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt.after b/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt.after
index 29d1051f244..569ca407e83 100644
--- a/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt.after
+++ b/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt.after
@@ -3,4 +3,3 @@ abstract class My {
     abstract var foo: Int
         set
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/addLateinit.kt b/idea/testData/quickfix/modifiers/addLateinit.kt
index bc85f064751..00f79211875 100644
--- a/idea/testData/quickfix/modifiers/addLateinit.kt
+++ b/idea/testData/quickfix/modifiers/addLateinit.kt
@@ -2,4 +2,5 @@
 
 class A {
     private var a: String<caret>
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/addLateinit.kt.after b/idea/testData/quickfix/modifiers/addLateinit.kt.after
index ff50605306f..627dcb65ee2 100644
--- a/idea/testData/quickfix/modifiers/addLateinit.kt.after
+++ b/idea/testData/quickfix/modifiers/addLateinit.kt.after
@@ -2,4 +2,5 @@
 
 class A {
     private lateinit var a: String<caret>
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt b/idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt
index 6daad2408fb..26fb9805cd8 100644
--- a/idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt
+++ b/idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt
@@ -1,4 +1,3 @@
 // "class org.jetbrains.kotlin.idea.quickfix.MakeClassAnAnnotationClassFix" "false"
 // ERROR: 'String' is not an annotation class
 @String<caret> class foo {}
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/finalTrait.kt b/idea/testData/quickfix/modifiers/finalTrait.kt
index fe2afeb306d..903f202d36a 100644
--- a/idea/testData/quickfix/modifiers/finalTrait.kt
+++ b/idea/testData/quickfix/modifiers/finalTrait.kt
@@ -1,2 +1,3 @@
 // "Remove 'final' modifier" "true"
-<caret>final interface A {}
\ No newline at end of file
+<caret>final interface A {}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/finalTrait.kt.after b/idea/testData/quickfix/modifiers/finalTrait.kt.after
index 10b823842cc..0f23c3f227f 100644
--- a/idea/testData/quickfix/modifiers/finalTrait.kt.after
+++ b/idea/testData/quickfix/modifiers/finalTrait.kt.after
@@ -1,2 +1,3 @@
 // "Remove 'final' modifier" "true"
-<caret>interface A {}
\ No newline at end of file
+<caret>interface A {}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt b/idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt
index d5cd36eb48f..e6f279f8a49 100644
--- a/idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt
+++ b/idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt
@@ -1,3 +1,5 @@
 // "Remove 'enum' modifier" "true"
 <caret>enum interface A {
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt.after b/idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt.after
index c5f63f389ae..5cb623ede97 100644
--- a/idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt.after
+++ b/idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt.after
@@ -1,3 +1,5 @@
 // "Remove 'enum' modifier" "true"
 <caret>interface A {
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt b/idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt
index 9cd6225ee20..8ce410cd11f 100644
--- a/idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt
+++ b/idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt
@@ -2,3 +2,5 @@
 class A() {
     <caret>enum fun foo() {}
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt.after b/idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt.after
index 61e1d0f2560..27d272099cb 100644
--- a/idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt.after
+++ b/idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt.after
@@ -2,3 +2,5 @@
 class A() {
     <caret>fun foo() {}
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/infixModifier.kt b/idea/testData/quickfix/modifiers/infixModifier.kt
index 66a71a38083..63c576eafdb 100644
--- a/idea/testData/quickfix/modifiers/infixModifier.kt
+++ b/idea/testData/quickfix/modifiers/infixModifier.kt
@@ -5,4 +5,5 @@ class A {
 
 fun foo() {
     A() xyz<caret>zy 5
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/infixModifier.kt.after b/idea/testData/quickfix/modifiers/infixModifier.kt.after
index 3f47b32fa9f..ef448b5ae11 100644
--- a/idea/testData/quickfix/modifiers/infixModifier.kt.after
+++ b/idea/testData/quickfix/modifiers/infixModifier.kt.after
@@ -5,4 +5,5 @@ class A {
 
 fun foo() {
     A() xyz<caret>zy 5
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/kt10409.kt b/idea/testData/quickfix/modifiers/kt10409.kt
index 91dd01b4684..e5c21b83504 100644
--- a/idea/testData/quickfix/modifiers/kt10409.kt
+++ b/idea/testData/quickfix/modifiers/kt10409.kt
@@ -12,3 +12,5 @@ interface Pipeline<TPipeline> {
     override fun pipe(block: Pipeline<T>) {
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/kt10409.kt.after b/idea/testData/quickfix/modifiers/kt10409.kt.after
index cc76df5c1b0..8fbdfbe8f83 100644
--- a/idea/testData/quickfix/modifiers/kt10409.kt.after
+++ b/idea/testData/quickfix/modifiers/kt10409.kt.after
@@ -12,3 +12,5 @@ abstract class IterablePipeline<T> : Pipeline<T> {
     override fun pipe(block: Pipeline<T>) {
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedAbstractClass.kt b/idea/testData/quickfix/modifiers/nestedAbstractClass.kt
index 8e4f899b641..12e31ae06ab 100644
--- a/idea/testData/quickfix/modifiers/nestedAbstractClass.kt
+++ b/idea/testData/quickfix/modifiers/nestedAbstractClass.kt
@@ -4,4 +4,3 @@ class A() {
         abstract class <caret>C
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedAbstractClass.kt.after b/idea/testData/quickfix/modifiers/nestedAbstractClass.kt.after
index 577a29a2460..0525a8c1f2f 100644
--- a/idea/testData/quickfix/modifiers/nestedAbstractClass.kt.after
+++ b/idea/testData/quickfix/modifiers/nestedAbstractClass.kt.after
@@ -4,4 +4,3 @@ class A() {
         abstract inner class C
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedAnnotationClass.kt b/idea/testData/quickfix/modifiers/nestedAnnotationClass.kt
index d472a3314db..32d1c1e4ca9 100644
--- a/idea/testData/quickfix/modifiers/nestedAnnotationClass.kt
+++ b/idea/testData/quickfix/modifiers/nestedAnnotationClass.kt
@@ -5,4 +5,3 @@ class A() {
         annotation class <caret>C
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt b/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt
index b631355d7ba..a4304a27098 100644
--- a/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt
+++ b/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt
@@ -5,4 +5,3 @@ class A() {
         }
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt.after b/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt.after
index b0fec24835b..0c894b0e185 100644
--- a/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt.after
+++ b/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt.after
@@ -5,4 +5,3 @@ class A() {
         }
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedDataClass.kt b/idea/testData/quickfix/modifiers/nestedDataClass.kt
index d846cbb7456..eb8b2b4fe0b 100644
--- a/idea/testData/quickfix/modifiers/nestedDataClass.kt
+++ b/idea/testData/quickfix/modifiers/nestedDataClass.kt
@@ -7,4 +7,3 @@ class A() {
         data class <caret>C
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedEnumClass.kt b/idea/testData/quickfix/modifiers/nestedEnumClass.kt
index 457c74fa7f5..a4994f62fbe 100644
--- a/idea/testData/quickfix/modifiers/nestedEnumClass.kt
+++ b/idea/testData/quickfix/modifiers/nestedEnumClass.kt
@@ -7,4 +7,3 @@ class A() {
         enum class <caret>C
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedInterface.kt b/idea/testData/quickfix/modifiers/nestedInterface.kt
index faa04f00d96..869025b6950 100644
--- a/idea/testData/quickfix/modifiers/nestedInterface.kt
+++ b/idea/testData/quickfix/modifiers/nestedInterface.kt
@@ -6,4 +6,3 @@ class A() {
         interface <caret>C
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedObject.kt b/idea/testData/quickfix/modifiers/nestedObject.kt
index 78db500cf1d..5472f4809ba 100644
--- a/idea/testData/quickfix/modifiers/nestedObject.kt
+++ b/idea/testData/quickfix/modifiers/nestedObject.kt
@@ -6,4 +6,3 @@ class A() {
         object <caret>C
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/nestedSealedClass.kt b/idea/testData/quickfix/modifiers/nestedSealedClass.kt
index edeed352147..e3fe905d0b8 100644
--- a/idea/testData/quickfix/modifiers/nestedSealedClass.kt
+++ b/idea/testData/quickfix/modifiers/nestedSealedClass.kt
@@ -8,4 +8,3 @@ class A() {
         sealed class <caret>C
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt b/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt
index 8ec491989d1..6dc49ea0384 100644
--- a/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt
+++ b/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt
@@ -10,4 +10,3 @@ interface T {
 fun test() {
     val o = <caret>object : T {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/noAbstractForObject.kt b/idea/testData/quickfix/modifiers/noAbstractForObject.kt
index 8d475c736c4..9887ea6cca1 100644
--- a/idea/testData/quickfix/modifiers/noAbstractForObject.kt
+++ b/idea/testData/quickfix/modifiers/noAbstractForObject.kt
@@ -9,4 +9,3 @@ interface T {
 }
 
 object <caret>Some : T
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/noLateinitOnNullable.kt b/idea/testData/quickfix/modifiers/noLateinitOnNullable.kt
index ff7e8f730a5..d576d3f410b 100644
--- a/idea/testData/quickfix/modifiers/noLateinitOnNullable.kt
+++ b/idea/testData/quickfix/modifiers/noLateinitOnNullable.kt
@@ -11,4 +11,3 @@
 class A {
     private var a: String?<caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/noLateinitOnPrimitive.kt b/idea/testData/quickfix/modifiers/noLateinitOnPrimitive.kt
index a0d531e14d8..b0f92fb2a5a 100644
--- a/idea/testData/quickfix/modifiers/noLateinitOnPrimitive.kt
+++ b/idea/testData/quickfix/modifiers/noLateinitOnPrimitive.kt
@@ -12,4 +12,3 @@
 class A {
     private var a: Int<caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/notAnAnnotationClass.kt b/idea/testData/quickfix/modifiers/notAnAnnotationClass.kt
index 98b56142b32..f1156bab06e 100644
--- a/idea/testData/quickfix/modifiers/notAnAnnotationClass.kt
+++ b/idea/testData/quickfix/modifiers/notAnAnnotationClass.kt
@@ -2,3 +2,5 @@
 class fancy
 
 @fancy<caret> class foo {}
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/notAnAnnotationClass.kt.after b/idea/testData/quickfix/modifiers/notAnAnnotationClass.kt.after
index 6342e2c4cb5..dacd418f469 100644
--- a/idea/testData/quickfix/modifiers/notAnAnnotationClass.kt.after
+++ b/idea/testData/quickfix/modifiers/notAnAnnotationClass.kt.after
@@ -2,3 +2,5 @@
 annotation class fancy
 
 @fancy class foo {}
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openCompanionObject.kt b/idea/testData/quickfix/modifiers/openCompanionObject.kt
index 3b0ba36e548..3700c195a28 100644
--- a/idea/testData/quickfix/modifiers/openCompanionObject.kt
+++ b/idea/testData/quickfix/modifiers/openCompanionObject.kt
@@ -3,4 +3,5 @@ class A {
     <caret>open companion object {
         fun a(): Int = 1
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openCompanionObject.kt.after b/idea/testData/quickfix/modifiers/openCompanionObject.kt.after
index f980591bf3f..8fcd3caed03 100644
--- a/idea/testData/quickfix/modifiers/openCompanionObject.kt.after
+++ b/idea/testData/quickfix/modifiers/openCompanionObject.kt.after
@@ -3,4 +3,5 @@ class A {
     companion object {
         fun a(): Int = 1
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openCompanionObject2.kt b/idea/testData/quickfix/modifiers/openCompanionObject2.kt
index c9b0e8585a7..480ca142ca2 100644
--- a/idea/testData/quickfix/modifiers/openCompanionObject2.kt
+++ b/idea/testData/quickfix/modifiers/openCompanionObject2.kt
@@ -3,4 +3,5 @@ class A {
     <caret>open companion object Foo {
         fun a(): Int = 1
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openCompanionObject2.kt.after b/idea/testData/quickfix/modifiers/openCompanionObject2.kt.after
index 7bd1558ecf7..280c5e41c98 100644
--- a/idea/testData/quickfix/modifiers/openCompanionObject2.kt.after
+++ b/idea/testData/quickfix/modifiers/openCompanionObject2.kt.after
@@ -3,4 +3,5 @@ class A {
     companion object Foo {
         fun a(): Int = 1
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt
index ef30238b69a..37f71f77f50 100644
--- a/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt
+++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt
@@ -2,4 +2,3 @@
 class A() {
     <caret>open fun foo() {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after
index b16d4d9c59d..c121722b204 100644
--- a/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after
+++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after
@@ -2,4 +2,3 @@
 open class A() {
     <caret>open fun foo() {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt
index 03584cd287a..f46a98892ae 100644
--- a/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt
+++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt
@@ -2,4 +2,3 @@
 class A() {
     <caret>open fun foo() {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt.after b/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt.after
index 3ce1a9bd1e1..1d4c97459f7 100644
--- a/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt.after
+++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt.after
@@ -2,4 +2,3 @@
 class A() {
     <caret>fun foo() {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt
index cba371c2891..bb75558fb6a 100644
--- a/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt
+++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt
@@ -2,4 +2,3 @@
 public class A() {
     <caret>open fun foo() {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after
index 1cc25429d40..6e8dbadb2f3 100644
--- a/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after
+++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after
@@ -2,4 +2,3 @@
 public open class A() {
     <caret>open fun foo() {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt
index 2d52950e705..93c0dcb75be 100644
--- a/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt
+++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt
@@ -2,4 +2,3 @@
 @Deprecated("") class A() {
     <caret>open fun foo() {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after
index d395c3b0500..b35f4dc66ba 100644
--- a/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after
+++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after
@@ -3,4 +3,3 @@
 open class A() {
     open fun foo() {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openModifierInEnum.kt b/idea/testData/quickfix/modifiers/openModifierInEnum.kt
index e835c027a77..f11de15146e 100644
--- a/idea/testData/quickfix/modifiers/openModifierInEnum.kt
+++ b/idea/testData/quickfix/modifiers/openModifierInEnum.kt
@@ -1,3 +1,5 @@
 // "Make 'A' not open" "true"
 <caret>open enum class A() {
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openModifierInEnum.kt.after b/idea/testData/quickfix/modifiers/openModifierInEnum.kt.after
index a786672f1ab..762d4f04ae4 100644
--- a/idea/testData/quickfix/modifiers/openModifierInEnum.kt.after
+++ b/idea/testData/quickfix/modifiers/openModifierInEnum.kt.after
@@ -1,3 +1,5 @@
 // "Make 'A' not open" "true"
 <caret>enum class A() {
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openObject.kt b/idea/testData/quickfix/modifiers/openObject.kt
index 0f358007a59..df6e15937f3 100644
--- a/idea/testData/quickfix/modifiers/openObject.kt
+++ b/idea/testData/quickfix/modifiers/openObject.kt
@@ -1,4 +1,5 @@
 // "Make 'Foo' not open" "true"
 <caret>open object Foo {
     fun a(): Int = 1
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openObject.kt.after b/idea/testData/quickfix/modifiers/openObject.kt.after
index c8601363f0a..c3c0a2b403e 100644
--- a/idea/testData/quickfix/modifiers/openObject.kt.after
+++ b/idea/testData/quickfix/modifiers/openObject.kt.after
@@ -1,4 +1,5 @@
 // "Make 'Foo' not open" "true"
 object Foo {
     fun a(): Int = 1
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt
index dc8e55cd5ed..26d4907af38 100644
--- a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt
+++ b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt
@@ -3,4 +3,3 @@ open class My {
     open var foo = 42
         <caret>private set
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt.after b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt.after
index 55ace69a4dc..cf3633af812 100644
--- a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt.after
+++ b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt.after
@@ -3,4 +3,3 @@ open class My {
     var foo = 42
         <caret>private set
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt
index da15282acf9..cae6a9c6aa4 100644
--- a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt
+++ b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt
@@ -3,4 +3,3 @@ open class My {
     open var foo = 42
         <caret>private set
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt.after b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt.after
index b4cb7407fae..afafbb6744f 100644
--- a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt.after
+++ b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt.after
@@ -3,4 +3,3 @@ open class My {
     open var foo = 42
         <caret>set
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/operatorModifier.kt b/idea/testData/quickfix/modifiers/operatorModifier.kt
index 5a6e8a00b7c..38b8712a550 100644
--- a/idea/testData/quickfix/modifiers/operatorModifier.kt
+++ b/idea/testData/quickfix/modifiers/operatorModifier.kt
@@ -6,3 +6,5 @@ class A {
 fun foo() {
     A() <caret>+ A()
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/operatorModifier.kt.after b/idea/testData/quickfix/modifiers/operatorModifier.kt.after
index 6aa21f4329d..db3ee348b1c 100644
--- a/idea/testData/quickfix/modifiers/operatorModifier.kt.after
+++ b/idea/testData/quickfix/modifiers/operatorModifier.kt.after
@@ -6,3 +6,5 @@ class A {
 fun foo() {
     A() <caret>+ A()
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/operatorModifierCollection.kt b/idea/testData/quickfix/modifiers/operatorModifierCollection.kt
index a822d10b7b2..bd0932773bf 100644
--- a/idea/testData/quickfix/modifiers/operatorModifierCollection.kt
+++ b/idea/testData/quickfix/modifiers/operatorModifierCollection.kt
@@ -4,3 +4,5 @@ class A {
 }
 
 fun foo() = 0 i<caret>n A()
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/operatorModifierCollection.kt.after b/idea/testData/quickfix/modifiers/operatorModifierCollection.kt.after
index 498bf2cd0f6..c31a9abfd45 100644
--- a/idea/testData/quickfix/modifiers/operatorModifierCollection.kt.after
+++ b/idea/testData/quickfix/modifiers/operatorModifierCollection.kt.after
@@ -4,3 +4,5 @@ class A {
 }
 
 fun foo() = 0 in A()
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/operatorModifierComponent.kt b/idea/testData/quickfix/modifiers/operatorModifierComponent.kt
index 29c025f0d96..4a19e8a5fd0 100644
--- a/idea/testData/quickfix/modifiers/operatorModifierComponent.kt
+++ b/idea/testData/quickfix/modifiers/operatorModifierComponent.kt
@@ -10,3 +10,5 @@ fun foo() {
     val (<caret>zero, one) = A()
 }
 
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/operatorModifierComponent.kt.after b/idea/testData/quickfix/modifiers/operatorModifierComponent.kt.after
index 5aec69a8bed..f4c3e51387d 100644
--- a/idea/testData/quickfix/modifiers/operatorModifierComponent.kt.after
+++ b/idea/testData/quickfix/modifiers/operatorModifierComponent.kt.after
@@ -10,3 +10,5 @@ fun foo() {
     val (zero, one) = A()
 }
 
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/operatorModifierGet.kt b/idea/testData/quickfix/modifiers/operatorModifierGet.kt
index 8fab1ffa40c..94147c6f52c 100644
--- a/idea/testData/quickfix/modifiers/operatorModifierGet.kt
+++ b/idea/testData/quickfix/modifiers/operatorModifierGet.kt
@@ -4,3 +4,5 @@ class A {
 }
 
 fun foo() = A()<caret>[0]
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/operatorModifierGet.kt.after b/idea/testData/quickfix/modifiers/operatorModifierGet.kt.after
index 789c7859d87..06057e999c6 100644
--- a/idea/testData/quickfix/modifiers/operatorModifierGet.kt.after
+++ b/idea/testData/quickfix/modifiers/operatorModifierGet.kt.after
@@ -4,3 +4,5 @@ class A {
 }
 
 fun foo() = A()[0]
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/operatorModifierInherited.kt b/idea/testData/quickfix/modifiers/operatorModifierInherited.kt
index 63a4a5878f6..01427f0bae5 100644
--- a/idea/testData/quickfix/modifiers/operatorModifierInherited.kt
+++ b/idea/testData/quickfix/modifiers/operatorModifierInherited.kt
@@ -8,3 +8,5 @@ object Bar : Foo()
 fun test(): Any {
     return Bar<caret>[5]
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/operatorModifierInherited.kt.after b/idea/testData/quickfix/modifiers/operatorModifierInherited.kt.after
index be505556dff..df70508bcd0 100644
--- a/idea/testData/quickfix/modifiers/operatorModifierInherited.kt.after
+++ b/idea/testData/quickfix/modifiers/operatorModifierInherited.kt.after
@@ -8,3 +8,5 @@ object Bar : Foo()
 fun test(): Any {
     return Bar<caret>[5]
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt
index 6452aff1f92..ce5e3fe5971 100644
--- a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt
+++ b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt
@@ -7,4 +7,3 @@ open class FooImpl : Foo {
     override var bar: String = ""
         <caret>private set
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt.after b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt.after
index 32b45a2ca4c..9cf50afc785 100644
--- a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt.after
+++ b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt.after
@@ -7,4 +7,3 @@ open class FooImpl : Foo {
     final override var bar: String = ""
         <caret>private set
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt
index 37fe7be10d7..1b117cfc6ad 100644
--- a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt
+++ b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt
@@ -7,4 +7,3 @@ open class FooImpl : Foo {
     override var bar: String = ""
         <caret>private set
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt.after b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt.after
index 5754803ff68..020fdf7c6b4 100644
--- a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt.after
+++ b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt.after
@@ -7,4 +7,3 @@ open class FooImpl : Foo {
     override var bar: String = ""
         <caret>set
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt b/idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt
index 49ac940481c..122c186820b 100644
--- a/idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt
+++ b/idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt
@@ -2,3 +2,5 @@
 package test
 
 <caret>protected val a: Int = 0
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt.after b/idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt.after
index de0cdcad4a5..931862003fb 100644
--- a/idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt.after
+++ b/idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt.after
@@ -2,3 +2,5 @@
 package test
 
 val a: Int = 0
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt
index e0a5cbfd311..8119217ab0a 100644
--- a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt
+++ b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt
@@ -3,4 +3,3 @@
 interface My {
     <caret>open fun foo()
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after
index fdb5c1bb643..9f799a85acc 100644
--- a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after
+++ b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after
@@ -3,4 +3,3 @@
 interface My {
     fun foo()
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeAbstractModifier.kt b/idea/testData/quickfix/modifiers/removeAbstractModifier.kt
index ccfcb0fa90f..d755655a060 100644
--- a/idea/testData/quickfix/modifiers/removeAbstractModifier.kt
+++ b/idea/testData/quickfix/modifiers/removeAbstractModifier.kt
@@ -3,3 +3,5 @@
 class A <caret>abstract() {
 
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeAbstractModifier.kt.after b/idea/testData/quickfix/modifiers/removeAbstractModifier.kt.after
index f5a5719a9bf..f59506e2448 100644
--- a/idea/testData/quickfix/modifiers/removeAbstractModifier.kt.after
+++ b/idea/testData/quickfix/modifiers/removeAbstractModifier.kt.after
@@ -3,3 +3,5 @@
 class A() {
 
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeConst.kt b/idea/testData/quickfix/modifiers/removeConst.kt
index 70921f0ea49..f49d9d8a610 100644
--- a/idea/testData/quickfix/modifiers/removeConst.kt
+++ b/idea/testData/quickfix/modifiers/removeConst.kt
@@ -4,4 +4,5 @@ class Foo
 
 object Test {
     <caret>const val c = Foo()
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeConst.kt.after b/idea/testData/quickfix/modifiers/removeConst.kt.after
index c0d09904610..37c0c629dc7 100644
--- a/idea/testData/quickfix/modifiers/removeConst.kt.after
+++ b/idea/testData/quickfix/modifiers/removeConst.kt.after
@@ -4,4 +4,5 @@ class Foo
 
 object Test {
     val c = Foo()
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeExternalModifier.kt b/idea/testData/quickfix/modifiers/removeExternalModifier.kt
index 4281aac13cc..44f21ab22eb 100644
--- a/idea/testData/quickfix/modifiers/removeExternalModifier.kt
+++ b/idea/testData/quickfix/modifiers/removeExternalModifier.kt
@@ -2,4 +2,5 @@
 
 class B {
     <caret>external val foo: Int = 23
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeExternalModifier.kt.after b/idea/testData/quickfix/modifiers/removeExternalModifier.kt.after
index 67e909ab0ab..f350d83d13b 100644
--- a/idea/testData/quickfix/modifiers/removeExternalModifier.kt.after
+++ b/idea/testData/quickfix/modifiers/removeExternalModifier.kt.after
@@ -2,4 +2,5 @@
 
 class B {
     val foo: Int = 23
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt b/idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt
index 43d89342ac9..c0274148eaa 100644
--- a/idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt
+++ b/idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt
@@ -2,4 +2,3 @@
 class Foo {
     public<caret> private fun bar() { }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt.after b/idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt.after
index 53d3d562378..85a3b784ea4 100644
--- a/idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt.after
+++ b/idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt.after
@@ -2,4 +2,3 @@
 class Foo {
     private fun bar() { }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt b/idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt
index 6eb5a15980d..eb840ca16e8 100644
--- a/idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt
+++ b/idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt
@@ -2,3 +2,5 @@
 interface A {
     inne<caret>r class B
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt.after b/idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt.after
index c81d95a1aca..21c0415f13c 100644
--- a/idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt.after
+++ b/idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt.after
@@ -2,3 +2,5 @@
 interface A {
     class B
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt b/idea/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt
index 390f34ddd64..c9784b35da0 100644
--- a/idea/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt
+++ b/idea/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt
@@ -3,4 +3,5 @@
 
 object A {
     operator<caret> fun mod(x: Int) {}
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt.after b/idea/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt.after
index 67c6e556e7e..422a7a64cce 100644
--- a/idea/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt.after
+++ b/idea/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt.after
@@ -3,4 +3,5 @@
 
 object A {
     fun mod(x: Int) {}
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt b/idea/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt
index 2d63d9e8ce3..0fccf9f640f 100644
--- a/idea/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt
+++ b/idea/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt
@@ -2,4 +2,5 @@
 
 object A {
     operator<caret> fun mod(x: Int) {}
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt.after b/idea/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt.after
index f8bf21d8334..00d61274f76 100644
--- a/idea/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt.after
+++ b/idea/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt.after
@@ -2,4 +2,5 @@
 
 object A {
     <caret>fun mod(x: Int) {}
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt b/idea/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt
index 2aa5664bdc8..eb6bd015067 100644
--- a/idea/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt
+++ b/idea/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt
@@ -2,4 +2,5 @@
 
 object A {
     operator<caret> fun modAssign(x: Int) {}
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt.after b/idea/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt.after
index 2fa79c80d78..343db868c7c 100644
--- a/idea/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt.after
+++ b/idea/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt.after
@@ -2,4 +2,5 @@
 
 object A {
     <caret>fun modAssign(x: Int) {}
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeProtectedModifier.kt b/idea/testData/quickfix/modifiers/removeProtectedModifier.kt
index 809fb1920fa..633f449798e 100644
--- a/idea/testData/quickfix/modifiers/removeProtectedModifier.kt
+++ b/idea/testData/quickfix/modifiers/removeProtectedModifier.kt
@@ -3,4 +3,3 @@
 class A private <caret>protected constructor() {
 
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeProtectedModifier.kt.after b/idea/testData/quickfix/modifiers/removeProtectedModifier.kt.after
index 0c4d4b357c1..cb41cc26b7d 100644
--- a/idea/testData/quickfix/modifiers/removeProtectedModifier.kt.after
+++ b/idea/testData/quickfix/modifiers/removeProtectedModifier.kt.after
@@ -3,4 +3,3 @@
 class A private constructor() {
 
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeRedundantModifier1.kt b/idea/testData/quickfix/modifiers/removeRedundantModifier1.kt
index 7ba120a4a4f..b208c170dd4 100644
--- a/idea/testData/quickfix/modifiers/removeRedundantModifier1.kt
+++ b/idea/testData/quickfix/modifiers/removeRedundantModifier1.kt
@@ -7,4 +7,3 @@ abstract class A() : B() {
     <caret>open abstract override fun foo()
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeRedundantModifier1.kt.after b/idea/testData/quickfix/modifiers/removeRedundantModifier1.kt.after
index 0a9cd079d2d..3f015e3575a 100644
--- a/idea/testData/quickfix/modifiers/removeRedundantModifier1.kt.after
+++ b/idea/testData/quickfix/modifiers/removeRedundantModifier1.kt.after
@@ -7,4 +7,3 @@ abstract class A() : B() {
     <caret>abstract override fun foo()
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeRedundantModifier2.kt b/idea/testData/quickfix/modifiers/removeRedundantModifier2.kt
index 2b1f305be5a..81f4b517889 100644
--- a/idea/testData/quickfix/modifiers/removeRedundantModifier2.kt
+++ b/idea/testData/quickfix/modifiers/removeRedundantModifier2.kt
@@ -7,4 +7,3 @@ abstract class A() : B() {
     abstract <caret>open override fun foo()
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeRedundantModifier2.kt.after b/idea/testData/quickfix/modifiers/removeRedundantModifier2.kt.after
index d2793d1d8f0..c7e545395cd 100644
--- a/idea/testData/quickfix/modifiers/removeRedundantModifier2.kt.after
+++ b/idea/testData/quickfix/modifiers/removeRedundantModifier2.kt.after
@@ -7,4 +7,3 @@ abstract class A() : B() {
     abstract <caret>override fun foo()
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeRedundantModifier3.kt b/idea/testData/quickfix/modifiers/removeRedundantModifier3.kt
index 015edbc3b51..c23e0bd24ea 100644
--- a/idea/testData/quickfix/modifiers/removeRedundantModifier3.kt
+++ b/idea/testData/quickfix/modifiers/removeRedundantModifier3.kt
@@ -7,4 +7,3 @@ abstract class A() : B() {
     abstract override <caret>open fun foo()
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeRedundantModifier3.kt.after b/idea/testData/quickfix/modifiers/removeRedundantModifier3.kt.after
index ab85cc6330e..f3b75288c7b 100644
--- a/idea/testData/quickfix/modifiers/removeRedundantModifier3.kt.after
+++ b/idea/testData/quickfix/modifiers/removeRedundantModifier3.kt.after
@@ -7,4 +7,3 @@ abstract class A() : B() {
     abstract override<caret> fun foo()
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeSupertype1.kt b/idea/testData/quickfix/modifiers/removeSupertype1.kt
index e58abb36861..864ec8a8c26 100644
--- a/idea/testData/quickfix/modifiers/removeSupertype1.kt
+++ b/idea/testData/quickfix/modifiers/removeSupertype1.kt
@@ -2,3 +2,5 @@
 open class C1 {}
 open class C2 {}
 class C3: C1(), C2<caret>() {}
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeSupertype1.kt.after b/idea/testData/quickfix/modifiers/removeSupertype1.kt.after
index 9cbe42b8e17..e8de75ed7a2 100644
--- a/idea/testData/quickfix/modifiers/removeSupertype1.kt.after
+++ b/idea/testData/quickfix/modifiers/removeSupertype1.kt.after
@@ -2,3 +2,5 @@
 open class C1 {}
 open class C2 {}
 class C3: C1() {}
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeSupertype2.kt b/idea/testData/quickfix/modifiers/removeSupertype2.kt
index ce761405c83..99bd8192b8f 100644
--- a/idea/testData/quickfix/modifiers/removeSupertype2.kt
+++ b/idea/testData/quickfix/modifiers/removeSupertype2.kt
@@ -2,3 +2,5 @@
 open class C1 {}
 open class C2 {}
 class C3: C1(),C2<caret>() {}
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeSupertype2.kt.after b/idea/testData/quickfix/modifiers/removeSupertype2.kt.after
index 9cbe42b8e17..e8de75ed7a2 100644
--- a/idea/testData/quickfix/modifiers/removeSupertype2.kt.after
+++ b/idea/testData/quickfix/modifiers/removeSupertype2.kt.after
@@ -2,3 +2,5 @@
 open class C1 {}
 open class C2 {}
 class C3: C1() {}
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeSupertype3.kt b/idea/testData/quickfix/modifiers/removeSupertype3.kt
index 50b3f8bf5df..95e69efed0d 100644
--- a/idea/testData/quickfix/modifiers/removeSupertype3.kt
+++ b/idea/testData/quickfix/modifiers/removeSupertype3.kt
@@ -2,3 +2,5 @@
 open class C1 {}
 open class C2 {}
 class C3: C1(), C2<caret> {}
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeSupertype3.kt.after b/idea/testData/quickfix/modifiers/removeSupertype3.kt.after
index 9cbe42b8e17..e8de75ed7a2 100644
--- a/idea/testData/quickfix/modifiers/removeSupertype3.kt.after
+++ b/idea/testData/quickfix/modifiers/removeSupertype3.kt.after
@@ -2,3 +2,5 @@
 open class C1 {}
 open class C2 {}
 class C3: C1() {}
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeSupertype4.kt b/idea/testData/quickfix/modifiers/removeSupertype4.kt
index fc82fe021df..9053ee289c6 100644
--- a/idea/testData/quickfix/modifiers/removeSupertype4.kt
+++ b/idea/testData/quickfix/modifiers/removeSupertype4.kt
@@ -2,3 +2,5 @@
 open class C1 {}
 open class C2 {}
 class C3: C1(), /* Hello, world! */ C2<caret>() {}
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/removeSupertype4.kt.after b/idea/testData/quickfix/modifiers/removeSupertype4.kt.after
index 5f8c8de880e..15dcde20f50 100644
--- a/idea/testData/quickfix/modifiers/removeSupertype4.kt.after
+++ b/idea/testData/quickfix/modifiers/removeSupertype4.kt.after
@@ -2,3 +2,5 @@
 open class C1 {}
 open class C2 {}
 class C3: C1() /* Hello, world! */ {}
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/visibilityModifer1.kt b/idea/testData/quickfix/modifiers/visibilityModifer1.kt
index 35dd2cfa18e..840ed63bc59 100644
--- a/idea/testData/quickfix/modifiers/visibilityModifer1.kt
+++ b/idea/testData/quickfix/modifiers/visibilityModifer1.kt
@@ -6,3 +6,5 @@ open class A {
 class B : A() {
     <caret>private override fun run() {}
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/visibilityModifer1.kt.after b/idea/testData/quickfix/modifiers/visibilityModifer1.kt.after
index 7fdf4b81e3c..78c6b4a8a59 100644
--- a/idea/testData/quickfix/modifiers/visibilityModifer1.kt.after
+++ b/idea/testData/quickfix/modifiers/visibilityModifer1.kt.after
@@ -6,3 +6,5 @@ open class A {
 class B : A() {
     <caret>override fun run() {}
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/visibilityModifer2.kt b/idea/testData/quickfix/modifiers/visibilityModifer2.kt
index c8666318f8c..7a47d4ac9ac 100644
--- a/idea/testData/quickfix/modifiers/visibilityModifer2.kt
+++ b/idea/testData/quickfix/modifiers/visibilityModifer2.kt
@@ -6,3 +6,5 @@ open class A {
 class B : A() {
     <caret>internal override fun run() {}
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/visibilityModifer2.kt.after b/idea/testData/quickfix/modifiers/visibilityModifer2.kt.after
index 7fdf4b81e3c..78c6b4a8a59 100644
--- a/idea/testData/quickfix/modifiers/visibilityModifer2.kt.after
+++ b/idea/testData/quickfix/modifiers/visibilityModifer2.kt.after
@@ -6,3 +6,5 @@ open class A {
 class B : A() {
     <caret>override fun run() {}
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt b/idea/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt
index e3ee6d4b6aa..c45a7ac0261 100644
--- a/idea/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt
+++ b/idea/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt
@@ -5,3 +5,5 @@ abstract class C : ClassLoader() {
         throw ClassNotFoundException(var1)
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt.after b/idea/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt.after
index 11cefc6b74d..400f9b39fb8 100644
--- a/idea/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt.after
+++ b/idea/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt.after
@@ -5,3 +5,5 @@ abstract class C : ClassLoader() {
         throw ClassNotFoundException(var1)
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/visibilityModiferParameter.kt b/idea/testData/quickfix/modifiers/visibilityModiferParameter.kt
index 9234208cad9..07060ec18e6 100644
--- a/idea/testData/quickfix/modifiers/visibilityModiferParameter.kt
+++ b/idea/testData/quickfix/modifiers/visibilityModiferParameter.kt
@@ -6,4 +6,5 @@ interface ParseResult<out T> {
 
 class Success<T>(<caret>internal override val value : T) : ParseResult<T> {
     public override val success : Boolean = true
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/visibilityModiferParameter.kt.after b/idea/testData/quickfix/modifiers/visibilityModiferParameter.kt.after
index cb96898da65..8e272708ce6 100644
--- a/idea/testData/quickfix/modifiers/visibilityModiferParameter.kt.after
+++ b/idea/testData/quickfix/modifiers/visibilityModiferParameter.kt.after
@@ -6,4 +6,5 @@ interface ParseResult<out T> {
 
 class Success<T>(override val value : T) : ParseResult<T> {
     public override val success : Boolean = true
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/withAnnotationAndBlockComment.kt b/idea/testData/quickfix/modifiers/withAnnotationAndBlockComment.kt
index b62e80d58d3..c7bd8d9745a 100644
--- a/idea/testData/quickfix/modifiers/withAnnotationAndBlockComment.kt
+++ b/idea/testData/quickfix/modifiers/withAnnotationAndBlockComment.kt
@@ -2,4 +2,5 @@
 
 @Deprecated("")
 /* some comment */
-final<caret> val x: Int = 42
\ No newline at end of file
+final<caret> val x: Int = 42
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/withAnnotationAndBlockComment.kt.after b/idea/testData/quickfix/modifiers/withAnnotationAndBlockComment.kt.after
index b0b1a528500..bda4dbeac4e 100644
--- a/idea/testData/quickfix/modifiers/withAnnotationAndBlockComment.kt.after
+++ b/idea/testData/quickfix/modifiers/withAnnotationAndBlockComment.kt.after
@@ -2,4 +2,5 @@
 
 @Deprecated("")
 /* some comment */
-val x: Int = 42
\ No newline at end of file
+val x: Int = 42
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/withAnnotationAndEolComment.kt b/idea/testData/quickfix/modifiers/withAnnotationAndEolComment.kt
index 297048a649c..de98137b0a2 100644
--- a/idea/testData/quickfix/modifiers/withAnnotationAndEolComment.kt
+++ b/idea/testData/quickfix/modifiers/withAnnotationAndEolComment.kt
@@ -1,4 +1,5 @@
 // "Remove 'final' modifier" "true"
 
 @Deprecated("") //some comment
-final<caret> val x: Int = 42
\ No newline at end of file
+final<caret> val x: Int = 42
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/withAnnotationAndEolComment.kt.after b/idea/testData/quickfix/modifiers/withAnnotationAndEolComment.kt.after
index fad2b93404b..3e5e2814f65 100644
--- a/idea/testData/quickfix/modifiers/withAnnotationAndEolComment.kt.after
+++ b/idea/testData/quickfix/modifiers/withAnnotationAndEolComment.kt.after
@@ -1,4 +1,5 @@
 // "Remove 'final' modifier" "true"
 
 @Deprecated("") //some comment
-val x: Int = 42
\ No newline at end of file
+val x: Int = 42
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/withAnnotationAndEolComment2.kt b/idea/testData/quickfix/modifiers/withAnnotationAndEolComment2.kt
index 65a22ffd5cd..df39ca88422 100644
--- a/idea/testData/quickfix/modifiers/withAnnotationAndEolComment2.kt
+++ b/idea/testData/quickfix/modifiers/withAnnotationAndEolComment2.kt
@@ -3,4 +3,5 @@
 class A() {
     @Deprecated("") // wd
     final<caret> constructor(i: Int): this()
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/withAnnotationAndEolComment2.kt.after b/idea/testData/quickfix/modifiers/withAnnotationAndEolComment2.kt.after
index df38aaabde9..8a816fca894 100644
--- a/idea/testData/quickfix/modifiers/withAnnotationAndEolComment2.kt.after
+++ b/idea/testData/quickfix/modifiers/withAnnotationAndEolComment2.kt.after
@@ -3,4 +3,5 @@
 class A() {
     @Deprecated("") // wd
     constructor(i: Int): this()
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/withAnnotationAndEolComment3.kt b/idea/testData/quickfix/modifiers/withAnnotationAndEolComment3.kt
index a3ff44a807a..68e1aeb128d 100644
--- a/idea/testData/quickfix/modifiers/withAnnotationAndEolComment3.kt
+++ b/idea/testData/quickfix/modifiers/withAnnotationAndEolComment3.kt
@@ -3,4 +3,5 @@
 class A @Deprecated("") // ds
 final<caret> constructor() {
 
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/modifiers/withAnnotationAndEolComment3.kt.after b/idea/testData/quickfix/modifiers/withAnnotationAndEolComment3.kt.after
index 63111261913..7ed6b9ff6a3 100644
--- a/idea/testData/quickfix/modifiers/withAnnotationAndEolComment3.kt.after
+++ b/idea/testData/quickfix/modifiers/withAnnotationAndEolComment3.kt.after
@@ -3,4 +3,5 @@
 class A @Deprecated("") // ds
 constructor() {
 
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt
index 10cb1883c83..50d70abb439 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt
@@ -13,4 +13,3 @@ interface B {
 interface C : A, B {
     override val x: (Int) -> Int<caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
index 6d3570592f0..113219068dc 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
@@ -11,4 +11,3 @@ interface B {
 interface C : A, B {
     override var x: String<caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt
index 075269abaf5..e816c04d94e 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt
@@ -11,4 +11,3 @@ interface B {
 interface C : A, B {
     override var x: Int<caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt
index 37bd96308e2..32145cbb599 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt
@@ -12,4 +12,3 @@ interface C : A, B {
     override fun foo(): <caret>Long
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt
index 1e187fe1e1b..4ea171c2bf5 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt
@@ -10,4 +10,3 @@ interface B {
 interface C : A, B {
     override val x: (Int) -> Int<caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt.after
index 83da809265b..f409fb340be 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt.after
@@ -10,4 +10,3 @@ interface B {
 interface C : A, B {
     override val x: (Int) -> Int<caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt
index c082b2f3fed..e2b7c242d19 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt
@@ -10,4 +10,3 @@ interface B {
 interface C : A, B {
     override var x: String<caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt.after
index bf18edd4403..f1b47a9fed6 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt.after
@@ -10,4 +10,3 @@ interface B {
 interface C : A, B {
     override var x: String<caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt
index 1cef1779410..2254425e07b 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt
@@ -4,4 +4,3 @@ interface A {
 }
 
 class B(override val x: Any<caret>) : A
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt.after
index 514c75a7212..e8b79be0cff 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyTypeFromCtorParameter.kt.after
@@ -4,4 +4,3 @@ interface A {
 }
 
 class B(override val x: Any) : A
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt
index 6526345d0cb..1ccbca6bc05 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt
@@ -4,4 +4,3 @@ interface A {
 }
 
 class B(override val x: Any<caret>) : A
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt.after
index a3e545ea382..3183dcae72c 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingCtorParameterType.kt.after
@@ -4,4 +4,3 @@ interface A {
 }
 
 class B(override val x: CharSequence) : A
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt
index 17e1f5f0eb7..90af5b2e5a0 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt
@@ -5,4 +5,3 @@ interface A {
 interface B : A {
     override var x: (Int) -> String<caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt.after
index 0e3256ca2c4..1ef655603f9 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt.after
@@ -5,4 +5,3 @@ interface A {
 interface B : A {
     override var x: (String) -> Int
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt
index a0fd8f8fb31..e93cf797164 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt
@@ -10,4 +10,3 @@ interface B {
 interface C : A, B {
     override fun foo(): Long<caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after
index a0138984cc7..5f5ed48c302 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after
@@ -10,4 +10,3 @@ interface B {
 interface C : A, B {
     override fun foo(): Long<caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt
index 3cecf7dc09d..920a6d858f4 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt
@@ -9,3 +9,5 @@ fun foo() {
         override fun foo(): Boolean?<caret> = true
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt.after
index 1f87a4af752..ce5ce098b31 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt.after
@@ -9,3 +9,5 @@ fun foo() {
         override fun foo(): Boolean = true
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt
index 83204370b0e..f78be1f0e2a 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt
@@ -10,4 +10,5 @@ class Other {
             override val <caret>prop = null
         }
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt.after
index 5b0332f87c9..5bace62805b 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt.after
@@ -10,4 +10,5 @@ class Other {
             override val prop: Int = null
         }
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt
index b3e9e11804d..427aaf0cd7b 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt
@@ -6,4 +6,3 @@ interface X {
 class A : X {
     override val x: Number<caret> = 42
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt.after
index 0f0a2a821c8..ec6618883f9 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt.after
@@ -6,4 +6,3 @@ interface X {
 class A : X {
     override val x: Int = 42
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt
index dbb82a6de7f..1664cd02def 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt
@@ -7,4 +7,3 @@ abstract class B : A() {
     override abstract var x: Long<caret>
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt.after
index 05e3ca665b8..ebde6948b18 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt.after
@@ -7,4 +7,3 @@ abstract class B : A() {
     override abstract var x: Int
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt
index 94cb2386cbe..dfa17da3075 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt
@@ -6,3 +6,5 @@ abstract class A {
 abstract class B : A() {
     override abstract var x<caret>
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt.after
index 9c0f78ab10e..252384e43c8 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt.after
@@ -6,3 +6,5 @@ abstract class A {
 abstract class B : A() {
     override abstract var x<caret>: Int
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt
index 1b021c9663c..96d355b8678 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt
@@ -14,4 +14,3 @@ abstract class B : A(), X {
     override abstract fun foo(): Int<caret>
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after
index 9aff6772d70..e6348da5581 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after
@@ -14,4 +14,3 @@ abstract class B : A(), X {
     override abstract fun foo(): T
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt
index 782b7f687cb..4a6b63a6f6b 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt
@@ -14,4 +14,3 @@ interface X {
 abstract class B : A(), X {
     abstract override fun foo() : String<caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt
index 7c6be0bd4eb..723b3c8d472 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt
@@ -7,4 +7,3 @@ abstract class B : A() {
     abstract override fun foo(): Long<caret>
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after
index f41241f90a3..87c3b592f90 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after
@@ -7,4 +7,3 @@ abstract class B : A() {
     abstract override fun foo(): Int
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt
index 730fd6cc17d..aac5e611d0d 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt
@@ -7,4 +7,3 @@ abstract class B : A() {
     abstract override fun foo<caret>()
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after
index 01953ef3c79..6525af858e8 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after
@@ -7,4 +7,3 @@ abstract class B : A() {
     abstract override fun foo<caret>(): Int
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt
index 1b570f38605..769c8fab18b 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt
@@ -3,4 +3,3 @@ abstract class A : java.util.Iterator<Int> {
     public abstract override fun remove() : Int<caret>;
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after
index 98807e59771..91769b64e82 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after
@@ -3,4 +3,3 @@ abstract class A : java.util.Iterator<Int> {
     public abstract override fun remove();
 }
 
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/apply.kt b/idea/testData/quickfix/replaceWithSafeCall/apply.kt
index a795c761687..14997d21f8e 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/apply.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/apply.kt
@@ -5,4 +5,3 @@ fun foo(a: String?) {
         this<caret>.length
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/apply.kt.after b/idea/testData/quickfix/replaceWithSafeCall/apply.kt.after
index 25afc8d306d..0793e6a0023 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/apply.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/apply.kt.after
@@ -5,4 +5,3 @@ fun foo(a: String?) {
         this?.length
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameter.kt b/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameter.kt
index 6bc5cbe1deb..6d3829be6af 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameter.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameter.kt
@@ -5,4 +5,3 @@ fun foo(a: String?) {
         <caret>length
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameter.kt.after b/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameter.kt.after
index 3697f07ca83..b1a64d074b0 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameter.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameter.kt.after
@@ -5,4 +5,3 @@ fun foo(a: String?) {
         this?.length
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt b/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt
index 9b8aba9f9e1..2aecfc2d7ff 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt
@@ -4,4 +4,5 @@ fun foo(a: String?) {
     a.apply {
         <caret>toLowerCase()
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt.after b/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt.after
index bbda28a0a3c..b113c4f8b1c 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt.after
@@ -4,4 +4,5 @@ fun foo(a: String?) {
     a.apply {
         this?.toLowerCase()
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/assignment.kt b/idea/testData/quickfix/replaceWithSafeCall/assignment.kt
index d52c9faa961..87fad5ffe9e 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/assignment.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/assignment.kt
@@ -5,4 +5,3 @@ var i = 0
 fun foo(s: String?) {
     i = s<caret>.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/assignment.kt.after b/idea/testData/quickfix/replaceWithSafeCall/assignment.kt.after
index 1404a9ac863..bab91c0d4ee 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/assignment.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/assignment.kt.after
@@ -5,4 +5,3 @@ var i = 0
 fun foo(s: String?) {
     i = s?.length ?: <caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/assignmentFromImplicitParameter.kt b/idea/testData/quickfix/replaceWithSafeCall/assignmentFromImplicitParameter.kt
index 966938626ad..ab048ed1b38 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/assignmentFromImplicitParameter.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/assignmentFromImplicitParameter.kt
@@ -7,4 +7,3 @@ fun foo(a: String?) {
         i = <caret>length
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/assignmentFromImplicitParameter.kt.after b/idea/testData/quickfix/replaceWithSafeCall/assignmentFromImplicitParameter.kt.after
index 09382eff2e3..c5f7291f486 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/assignmentFromImplicitParameter.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/assignmentFromImplicitParameter.kt.after
@@ -7,4 +7,3 @@ fun foo(a: String?) {
         i = this?.length ?: <caret>
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/assignmentToNullable.kt b/idea/testData/quickfix/replaceWithSafeCall/assignmentToNullable.kt
index 04ca582c192..716090ae6be 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/assignmentToNullable.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/assignmentToNullable.kt
@@ -5,4 +5,3 @@ var i: Int? = 0
 fun foo(s: String?) {
     i = s<caret>.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/assignmentToNullable.kt.after b/idea/testData/quickfix/replaceWithSafeCall/assignmentToNullable.kt.after
index d84e5b98096..f24e2c67bd5 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/assignmentToNullable.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/assignmentToNullable.kt.after
@@ -5,4 +5,3 @@ var i: Int? = 0
 fun foo(s: String?) {
     i = s?.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/assignmentToProperty.kt b/idea/testData/quickfix/replaceWithSafeCall/assignmentToProperty.kt
index cb65459ca9a..43a0fcc1422 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/assignmentToProperty.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/assignmentToProperty.kt
@@ -3,4 +3,3 @@
 class T(s: String?) {
     var i: Int = s<caret>.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/assignmentToProperty.kt.after b/idea/testData/quickfix/replaceWithSafeCall/assignmentToProperty.kt.after
index 0faf1fce0dc..51bc4ba87e9 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/assignmentToProperty.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/assignmentToProperty.kt.after
@@ -3,4 +3,3 @@
 class T(s: String?) {
     var i: Int = s?.length ?: <caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.kt b/idea/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.kt
index 3ffa75e66b1..6c3509b89da 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.kt
@@ -3,4 +3,3 @@
 class T(s: String?) {
     var i = s<caret>.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.kt.after b/idea/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.kt.after
index 35fa4f738e5..cb493a40042 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.kt.after
@@ -3,4 +3,3 @@
 class T(s: String?) {
     var i = s?.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.kt.fir.after b/idea/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.kt.fir.after
index 33fb3a59a34..fc544eb6131 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.kt.fir.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.kt.fir.after
@@ -3,4 +3,3 @@
 class T(s: String?) {
     var i = s?.length ?: <caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/comment.kt b/idea/testData/quickfix/replaceWithSafeCall/comment.kt
index 8f48b917d5d..f190ddcb7fe 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/comment.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/comment.kt
@@ -5,4 +5,3 @@ fun foo(a: String?) {
             // comment2
             .<caret>length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/comment.kt.after b/idea/testData/quickfix/replaceWithSafeCall/comment.kt.after
index 2b50aa5091c..63a532de106 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/comment.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/comment.kt.after
@@ -5,4 +5,3 @@ fun foo(a: String?) {
         // comment2
         ?.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/comment.kt.fir.after b/idea/testData/quickfix/replaceWithSafeCall/comment.kt.fir.after
index f4a8b8f67a7..ab37d0c7951 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/comment.kt.fir.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/comment.kt.fir.after
@@ -5,4 +5,3 @@ fun foo(a: String?) {
         // comment2
         ?.length ?: <caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/expression.kt b/idea/testData/quickfix/replaceWithSafeCall/expression.kt
index 3fa1d752e4a..1020d16507a 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/expression.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/expression.kt
@@ -3,4 +3,3 @@
 fun foo(s: String?) {
     1 + s<caret>.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/expression.kt.after b/idea/testData/quickfix/replaceWithSafeCall/expression.kt.after
index b4aa12ccd92..b2fe615ea6f 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/expression.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/expression.kt.after
@@ -3,4 +3,3 @@
 fun foo(s: String?) {
     1 + (s?.length ?: <caret>)
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/extFunction.kt b/idea/testData/quickfix/replaceWithSafeCall/extFunction.kt
index 61e65674de0..9b4a5820602 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/extFunction.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/extFunction.kt
@@ -2,4 +2,5 @@
 // WITH_RUNTIME
 fun String?.foo() {
     <caret>toLowerCase()
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/extFunction.kt.after b/idea/testData/quickfix/replaceWithSafeCall/extFunction.kt.after
index 7d18b9a606f..d78f8701b41 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/extFunction.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/extFunction.kt.after
@@ -2,4 +2,5 @@
 // WITH_RUNTIME
 fun String?.foo() {
     this?.toLowerCase()
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/functionCall.kt b/idea/testData/quickfix/replaceWithSafeCall/functionCall.kt
index e3143b81dcc..55403656a47 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/functionCall.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/functionCall.kt
@@ -2,4 +2,5 @@
 // WITH_RUNTIME
 fun foo(a: String?) {
     a<caret>.toLowerCase()
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/functionCall.kt.after b/idea/testData/quickfix/replaceWithSafeCall/functionCall.kt.after
index be4477ffd6e..1ebc2458396 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/functionCall.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/functionCall.kt.after
@@ -2,4 +2,5 @@
 // WITH_RUNTIME
 fun foo(a: String?) {
     a?.toLowerCase()
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBody.kt b/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBody.kt
index 00e6be5e594..32b3937f726 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBody.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBody.kt
@@ -6,4 +6,3 @@
 class T {
     fun foo(s: String?): Int = s<caret>.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBody.kt.after b/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBody.kt.after
index 117f087173e..7cca0792127 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBody.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBody.kt.after
@@ -6,4 +6,3 @@
 class T {
     fun foo(s: String?): Int = s?.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBody.kt.fir.after b/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBody.kt.fir.after
index aea00874402..3294f448eb4 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBody.kt.fir.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBody.kt.fir.after
@@ -6,4 +6,3 @@
 class T {
     fun foo(s: String?): Int = s?.length ?: <caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.kt b/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.kt
index 18f796f9ef8..4f5456a0499 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.kt
@@ -3,4 +3,3 @@
 class T {
     fun foo(s: String?) = s<caret>.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.kt.after b/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.kt.after
index dad32eb52e0..cb7a17f0d88 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.kt.after
@@ -3,4 +3,3 @@
 class T {
     fun foo(s: String?) = s?.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.kt.fir.after b/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.kt.fir.after
index 774e80998b1..0b2fa11df2e 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.kt.fir.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.kt.fir.after
@@ -3,4 +3,3 @@
 class T {
     fun foo(s: String?) = s?.length ?: <caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/hasElvis.kt b/idea/testData/quickfix/replaceWithSafeCall/hasElvis.kt
index 9d08c97c707..ffc14fcd35c 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/hasElvis.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/hasElvis.kt
@@ -8,4 +8,3 @@ fun main() {
 fun foo(): String? {
     return ""
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/hasElvis.kt.after b/idea/testData/quickfix/replaceWithSafeCall/hasElvis.kt.after
index 2ed06f986dd..71ffbd6a0b0 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/hasElvis.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/hasElvis.kt.after
@@ -8,4 +8,3 @@ fun main() {
 fun foo(): String? {
     return ""
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/hasElvis2.kt b/idea/testData/quickfix/replaceWithSafeCall/hasElvis2.kt
index 620680d9fc7..0ceb7cda735 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/hasElvis2.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/hasElvis2.kt
@@ -7,4 +7,3 @@ fun foo(a: String?) {
         i = <caret>length ?: 0
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/hasElvis2.kt.after b/idea/testData/quickfix/replaceWithSafeCall/hasElvis2.kt.after
index 2fa7177fe6e..d95196db153 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/hasElvis2.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/hasElvis2.kt.after
@@ -7,4 +7,3 @@ fun foo(a: String?) {
         i = this?.length ?: 0
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/invokeOperator.kt b/idea/testData/quickfix/replaceWithSafeCall/invokeOperator.kt
index 619b9d95a60..0faa11abc00 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/invokeOperator.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/invokeOperator.kt
@@ -3,4 +3,5 @@
 
 val functions: Map<String, () -> Any> = TODO()
 
-fun run(name: String) = functions[name]<caret>()
\ No newline at end of file
+fun run(name: String) = functions[name]<caret>()
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/invokeOperator.kt.after b/idea/testData/quickfix/replaceWithSafeCall/invokeOperator.kt.after
index 1dca1c89038..5c5b42f1ffd 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/invokeOperator.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/invokeOperator.kt.after
@@ -3,4 +3,5 @@
 
 val functions: Map<String, () -> Any> = TODO()
 
-fun run(name: String) = functions[name]?.invoke()
\ No newline at end of file
+fun run(name: String) = functions[name]?.invoke()
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/let.kt b/idea/testData/quickfix/replaceWithSafeCall/let.kt
index 43c5b3dbe5d..34aec420695 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/let.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/let.kt
@@ -5,4 +5,3 @@ fun foo(a: String?) {
         it<caret>.length
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/let.kt.after b/idea/testData/quickfix/replaceWithSafeCall/let.kt.after
index f3f835bc5c2..9d974014db5 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/let.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/let.kt.after
@@ -5,4 +5,3 @@ fun foo(a: String?) {
         it?.length
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/letWithParameter.kt b/idea/testData/quickfix/replaceWithSafeCall/letWithParameter.kt
index 521cf774c4b..d08a42c4aad 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/letWithParameter.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/letWithParameter.kt
@@ -5,4 +5,3 @@ fun foo(a: String?) {
         b<caret>.length
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/letWithParameter.kt.after b/idea/testData/quickfix/replaceWithSafeCall/letWithParameter.kt.after
index 2ae7d7eb12c..aa5f6728536 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/letWithParameter.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/letWithParameter.kt.after
@@ -5,4 +5,3 @@ fun foo(a: String?) {
         b?.length
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt b/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt
index dde03f04af6..926c81251e4 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt
@@ -4,4 +4,3 @@ fun foo(a: String?) {
     val b = a
             .<caret>length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt.after b/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt.after
index 19f89e8c0e3..5bbff87b508 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt.after
@@ -4,4 +4,3 @@ fun foo(a: String?) {
     val b = a
         ?.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt.fir.after b/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt.fir.after
index 953fcb4017e..5ad94acb1bf 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt.fir.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt.fir.after
@@ -4,4 +4,3 @@ fun foo(a: String?) {
     val b = a
         ?.length ?: <caret>
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/noReplaceWithSafeCallForImplicitReceiver.kt b/idea/testData/quickfix/replaceWithSafeCall/noReplaceWithSafeCallForImplicitReceiver.kt
index 22c0a973fcd..1710a851243 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/noReplaceWithSafeCallForImplicitReceiver.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/noReplaceWithSafeCallForImplicitReceiver.kt
@@ -11,4 +11,3 @@ class A {
 fun A?.bar() {
     <caret>foo()
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/normal.kt b/idea/testData/quickfix/replaceWithSafeCall/normal.kt
index c4b4ad58639..1cc38c3c254 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/normal.kt
+++ b/idea/testData/quickfix/replaceWithSafeCall/normal.kt
@@ -3,4 +3,3 @@
 fun foo(a: String?) {
     a<caret>.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/replaceWithSafeCall/normal.kt.after b/idea/testData/quickfix/replaceWithSafeCall/normal.kt.after
index 4fb00700edc..69db62ffd7f 100644
--- a/idea/testData/quickfix/replaceWithSafeCall/normal.kt.after
+++ b/idea/testData/quickfix/replaceWithSafeCall/normal.kt.after
@@ -3,4 +3,3 @@
 fun foo(a: String?) {
     a?.length
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt b/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt
index fca4b54b853..7a0a60297cd 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt
@@ -2,4 +2,3 @@
 object Test {
     <caret>const var foo = "123"
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt.after b/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt.after
index d277769653a..f528008a98e 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt.after
@@ -2,4 +2,3 @@
 object Test {
     <caret>const val foo = "123"
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt b/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt
index de55239102a..005f8e9c308 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt
@@ -9,4 +9,5 @@ class Delegate {
     operator fun getValue(thisRef: Any?, property: KProperty<*>): String {
         return ""
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt.after b/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt.after
index 890e65269ca..b0392df3d81 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt.after
@@ -9,4 +9,5 @@ class Delegate {
     operator fun getValue(thisRef: Any?, property: KProperty<*>): String {
         return ""
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty2.kt b/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty2.kt
index c6ddffda71e..79d5c065432 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty2.kt
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty2.kt
@@ -13,4 +13,3 @@ class Delegate {
     operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) {
     }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty3.kt b/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty3.kt
index a6bcd6463c5..30aced76a60 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty3.kt
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty3.kt
@@ -11,4 +11,3 @@ fun test() {
 }
 
 class Delegate
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt b/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt
index e01f9a3d049..c50fab0b898 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt
@@ -6,4 +6,5 @@ fun foo(p: Int) {
 
 fun getPair(): Pair<Int, String>? = null
 
-data class Pair<T1, T2>(val a: T1, val b: T2)
\ No newline at end of file
+data class Pair<T1, T2>(val a: T1, val b: T2)
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt.after b/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt.after
index 27188d60c38..78b41d0bd0e 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt.after
@@ -6,4 +6,5 @@ fun foo(p: Int) {
 
 fun getPair(): Pair<Int, String>? = null
 
-data class Pair<T1, T2>(val a: T1, val b: T2)
\ No newline at end of file
+data class Pair<T1, T2>(val a: T1, val b: T2)
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt b/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt
index e5a59a76fc6..ebafd0cd7d8 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt
@@ -2,4 +2,5 @@
 fun foo(p: Int) {
     <caret>var v: Int
     if (p > 0) v = 1 else v = 2
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt.after b/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt.after
index a485bb36c39..6fa1eabbf42 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt.after
@@ -2,4 +2,5 @@
 fun foo(p: Int) {
     <caret>val v: Int
     if (p > 0) v = 1 else v = 2
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt b/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt
index f73c8ca0dc4..bd4ca32c12b 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt
@@ -3,4 +3,4 @@ class Test {
     var foo<caret>
         get() = 1
 }
-/* FIR_COMPARISON */
\ No newline at end of file
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt.after b/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt.after
index 3d50e991052..faf4980f5f6 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt.after
@@ -3,4 +3,4 @@ class Test {
     val foo
         get() = 1
 }
-/* FIR_COMPARISON */
\ No newline at end of file
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter2.kt b/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter2.kt
index 32becf0fb39..b1e88e3ce65 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter2.kt
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter2.kt
@@ -5,4 +5,3 @@ class Test {
             return 1
         }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter2.kt.after b/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter2.kt.after
index 7c128835a47..9907b3b3507 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter2.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter2.kt.after
@@ -5,4 +5,3 @@ class Test {
             return 1
         }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter3.kt b/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter3.kt
index 7592e7641b9..06672daa5ee 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter3.kt
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter3.kt
@@ -12,4 +12,3 @@ class Test {
             return 1
         }
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt b/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt
index 3a3c160f4f1..34447905c3f 100644
--- a/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt
+++ b/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt
@@ -13,4 +13,5 @@ class Test {
         a = "2"
         t.some()
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt.after b/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt.after
index e3c3d805144..bfad055f285 100644
--- a/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt.after
@@ -13,4 +13,5 @@ class Test {
         a = "2"
         t.some()
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt b/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt
index 5e86b8120d6..aa2d152855d 100644
--- a/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt
+++ b/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt
@@ -7,3 +7,5 @@ fun foo() {
         <caret>x = 42
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt.after b/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt.after
index 3c3c5798e28..a819856709a 100644
--- a/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt.after
@@ -7,3 +7,5 @@ fun foo() {
         x = 42
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/const.kt b/idea/testData/quickfix/variables/changeMutability/const.kt
index 88f992658e9..b3b5eb65eb4 100644
--- a/idea/testData/quickfix/variables/changeMutability/const.kt
+++ b/idea/testData/quickfix/variables/changeMutability/const.kt
@@ -5,4 +5,5 @@ object A {
     fun foo() {
         <caret>A = 10
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/const.kt.after b/idea/testData/quickfix/variables/changeMutability/const.kt.after
index 47ac9941a04..7522e5ab721 100644
--- a/idea/testData/quickfix/variables/changeMutability/const.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/const.kt.after
@@ -5,4 +5,5 @@ object A {
     fun foo() {
         <caret>A = 10
     }
-}
\ No newline at end of file
+}
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/funParameter.kt b/idea/testData/quickfix/variables/changeMutability/funParameter.kt
index 23c0fa721c8..e8d82bc2fdb 100644
--- a/idea/testData/quickfix/variables/changeMutability/funParameter.kt
+++ b/idea/testData/quickfix/variables/changeMutability/funParameter.kt
@@ -5,4 +5,3 @@
 fun fun1(i: Int) {
     <caret>i = 2
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/localInGetter.kt b/idea/testData/quickfix/variables/changeMutability/localInGetter.kt
index 15ebfa2cc70..99c3489ef2a 100644
--- a/idea/testData/quickfix/variables/changeMutability/localInGetter.kt
+++ b/idea/testData/quickfix/variables/changeMutability/localInGetter.kt
@@ -5,4 +5,5 @@ val String.prop: Int
         val p = 1
         <caret>p = 2
         return p
-    }
\ No newline at end of file
+    }
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/localInGetter.kt.after b/idea/testData/quickfix/variables/changeMutability/localInGetter.kt.after
index 35667705288..1e43111b7c8 100644
--- a/idea/testData/quickfix/variables/changeMutability/localInGetter.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/localInGetter.kt.after
@@ -5,4 +5,5 @@ val String.prop: Int
         var p = 1
         <caret>p = 2
         return p
-    }
\ No newline at end of file
+    }
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt b/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt
index 8d3806e7274..4efa7f93527 100644
--- a/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt
@@ -6,4 +6,3 @@ open class A {
 class B : A() {
     override val<caret> x: Int = 3;
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt.after b/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt.after
index 59f7eee5de8..2718fbf2145 100644
--- a/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt.after
@@ -6,4 +6,3 @@ open class A {
 class B : A() {
     override var x: Int = 3;
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt b/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt
index 5385bf67d29..19ff4f40449 100644
--- a/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt
@@ -4,4 +4,3 @@ open class A {
 }
 
 class B(override val<caret> x: Int) : A()
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt.after b/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt.after
index 0ab7e9d6500..daa3e313d45 100644
--- a/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt.after
@@ -4,4 +4,3 @@ open class A {
 }
 
 class B(override var x: Int) : A()
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt
index a7c153f2b96..e15fb15fd6f 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt
@@ -3,3 +3,5 @@ fun foo() {
     val a = 1
     <caret>a = 3
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after b/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after
index 4e36b226e2f..ba156a3adc9 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after
@@ -3,3 +3,5 @@ fun foo() {
     var a = 1
     <caret>a = 3
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt
index 3cbca54a495..9edc8b6cb5c 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt
@@ -4,3 +4,5 @@ val a = 4
 fun bar() {
     <caret>a = 5
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after b/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after
index bd6d3b89d12..42af51b45ec 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after
@@ -4,3 +4,5 @@ var a = 4
 fun bar() {
     <caret>a = 5
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt
index 72822dad974..b50f00bf664 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt
@@ -6,3 +6,5 @@ class A() {
         <caret>a = 5
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after b/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after
index 5849ec160b2..16592b1088f 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after
@@ -6,3 +6,5 @@ class A() {
         <caret>a = 5
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt
index 29274224a93..1499218fde0 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt
@@ -4,3 +4,5 @@ class A(val a: Int) {
         <caret>a = 5
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt.after b/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt.after
index 9fc90a40948..d75ab3b37fc 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt.after
@@ -4,3 +4,5 @@ class A(var a: Int) {
         a = 5
     }
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt b/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt
index 6f52867c1f4..2ec0e97ae73 100644
--- a/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt
@@ -3,4 +3,3 @@ class A() {
     val a: Int = 0
         <caret>set(v: Int) {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt.after b/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt.after
index f28b66505f5..93426374c12 100644
--- a/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt.after
@@ -3,4 +3,3 @@ class A() {
     var a: Int = 0
         set(v: Int) {}
 }
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/varAnnotationParameter.kt b/idea/testData/quickfix/variables/changeMutability/varAnnotationParameter.kt
index 85eee7c13a0..c425f3f5a99 100644
--- a/idea/testData/quickfix/variables/changeMutability/varAnnotationParameter.kt
+++ b/idea/testData/quickfix/variables/changeMutability/varAnnotationParameter.kt
@@ -3,4 +3,3 @@ annotation class Ann(
     val a: Int,
     var<caret> b: Int
 )
-/* FIR_COMPARISON */
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/varAnnotationParameter.kt.after b/idea/testData/quickfix/variables/changeMutability/varAnnotationParameter.kt.after
index 605d8a3c9fb..5c929af810c 100644
--- a/idea/testData/quickfix/variables/changeMutability/varAnnotationParameter.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/varAnnotationParameter.kt.after
@@ -3,4 +3,3 @@ annotation class Ann(
     val a: Int,
     val b: Int
 )
-/* FIR_COMPARISON */
\ No newline at end of file