diff --git a/idea/testData/multiModuleHighlighting/differentJdk/mockJdk/main.kt b/idea/testData/multiModuleHighlighting/differentJdk/mockJdk/main.kt
index 35f0677f0ce..1fadfce7269 100644
--- a/idea/testData/multiModuleHighlighting/differentJdk/mockJdk/main.kt
+++ b/idea/testData/multiModuleHighlighting/differentJdk/mockJdk/main.kt
@@ -50,5 +50,5 @@ fun buildList(): List<String> = null!!
 fun myFile(): File = null!!
 
 fun mainJdk6(x: List<String>) {
-    x.<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: stream">stream</error>().filter { <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: it">it</error>.length > 0 }
+    x.<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: stream">stream</error>().<error descr="[DEBUG] Resolved to error element">filter</error> { <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: it">it</error>.<error descr="[DEBUG] Resolved to error element">length</error> <error descr="[DEBUG] Resolved to error element">></error> 0 }
 }
diff --git a/idea/testData/multiModuleHighlighting/languageVersionsViaFacets/m2/m2.kt b/idea/testData/multiModuleHighlighting/languageVersionsViaFacets/m2/m2.kt
index b480ee4fd6f..9b9bb568161 100644
--- a/idea/testData/multiModuleHighlighting/languageVersionsViaFacets/m2/m2.kt
+++ b/idea/testData/multiModuleHighlighting/languageVersionsViaFacets/m2/m2.kt
@@ -2,9 +2,9 @@ package languageVersion1_0
 
 public fun useJavaMap1_0(): java.util.HashMap<Int, Int> {
     val g = java.util.HashMap<Int, Int>()
-    g.values.<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: removeIf">removeIf</error> { <error>it</error> < 5 }
+    g.values.<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: removeIf">removeIf</error> { <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: it">it</error> <error descr="[DEBUG] Resolved to error element"><</error> 5 }
     return g
 }
 
-val use1_1 = languageVersion1_1.useJavaMap1_1().values.<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: removeIf">removeIf</error> { <error>it</error> < 5 }
+val use1_1 = languageVersion1_1.useJavaMap1_1().values.<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: removeIf">removeIf</error> { <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: it">it</error> <error descr="[DEBUG] Resolved to error element"><</error> 5 }
 
diff --git a/idea/testData/multiModuleHighlighting/samWithReceiverExtension/m1/m1.kt b/idea/testData/multiModuleHighlighting/samWithReceiverExtension/m1/m1.kt
index 25882c2afb1..7c5e47f9eb8 100644
--- a/idea/testData/multiModuleHighlighting/samWithReceiverExtension/m1/m1.kt
+++ b/idea/testData/multiModuleHighlighting/samWithReceiverExtension/m1/m1.kt
@@ -5,25 +5,25 @@ public fun testUseAsReceiver(api: javaInterface.API) {
         this.length
     }
     api.useM1B<String> {
-        <error>this</error>.length
+        <error descr="[NO_THIS] 'this' is not defined in this context">this</error>.<error descr="[DEBUG] Resolved to error element">length</error>
     }
     api.useM2A<String> {
         this.length
     }
     api.useM2B<String> {
-        <error>this</error>.length
+        <error descr="[NO_THIS] 'this' is not defined in this context">this</error>.<error descr="[DEBUG] Resolved to error element">length</error>
     }
 }
 
 public fun testUseAsParameter(api: javaInterface.API) {
     api.useM1A<String> {
-        <error>it</error>.length
+        <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: it">it</error>.<error descr="[DEBUG] Resolved to error element">length</error>
     }
     api.useM1B<String> {
         it.length
     }
     api.useM2A<String> {
-        <error>it</error>.length
+        <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: it">it</error>.<error descr="[DEBUG] Resolved to error element">length</error>
     }
     api.useM2B<String> {
         it.length
diff --git a/idea/testData/multiModuleHighlighting/samWithReceiverExtension/m2/m2.kt b/idea/testData/multiModuleHighlighting/samWithReceiverExtension/m2/m2.kt
index c0ef0806076..6fc898bbc91 100644
--- a/idea/testData/multiModuleHighlighting/samWithReceiverExtension/m2/m2.kt
+++ b/idea/testData/multiModuleHighlighting/samWithReceiverExtension/m2/m2.kt
@@ -2,13 +2,13 @@ package m2
 
 public fun testUseAsReceiver(api: javaInterface.API) {
     api.useM1A<String> {
-        <error>this</error>.length
+        <error descr="[NO_THIS] 'this' is not defined in this context">this</error>.<error descr="[DEBUG] Resolved to error element">length</error>
     }
     api.useM1B<String> {
         this.length
     }
     api.useM2A<String> {
-        <error>this</error>.length
+        <error descr="[NO_THIS] 'this' is not defined in this context">this</error>.<error descr="[DEBUG] Resolved to error element">length</error>
     }
     api.useM2B<String> {
         this.length
@@ -20,12 +20,12 @@ public fun testUseAsParameter(api: javaInterface.API) {
         it.length
     }
     api.useM1B<String> {
-        <error>it</error>.length
+        <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: it">it</error>.<error descr="[DEBUG] Resolved to error element">length</error>
     }
     api.useM2A<String> {
         it.length
     }
     api.useM2B<String> {
-        <error>it</error>.length
+        <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: it">it</error>.<error descr="[DEBUG] Resolved to error element">length</error>
     }
 }
\ No newline at end of file