diff --git a/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt b/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt
index 14ebf191700..f6ed8ba218b 100644
--- a/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt
+++ b/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt
@@ -1155,7 +1155,9 @@ fun main(args: Array<String>) {
                 model("quickfix/expressions", pattern = pattern, filenameStartsLowerCase = true)
                 model("quickfix/lateinit", pattern = pattern, filenameStartsLowerCase = true)
                 model("quickfix/modifiers", pattern = pattern, filenameStartsLowerCase = true, recursive = false)
+                model("quickfix/nullables/unsafeInfixCall", pattern = pattern, filenameStartsLowerCase = true)
                 model("quickfix/override/typeMismatchOnOverride", pattern = pattern, filenameStartsLowerCase = true, recursive = false)
+                model("quickfix/replaceInfixOrOperatorCall", pattern = pattern, filenameStartsLowerCase = true)
                 model("quickfix/replaceWithDotCall", pattern = pattern, filenameStartsLowerCase = true)
                 model("quickfix/replaceWithSafeCall", pattern = pattern, filenameStartsLowerCase = true)
                 model("quickfix/variables/changeMutability", pattern = pattern, filenameStartsLowerCase = true)
diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java
index 8588c638fe6..7d01a09b7a1 100644
--- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java
+++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java
@@ -1118,6 +1118,79 @@ public class HighLevelQuickFixTestGenerated extends AbstractHighLevelQuickFixTes
         }
     }
 
+    @TestMetadata("idea/testData/quickfix/nullables/unsafeInfixCall")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class UnsafeInfixCall extends AbstractHighLevelQuickFixTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInUnsafeInfixCall() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/quickfix/nullables/unsafeInfixCall"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("noComparison.kt")
+        public void testNoComparison() throws Exception {
+            runTest("idea/testData/quickfix/nullables/unsafeInfixCall/noComparison.kt");
+        }
+
+        @TestMetadata("unsafeComparisonInCondition.kt")
+        public void testUnsafeComparisonInCondition() throws Exception {
+            runTest("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInCondition.kt");
+        }
+
+        @TestMetadata("unsafeComparisonInLogic.kt")
+        public void testUnsafeComparisonInLogic() throws Exception {
+            runTest("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInLogic.kt");
+        }
+
+        @TestMetadata("unsafeComparisonInWhen.kt")
+        public void testUnsafeComparisonInWhen() throws Exception {
+            runTest("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInWhen.kt");
+        }
+
+        @TestMetadata("unsafeComparisonInWhile.kt")
+        public void testUnsafeComparisonInWhile() throws Exception {
+            runTest("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInWhile.kt");
+        }
+
+        @TestMetadata("unsafeGet.kt")
+        public void testUnsafeGet() throws Exception {
+            runTest("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeGet.kt");
+        }
+
+        @TestMetadata("unsafeInfixCall.kt")
+        public void testUnsafeInfixCall() throws Exception {
+            runTest("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt");
+        }
+
+        @TestMetadata("unsafeInvoke.kt")
+        public void testUnsafeInvoke() throws Exception {
+            runTest("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInvoke.kt");
+        }
+
+        @TestMetadata("unsafeInvokeWithImplicitReceiver.kt")
+        public void testUnsafeInvokeWithImplicitReceiver() throws Exception {
+            runTest("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInvokeWithImplicitReceiver.kt");
+        }
+
+        @TestMetadata("unsafeInvokeWithReceiver.kt")
+        public void testUnsafeInvokeWithReceiver() throws Exception {
+            runTest("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInvokeWithReceiver.kt");
+        }
+
+        @TestMetadata("unsafePlus.kt")
+        public void testUnsafePlus() throws Exception {
+            runTest("idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt");
+        }
+
+        @TestMetadata("unsafeSet.kt")
+        public void testUnsafeSet() throws Exception {
+            runTest("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeSet.kt");
+        }
+    }
+
     @TestMetadata("idea/testData/quickfix/override/typeMismatchOnOverride")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -1231,6 +1304,79 @@ public class HighLevelQuickFixTestGenerated extends AbstractHighLevelQuickFixTes
         }
     }
 
