diff --git a/idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt b/idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt
index 6ed5f6a63f8..ec1d68f62bd 100644
--- a/idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt
+++ b/idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C {
     compa<caret>object {
 
diff --git a/idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt.after b/idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt.after
index 8ba27acda99..b25bff7c71b 100644
--- a/idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C {
     companion <caret>object {
 
diff --git a/idea/idea-completion/testData/handlers/keywords/Break.kt b/idea/idea-completion/testData/handlers/keywords/Break.kt
index 2ff4566f4b2..40c5a980bae 100644
--- a/idea/idea-completion/testData/handlers/keywords/Break.kt
+++ b/idea/idea-completion/testData/handlers/keywords/Break.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         brea<caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/Break.kt.after b/idea/idea-completion/testData/handlers/keywords/Break.kt.after
index b907313bc9f..ab49b1dbc07 100644
--- a/idea/idea-completion/testData/handlers/keywords/Break.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/Break.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         break<caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/Catch.kt b/idea/idea-completion/testData/handlers/keywords/Catch.kt
index 00fd4e70504..4d5a9941ed7 100644
--- a/idea/idea-completion/testData/handlers/keywords/Catch.kt
+++ b/idea/idea-completion/testData/handlers/keywords/Catch.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         try {
diff --git a/idea/idea-completion/testData/handlers/keywords/Catch.kt.after b/idea/idea-completion/testData/handlers/keywords/Catch.kt.after
index 56f4a3f64ed..40b825a6e45 100644
--- a/idea/idea-completion/testData/handlers/keywords/Catch.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/Catch.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         try {
diff --git a/idea/idea-completion/testData/handlers/keywords/CompanionObject.kt b/idea/idea-completion/testData/handlers/keywords/CompanionObject.kt
index a3b38d64ca4..d27eb06882d 100644
--- a/idea/idea-completion/testData/handlers/keywords/CompanionObject.kt
+++ b/idea/idea-completion/testData/handlers/keywords/CompanionObject.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C {
     compa<caret>
 }
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/keywords/CompanionObject.kt.after b/idea/idea-completion/testData/handlers/keywords/CompanionObject.kt.after
index bc65038821d..a4139d57e0a 100644
--- a/idea/idea-completion/testData/handlers/keywords/CompanionObject.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/CompanionObject.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C {
     companion object<caret>
 }
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/keywords/Constructor.kt b/idea/idea-completion/testData/handlers/keywords/Constructor.kt
index 23d7c08a4c4..2068387c71e 100644
--- a/idea/idea-completion/testData/handlers/keywords/Constructor.kt
+++ b/idea/idea-completion/testData/handlers/keywords/Constructor.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C {
     c<caret>
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/Constructor.kt.after b/idea/idea-completion/testData/handlers/keywords/Constructor.kt.after
index 3a596e7fb67..8632d21cf36 100644
--- a/idea/idea-completion/testData/handlers/keywords/Constructor.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/Constructor.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C {
     constructor(<caret>)
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/ConstructorPrimary.kt b/idea/idea-completion/testData/handlers/keywords/ConstructorPrimary.kt
index aa563807e4b..5e4de530b50 100644
--- a/idea/idea-completion/testData/handlers/keywords/ConstructorPrimary.kt
+++ b/idea/idea-completion/testData/handlers/keywords/ConstructorPrimary.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C c<caret>() {
 
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/ConstructorPrimary.kt.after b/idea/idea-completion/testData/handlers/keywords/ConstructorPrimary.kt.after
index ec6203cb2e6..ec27d7cd9c4 100644
--- a/idea/idea-completion/testData/handlers/keywords/ConstructorPrimary.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/ConstructorPrimary.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C constructor(<caret>) {
 
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/Do.kt b/idea/idea-completion/testData/handlers/keywords/Do.kt
index 95e68317984..62527007b3f 100644
--- a/idea/idea-completion/testData/handlers/keywords/Do.kt
+++ b/idea/idea-completion/testData/handlers/keywords/Do.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     d<caret>
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/Do.kt.after b/idea/idea-completion/testData/handlers/keywords/Do.kt.after
index e5cfc713101..80800cd0e2e 100644
--- a/idea/idea-completion/testData/handlers/keywords/Do.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/Do.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     do {
         <caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/Finally.kt b/idea/idea-completion/testData/handlers/keywords/Finally.kt
index 3178f3c853e..910669b16db 100644
--- a/idea/idea-completion/testData/handlers/keywords/Finally.kt
+++ b/idea/idea-completion/testData/handlers/keywords/Finally.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         try {
diff --git a/idea/idea-completion/testData/handlers/keywords/Finally.kt.after b/idea/idea-completion/testData/handlers/keywords/Finally.kt.after
index 57a698f936c..69bb80c88a5 100644
--- a/idea/idea-completion/testData/handlers/keywords/Finally.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/Finally.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         try {
diff --git a/idea/idea-completion/testData/handlers/keywords/For.kt b/idea/idea-completion/testData/handlers/keywords/For.kt
index 971433e1e08..1623f2e46e6 100644
--- a/idea/idea-completion/testData/handlers/keywords/For.kt
+++ b/idea/idea-completion/testData/handlers/keywords/For.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     f<caret>
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/For.kt.after b/idea/idea-completion/testData/handlers/keywords/For.kt.after
index b1103c4a15e..b08cc2ad638 100644
--- a/idea/idea-completion/testData/handlers/keywords/For.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/For.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     for (<caret>)
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/Getter1.kt b/idea/idea-completion/testData/handlers/keywords/Getter1.kt
index aa9b114edf4..5c51f7a86c9 100644
--- a/idea/idea-completion/testData/handlers/keywords/Getter1.kt
+++ b/idea/idea-completion/testData/handlers/keywords/Getter1.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 val v: Int
     g<caret>
 
diff --git a/idea/idea-completion/testData/handlers/keywords/Getter1.kt.after b/idea/idea-completion/testData/handlers/keywords/Getter1.kt.after
index 5f241e3cb1c..38cf7b1e55b 100644
--- a/idea/idea-completion/testData/handlers/keywords/Getter1.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/Getter1.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 val v: Int
     get() = <caret>
 
diff --git a/idea/idea-completion/testData/handlers/keywords/Getter2.kt b/idea/idea-completion/testData/handlers/keywords/Getter2.kt
index c651989846f..b9939cec3c5 100644
--- a/idea/idea-completion/testData/handlers/keywords/Getter2.kt
+++ b/idea/idea-completion/testData/handlers/keywords/Getter2.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 val v: Int
     g<caret>
 
diff --git a/idea/idea-completion/testData/handlers/keywords/Getter2.kt.after b/idea/idea-completion/testData/handlers/keywords/Getter2.kt.after
index 9d7b10a5b3e..e94569a03df 100644
--- a/idea/idea-completion/testData/handlers/keywords/Getter2.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/Getter2.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 val v: Int
     get() {<caret>}
 
diff --git a/idea/idea-completion/testData/handlers/keywords/If.kt b/idea/idea-completion/testData/handlers/keywords/If.kt
index b470db8595f..b6c345ff304 100644
--- a/idea/idea-completion/testData/handlers/keywords/If.kt
+++ b/idea/idea-completion/testData/handlers/keywords/If.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         i<caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/If.kt.after b/idea/idea-completion/testData/handlers/keywords/If.kt.after
index d130f163164..79e392fda64 100644
--- a/idea/idea-completion/testData/handlers/keywords/If.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/If.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         if (<caret>)
diff --git a/idea/idea-completion/testData/handlers/keywords/IfLParenth.kt b/idea/idea-completion/testData/handlers/keywords/IfLParenth.kt
index 15b8befd853..2892912cf14 100644
--- a/idea/idea-completion/testData/handlers/keywords/IfLParenth.kt
+++ b/idea/idea-completion/testData/handlers/keywords/IfLParenth.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         i<caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/IfLParenth.kt.after b/idea/idea-completion/testData/handlers/keywords/IfLParenth.kt.after
index 5858f48fd71..d0841f81987 100644
--- a/idea/idea-completion/testData/handlers/keywords/IfLParenth.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/IfLParenth.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         if(<caret>)
diff --git a/idea/idea-completion/testData/handlers/keywords/IfParansOnNextLine.kt b/idea/idea-completion/testData/handlers/keywords/IfParansOnNextLine.kt
index 60408b37ca9..80a03e2e64e 100644
--- a/idea/idea-completion/testData/handlers/keywords/IfParansOnNextLine.kt
+++ b/idea/idea-completion/testData/handlers/keywords/IfParansOnNextLine.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun other(a: Any) {
     i<caret>
     (a as Int).let { println(a + 12) }
diff --git a/idea/idea-completion/testData/handlers/keywords/IfParansOnNextLine.kt.after b/idea/idea-completion/testData/handlers/keywords/IfParansOnNextLine.kt.after
index dd54a9f9f15..9b3cb7a8f3e 100644
--- a/idea/idea-completion/testData/handlers/keywords/IfParansOnNextLine.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/IfParansOnNextLine.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun other(a: Any) {
     if (<caret>)
     (a as Int).let { println(a + 12) }
diff --git a/idea/idea-completion/testData/handlers/keywords/IfSpace.kt b/idea/idea-completion/testData/handlers/keywords/IfSpace.kt
index 0ca462989ad..db74a086d63 100644
--- a/idea/idea-completion/testData/handlers/keywords/IfSpace.kt
+++ b/idea/idea-completion/testData/handlers/keywords/IfSpace.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         i<caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/IfSpace.kt.after b/idea/idea-completion/testData/handlers/keywords/IfSpace.kt.after
index 52258c5c4ff..aa3c296ea46 100644
--- a/idea/idea-completion/testData/handlers/keywords/IfSpace.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/IfSpace.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         if <caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/Init.kt b/idea/idea-completion/testData/handlers/keywords/Init.kt
index 16b654dfb10..e0a5bc158f4 100644
--- a/idea/idea-completion/testData/handlers/keywords/Init.kt
+++ b/idea/idea-completion/testData/handlers/keywords/Init.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C {
     i<caret>
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/Init.kt.after b/idea/idea-completion/testData/handlers/keywords/Init.kt.after
index 999927fd788..2a7a53368ed 100644
--- a/idea/idea-completion/testData/handlers/keywords/Init.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/Init.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C {
     init {
         <caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt b/idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt
index 45e7a9a6f83..2697356caa4 100644
--- a/idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt
+++ b/idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun test() {
     nul<caret>
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt.after b/idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt.after
index 498b18383d8..90450e1cf5d 100644
--- a/idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun test() {
     null<caret>
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt b/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt
index dbada384d1e..2ca771d67fd 100644
--- a/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt
+++ b/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 
 fun foo() {
diff --git a/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt.after b/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt.after
index 7d22fefac82..8d222278b28 100644
--- a/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 
 fun foo() {
diff --git a/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt b/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt
index 80599569027..c4102aa9ed9 100644
--- a/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt
+++ b/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 
 fun foo() {
diff --git a/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt.after b/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt.after
index 683258c5639..63a995ce30f 100644
--- a/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 
 fun foo() {
diff --git a/idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt b/idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt
index 9eaedcefc8a..07e02d37286 100644
--- a/idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt
+++ b/idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo() {
     takeHandler1 {
         takeHandler2({ ret<caret> })
diff --git a/idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt.after b/idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt.after
index 85d9e313dcc..f11e49dedfb 100644
--- a/idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo() {
     takeHandler1 {
         takeHandler2({ return@takeHandler1<caret> })
diff --git a/idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt b/idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt
index f7dd45f4813..792a991d7e8 100644
--- a/idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt
+++ b/idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo(): Collection<String> {
     ret<caret>
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt.after b/idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt.after
index 48fd781c291..ccb2dfffcc8 100644
--- a/idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo(): Collection<String> {
     return emptyList()<caret>
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt b/idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt
index 7a397ef704d..0f42bb0f9f9 100644
--- a/idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt
+++ b/idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // ELEMENT: return
 fun test(a: Int) {
     retur<caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt.after b/idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt.after
index 751ed46b2bd..14382737c02 100644
--- a/idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // ELEMENT: return
 fun test(a: Int) {
     return<caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt b/idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt
index 5ffe44012a7..a35449d1fec 100644
--- a/idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt
+++ b/idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // ELEMENT: return
 class Test {
     val test : String
diff --git a/idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt.after b/idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt.after
index 1b358c88a8a..53d0c88978f 100644
--- a/idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // ELEMENT: return
 class Test {
     val test : String
diff --git a/idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt b/idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt
index 4b0fbe384fa..70a428390b9 100644
--- a/idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt
+++ b/idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // ELEMENT: return
 class Test {
     fun someMethod() : Int {
diff --git a/idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt.after b/idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt.after
index 4c539e9152a..b0d4bf07bf5 100644
--- a/idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // ELEMENT: return
 class Test {
     fun someMethod() : Int {
diff --git a/idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt b/idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt
index 90d29b88d12..fd0dab99bf6 100644
--- a/idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt
+++ b/idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // ELEMENT: return
 object OtherTest {
     fun test() : Unit {
diff --git a/idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt.after b/idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt.after
index a6b9ee1e2f7..1dce96adb4a 100644
--- a/idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // ELEMENT: return
 object OtherTest {
     fun test() : Unit {
diff --git a/idea/idea-completion/testData/handlers/keywords/ReturnNull.kt b/idea/idea-completion/testData/handlers/keywords/ReturnNull.kt
index 3974afe9d0e..76a4895b55f 100644
--- a/idea/idea-completion/testData/handlers/keywords/ReturnNull.kt
+++ b/idea/idea-completion/testData/handlers/keywords/ReturnNull.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo(): String? {
     ret<caret>
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/ReturnNull.kt.after b/idea/idea-completion/testData/handlers/keywords/ReturnNull.kt.after
index babf2fdb075..ddb5a989e3c 100644
--- a/idea/idea-completion/testData/handlers/keywords/ReturnNull.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/ReturnNull.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo(): String? {
     return null<caret>
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/Setter1.kt b/idea/idea-completion/testData/handlers/keywords/Setter1.kt
index 2a168249066..cd6ab619924 100644
--- a/idea/idea-completion/testData/handlers/keywords/Setter1.kt
+++ b/idea/idea-completion/testData/handlers/keywords/Setter1.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 var v: Int
     get() = 0
     s<caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/Setter1.kt.after b/idea/idea-completion/testData/handlers/keywords/Setter1.kt.after
index caa978d2c7c..a68f3dacc8b 100644
--- a/idea/idea-completion/testData/handlers/keywords/Setter1.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/Setter1.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 var v: Int
     get() = 0
     set(value) = <caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/Setter2.kt b/idea/idea-completion/testData/handlers/keywords/Setter2.kt
index 7cdcf27e315..ba87a20dfae 100644
--- a/idea/idea-completion/testData/handlers/keywords/Setter2.kt
+++ b/idea/idea-completion/testData/handlers/keywords/Setter2.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 var v: Int
     get() = 0
     s<caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/Setter2.kt.after b/idea/idea-completion/testData/handlers/keywords/Setter2.kt.after
index 1d057fa94be..4054d3df0e2 100644
--- a/idea/idea-completion/testData/handlers/keywords/Setter2.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/Setter2.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 var v: Int
     get() = 0
     set(value) {<caret>}
diff --git a/idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt b/idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt
index 89fc8ea2bf3..2ef0d39949e 100644
--- a/idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt
+++ b/idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt
@@ -1 +1,2 @@
+// FIR_COMPARISON
 impor<caret>
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt.after b/idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt.after
index 584e5b98c13..b5a037a0904 100644
--- a/idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt.after
@@ -1 +1,2 @@
+// FIR_COMPARISON
 import <caret>
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/keywords/Try.kt b/idea/idea-completion/testData/handlers/keywords/Try.kt
index c01b5efd9fe..e89a4a45b9c 100644
--- a/idea/idea-completion/testData/handlers/keywords/Try.kt
+++ b/idea/idea-completion/testData/handlers/keywords/Try.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         t<caret>
diff --git a/idea/idea-completion/testData/handlers/keywords/Try.kt.after b/idea/idea-completion/testData/handlers/keywords/Try.kt.after
index 07d06f5ff3d..189521f1be7 100644
--- a/idea/idea-completion/testData/handlers/keywords/Try.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/Try.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (true) {
         try {
diff --git a/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt b/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt
index 59902686c9b..7b4e4b7220b 100644
--- a/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt
+++ b/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C(@<caret> val p: String)
 
 // ELEMENT: get
diff --git a/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt.after b/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt.after
index bc02a4e89a5..5a57c4e0f56 100644
--- a/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C(@get:<caret> val p: String)
 
 // ELEMENT: get
diff --git a/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt b/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt
index 2c38f36dc57..31e3d16f524 100644
--- a/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt
+++ b/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C(@<caret>Ann var p: String)
 
 // ELEMENT: set
diff --git a/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt.after b/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt.after
index cade1880898..82f64ff964f 100644
--- a/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C(@set:<caret>Ann var p: String)
 
 // ELEMENT: set
diff --git a/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt b/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt
index 3dac97661ab..b8c7148bc52 100644
--- a/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt
+++ b/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C(@<caret>get:Ann var p: String)
 
 // ELEMENT: set
diff --git a/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt.after b/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt.after
index 67b04c7f9dd..036a13971e5 100644
--- a/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C(@set:<caret>Ann var p: String)
 
 // ELEMENT: set
diff --git a/idea/idea-completion/testData/handlers/keywords/While.kt b/idea/idea-completion/testData/handlers/keywords/While.kt
index 5ba6d2918fa..c3b0912c51f 100644
--- a/idea/idea-completion/testData/handlers/keywords/While.kt
+++ b/idea/idea-completion/testData/handlers/keywords/While.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     w<caret>
 }
diff --git a/idea/idea-completion/testData/handlers/keywords/While.kt.after b/idea/idea-completion/testData/handlers/keywords/While.kt.after
index 8fa9fbeada3..8217a22e48f 100644
--- a/idea/idea-completion/testData/handlers/keywords/While.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/While.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun t() {
     while (<caret>)
 }