+    @TestMetadata("idea/testData/quickfix/replaceInfixOrOperatorCall")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ReplaceInfixOrOperatorCall extends AbstractHighLevelQuickFixTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInReplaceInfixOrOperatorCall() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/quickfix/replaceInfixOrOperatorCall"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("array.kt")
+        public void testArray() throws Exception {
+            runTest("idea/testData/quickfix/replaceInfixOrOperatorCall/array.kt");
+        }
+
+        @TestMetadata("arraySet.kt")
+        public void testArraySet() throws Exception {
+            runTest("idea/testData/quickfix/replaceInfixOrOperatorCall/arraySet.kt");
+        }
+
+        @TestMetadata("assignmentArray.kt")
+        public void testAssignmentArray() throws Exception {
+            runTest("idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentArray.kt");
+        }
+
+        @TestMetadata("assignmentBinaryOperator.kt")
+        public void testAssignmentBinaryOperator() throws Exception {
+            runTest("idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentBinaryOperator.kt");
+        }
+
+        @TestMetadata("assignmentCallExpression.kt")
+        public void testAssignmentCallExpression() throws Exception {
+            runTest("idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentCallExpression.kt");
+        }
+
+        @TestMetadata("assignmentList.kt")
+        public void testAssignmentList() throws Exception {
+            runTest("idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentList.kt");
+        }
+
+        @TestMetadata("augmentedAssignmentAvailable.kt")
+        public void testAugmentedAssignmentAvailable() throws Exception {
+            runTest("idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentAvailable.kt");
+        }
+
+        @TestMetadata("augmentedAssignmentNotAvailable.kt")
+        public void testAugmentedAssignmentNotAvailable() throws Exception {
+            runTest("idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentNotAvailable.kt");
+        }
+
+        @TestMetadata("binaryOperator.kt")
+        public void testBinaryOperator() throws Exception {
+            runTest("idea/testData/quickfix/replaceInfixOrOperatorCall/binaryOperator.kt");
+        }
+
+        @TestMetadata("callExpression.kt")
+        public void testCallExpression() throws Exception {
+            runTest("idea/testData/quickfix/replaceInfixOrOperatorCall/callExpression.kt");
+        }
+
+        @TestMetadata("hasElvis.kt")
+        public void testHasElvis() throws Exception {
+            runTest("idea/testData/quickfix/replaceInfixOrOperatorCall/hasElvis.kt");
+        }
+
+        @TestMetadata("list.kt")
+        public void testList() throws Exception {
+            runTest("idea/testData/quickfix/replaceInfixOrOperatorCall/list.kt");
+        }
+    }
+
     @TestMetadata("idea/testData/quickfix/replaceWithDotCall")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeGet.kt b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeGet.kt
index a39b9af97b9..685ecaa40ef 100644
--- a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeGet.kt
+++ b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeGet.kt
@@ -1,4 +1,6 @@
 // "Replace with safe (?.) 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 */
diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeGet.kt.after b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeGet.kt.after
index cc367c7c68c..8c146c0c154 100644
--- a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeGet.kt.after
+++ b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeGet.kt.after
@@ -1,4 +1,6 @@
 // "Replace with safe (?.) call" "true"
 
 operator fun Int.get(row: Int, column: Int) = this
-fun foo(arg: Int?) = arg?.get(42, 13)
\ No newline at end of file
+fun foo(arg: Int?) = arg?.get(42, 13)
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt
index 96d6df997c8..b1d1b44b4c2 100644
--- a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt
+++ b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt
@@ -1,4 +1,6 @@
 // "Replace with safe (?.) call" "true"
 fun test(a : Int?) : Int? {
     return a <caret>compareTo 6;
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt.after b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt.after
index 98e3dc43801..606cd60e311 100644
--- a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt.after
+++ b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt.after
@@ -1,4 +1,6 @@
 // "Replace with safe (?.) call" "true"
 fun test(a : Int?) : Int? {
     return a?.compareTo(6);
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInvoke.kt b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInvoke.kt
index 1639ac13d73..bf5448f09c2 100644
--- a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInvoke.kt
+++ b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInvoke.kt
@@ -1,3 +1,5 @@
 // "Replace with safe (?.) call" "true"
 
-fun foo(exec: (() -> Unit)?) = exec<caret>()
\ No newline at end of file
+fun foo(exec: (() -> Unit)?) = exec<caret>()
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInvoke.kt.after b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInvoke.kt.after
index 8242b09bf2f..d46ef7dd4ad 100644
--- a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInvoke.kt.after
+++ b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInvoke.kt.after
@@ -1,3 +1,5 @@
 // "Replace with safe (?.) call" "true"
 
-fun foo(exec: (() -> Unit)?) = exec?.invoke()
\ No newline at end of file
+fun foo(exec: (() -> Unit)?) = exec?.invoke()
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt
index 59b788ffef3..0f05fde8352 100644
--- a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt
+++ b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt
@@ -2,3 +2,5 @@
 
 operator fun Int.plus(index: Int) = this
 fun fox(arg: Int?) = arg <caret>+ 42
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt.after b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt.after
index 4ccf9d716ad..145fe220068 100644
--- a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt.after
+++ b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt.after
@@ -2,3 +2,5 @@
 
 operator fun Int.plus(index: Int) = this
 fun fox(arg: Int?) = arg?.plus(42)
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeSet.kt b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeSet.kt
index 99f4c3ecdfe..8ae8a5c9aff 100644
--- a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeSet.kt
+++ b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeSet.kt
@@ -3,4 +3,6 @@
 operator fun Int.set(row: Int, column: Int, value: Int) {}
 fun foo(arg: Int?) {
     arg<caret>[42, 13] = 0
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeSet.kt.after b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeSet.kt.after
index ce2ed0ba5e0..f12d6a643cb 100644
--- a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeSet.kt.after
+++ b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeSet.kt.after
@@ -3,4 +3,6 @@
 operator fun Int.set(row: Int, column: Int, value: Int) {}
 fun foo(arg: Int?) {
     arg?.set(42, 13, 0)
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/array.kt b/idea/testData/quickfix/replaceInfixOrOperatorCall/array.kt
index 0025d4e9dcd..887fefb15d9 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/array.kt
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/array.kt
@@ -3,4 +3,6 @@
 
 fun foo(array: Array<String>?) {
     array<caret>[0]
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/array.kt.after b/idea/testData/quickfix/replaceInfixOrOperatorCall/array.kt.after
index 396d3c95181..7058e19ba5e 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/array.kt.after
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/array.kt.after
@@ -3,4 +3,6 @@
 
 fun foo(array: Array<String>?) {
     array?.get(0)
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/arraySet.kt b/idea/testData/quickfix/replaceInfixOrOperatorCall/arraySet.kt
index 7392346d0cd..40419b6e110 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/arraySet.kt
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/arraySet.kt
@@ -3,4 +3,6 @@
 
 fun foo(array: Array<String>?) {
     array<caret>[0] = ""
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/arraySet.kt.after b/idea/testData/quickfix/replaceInfixOrOperatorCall/arraySet.kt.after
index 2e26bfb9b46..a00d4b46be1 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/arraySet.kt.after
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/arraySet.kt.after
@@ -3,4 +3,6 @@
 
 fun foo(array: Array<String>?) {
     array?.set(0, "")
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentArray.kt b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentArray.kt
index 45596a8c84c..5098dda0737 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentArray.kt
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentArray.kt
@@ -4,4 +4,6 @@
 fun foo(array: Array<String>?) {
     var s = ""
     s = array[0]<caret>
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentArray.kt.after b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentArray.kt.after
index b6e99efceed..3df3fc30e3e 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentArray.kt.after
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentArray.kt.after
@@ -4,4 +4,6 @@
 fun foo(array: Array<String>?) {
     var s = ""
     s = array?.get(0) ?: <caret>
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentBinaryOperator.kt b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentBinaryOperator.kt
index e50130ca160..d62f9e08e55 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentBinaryOperator.kt
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentBinaryOperator.kt
@@ -4,4 +4,6 @@
 fun foo(bar: Int?) {
     var i: Int = 1
     i = bar +<caret> 1
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentBinaryOperator.kt.after b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentBinaryOperator.kt.after
index c20ab0cdd5d..981abb144ec 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentBinaryOperator.kt.after
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentBinaryOperator.kt.after
@@ -4,4 +4,6 @@
 fun foo(bar: Int?) {
     var i: Int = 1
     i = bar?.plus(1) ?: <caret>
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentCallExpression.kt b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentCallExpression.kt
index 8f9864a079a..6e2973812a0 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentCallExpression.kt
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentCallExpression.kt
@@ -5,4 +5,6 @@ fun bar() {
     val fff: (() -> Int)? = { 1 }
     var i: Int = 1
     i = fff<caret>()
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentCallExpression.kt.after b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentCallExpression.kt.after
index 233525ac994..0a5f42658b3 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentCallExpression.kt.after
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentCallExpression.kt.after
@@ -5,4 +5,6 @@ fun bar() {
     val fff: (() -> Int)? = { 1 }
     var i: Int = 1
     i = fff?.invoke() ?: <caret>
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentList.kt b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentList.kt
index a09c7865d4d..702e1e7b444 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentList.kt
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentList.kt
@@ -4,4 +4,6 @@
 fun foo(list: List<String>?) {
     var s = ""
     s = list[0]<caret>
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentList.kt.after b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentList.kt.after
index e140aa8677b..a9e4978985f 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentList.kt.after
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/assignmentList.kt.after
@@ -4,4 +4,6 @@
 fun foo(list: List<String>?) {
     var s = ""
     s = list?.get(0) ?: <caret>
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentAvailable.kt b/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentAvailable.kt
index cd06ccac70b..1d3a88f0689 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentAvailable.kt
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentAvailable.kt
@@ -7,3 +7,5 @@ fun foo(b: A) {
     var a: A? = A()
     a <caret>+= b
 }
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentAvailable.kt.after b/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentAvailable.kt.after
index c0364387381..cd4c520d4fa 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentAvailable.kt.after
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentAvailable.kt.after
@@ -7,3 +7,5 @@ fun foo(b: A) {
     var a: A? = A()
     a?.plusAssign(b)
 }
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentNotAvailable.kt b/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentNotAvailable.kt
index 7c98a33cb72..cb7de177495 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentNotAvailable.kt
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentNotAvailable.kt
@@ -7,3 +7,5 @@ fun foo(b: A) {
     var a: A? = A()
     a <caret>+= b
 }
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentNotAvailable.kt.after b/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentNotAvailable.kt.after
index 9fb804b65e8..ff7f8ce3e9c 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentNotAvailable.kt.after
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/augmentedAssignmentNotAvailable.kt.after
@@ -7,3 +7,5 @@ fun foo(b: A) {
     var a: A? = A()
     a = a?.plus(b)
 }
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/binaryOperator.kt b/idea/testData/quickfix/replaceInfixOrOperatorCall/binaryOperator.kt
index 908b407ad11..1fb4cb003b1 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/binaryOperator.kt
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/binaryOperator.kt
@@ -3,4 +3,6 @@
 
 fun foo(bar: Int?) {
     bar +<caret> 1
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/binaryOperator.kt.after b/idea/testData/quickfix/replaceInfixOrOperatorCall/binaryOperator.kt.after
index 9863dbfce16..9978566f92b 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/binaryOperator.kt.after
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/binaryOperator.kt.after
@@ -3,4 +3,6 @@
 
 fun foo(bar: Int?) {
     bar?.plus(1)
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/callExpression.kt b/idea/testData/quickfix/replaceInfixOrOperatorCall/callExpression.kt
index 3b062c34e48..fc03770bbb4 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/callExpression.kt
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/callExpression.kt
@@ -6,4 +6,6 @@ fun foo() {}
 fun bar() {
     val fff: (() -> Unit)? = ::foo
     <caret>fff()
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/callExpression.kt.after b/idea/testData/quickfix/replaceInfixOrOperatorCall/callExpression.kt.after
index 918037f70b1..288f140be4a 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/callExpression.kt.after
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/callExpression.kt.after
@@ -6,4 +6,6 @@ fun foo() {}
 fun bar() {
     val fff: (() -> Unit)? = ::foo
     fff?.invoke()
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/hasElvis.kt b/idea/testData/quickfix/replaceInfixOrOperatorCall/hasElvis.kt
index dbf659385c4..42639d8732f 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/hasElvis.kt
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/hasElvis.kt
@@ -4,4 +4,6 @@
 fun foo(list: List<String>?) {
     var s = ""
     s = list[0]<caret> ?: ""
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/hasElvis.kt.after b/idea/testData/quickfix/replaceInfixOrOperatorCall/hasElvis.kt.after
index a22be396f5d..5db3803be5b 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/hasElvis.kt.after
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/hasElvis.kt.after
@@ -4,4 +4,6 @@
 fun foo(list: List<String>?) {
     var s = ""
     s = list?.get(0) ?: ""
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/list.kt b/idea/testData/quickfix/replaceInfixOrOperatorCall/list.kt
index 6d9f7595d07..bffa1677fa8 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/list.kt
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/list.kt
@@ -3,4 +3,6 @@
 
 fun foo(list: List<String>?) {
     list<caret>[0]
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/idea/testData/quickfix/replaceInfixOrOperatorCall/list.kt.after b/idea/testData/quickfix/replaceInfixOrOperatorCall/list.kt.after
index e89f33e5cd4..91784c8f413 100644
--- a/idea/testData/quickfix/replaceInfixOrOperatorCall/list.kt.after
+++ b/idea/testData/quickfix/replaceInfixOrOperatorCall/list.kt.after
@@ -3,4 +3,6 @@
 
 fun foo(list: List<String>?) {
     list?.get(0)
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */