From 68d931969dad39b17bbc7dd1b6296b2319364484 Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Sat, 22 Aug 2020 14:44:17 +0300
Subject: [PATCH] Minor: explicitly opt-in for diagnostics messages in
 MultiplatformAnalysisTests

---
 .../correctOverloadResolutionAmbiguity/js/js.kt        |  2 +-
 .../diamondDuplicateActuals/bottom/bottom.kt           |  2 +-
 .../multiplatform/diamondDuplicateActuals/top/top.kt   |  2 ++
 .../multiplatform/diamondModuleDependency1/jvm/jvm.kt  |  4 ++--
 .../diamondModuleDependency2/common-2-3/common-2-3.kt  |  2 +-
 .../multiplatform/diamondModuleDependency2/jvm/jvm.kt  |  4 ++--
 .../differentKindsOfDependencies/a-js/js.kt            |  4 ++--
 .../differentKindsOfDependencies/a-jvm/jvm.kt          |  4 ++--
 .../differentKindsOfDependencies/b-common/b.kt         |  2 +-
 .../multiplatform/duplicateActualsExplicit/top/top.kt  |  2 +-
 .../multiplatform/duplicateActualsImplicit/top/top.kt  |  2 ++
 .../bottom/bottom.kt                                   |  2 +-
 .../duplicateActualsOneWeaklyIncompatible/top/top.kt   |  2 ++
 .../bottom/bottom.kt                                   |  2 ++
 .../duplicateExpectsExplicit/bottom/bottom.kt          |  2 ++
 .../right/right.kt                                     |  2 +-
 .../hierarcicalActualization/common/common.kt          |  2 +-
 .../multiplatform/hierarcicalActualization/js/js.kt    |  2 +-
 .../multiplatform/hierarcicalActualization/jvm/jvm.kt  |  2 +-
 .../hierarcicalActualization/jvmAndJs/jvmAndJs.kt      |  2 +-
 .../incompleteActualization/common/common.kt           |  4 ++--
 .../incompleteActualization/jvmAndJs/jvmAndJs.kt       |  4 ++--
 .../multiplatform/jvmDefaultNonMpp/clash/clash.kt      |  2 +-
 idea/testData/multiplatform/lambdas/jvm/jvm.kt         |  2 +-
 .../typeAliasToExpectClassExplicitReference/jvm/jvm.kt |  4 ++--
 .../multiplatform/useCorrectBuiltIns/common/common.kt  | 10 +++++-----
 .../testData/multiplatform/useCorrectBuiltIns/js/js.kt |  6 +++---
 .../useCorrectBuiltIns/jvmWithSdk/jvmWithSdk.kt        |  8 ++++----
 .../multiplatform/useCorrectBuiltIns/native/native.kt  | 10 +++++-----
 .../middle/middle.kt                                   |  2 +-
 .../resolve/AbstractMultiModuleIdeResolveTest.kt       |  2 +-
 31 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/js/js.kt b/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/js/js.kt
index c05ad561753..b2af8823566 100644
--- a/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/js/js.kt
+++ b/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/js/js.kt
@@ -4,5 +4,5 @@ actual interface A<T> {
 }
 
 fun main() {
-    bar().<!OVERLOAD_RESOLUTION_AMBIGUITY(" public abstract actual fun foo(x: String): Unit defined in A public abstract fun foo(x: String): Unit defined in A")!>foo<!>("")
+    bar().<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>("")
 }
diff --git a/idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt b/idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt
index 51e1f53ea3a..7fc554e7629 100644
--- a/idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt
+++ b/idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt
@@ -11,6 +11,6 @@ fun main() {
     // Any behaviour is acceptable, as the code is erroneous.
     // At the time of writing this test, we resolve to nearest A, i.e.
     //  'fromBottom' is resolved, and 'fromLeft' is not.
-    A().<!UNRESOLVED_REFERENCE("fromLeft")!>fromLeft<!>()
+    A().<!UNRESOLVED_REFERENCE!>fromLeft<!>()
     A().fromBottom()
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt b/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt
index 221b2f07557..b4eed14b822 100644
--- a/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt
+++ b/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt
@@ -1,3 +1,5 @@
+// !RENDER_DIAGNOSTICS_MESSAGES
+
 package sample
 
 expect class <!AMBIGUOUS_ACTUALS("Class 'A'", "bottom, left")!>A<!> {
diff --git a/idea/testData/multiplatform/diamondModuleDependency1/jvm/jvm.kt b/idea/testData/multiplatform/diamondModuleDependency1/jvm/jvm.kt
index 88c93c3f866..63301a365f1 100644
--- a/idea/testData/multiplatform/diamondModuleDependency1/jvm/jvm.kt
+++ b/idea/testData/multiplatform/diamondModuleDependency1/jvm/jvm.kt
@@ -5,7 +5,7 @@ interface B : A
 fun testA(x: A) {
     x.foo()
     x.bar()
-    x.<!UNRESOLVED_REFERENCE("baz")!>baz<!>()
+    x.<!UNRESOLVED_REFERENCE!>baz<!>()
 
     take_A_common_1(x)
     take_A_common_2_1(x)
@@ -15,7 +15,7 @@ fun testA(x: A) {
 fun testB(x: B) {
     x.foo()
     x.bar()
-    x.<!UNRESOLVED_REFERENCE("baz")!>baz<!>()
+    x.<!UNRESOLVED_REFERENCE!>baz<!>()
 
     take_A_common_1(x)
     take_A_common_2_1(x)
diff --git a/idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt b/idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt
index 3e964ba006d..3e6ef38d791 100644
--- a/idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt
+++ b/idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt
@@ -12,5 +12,5 @@ fun take2(x: A): DD = null!!
 fun take4(x: A): DD = null!!
 
 fun test(x: A) {
-    <!OVERLOAD_RESOLUTION_AMBIGUITY(" public fun take4(x: A): AA defined in sample in file common-1.kt public fun take4(x: A): DD defined in sample in file common-2-3.kt")!>take4<!>(x)
+    <!OVERLOAD_RESOLUTION_AMBIGUITY!>take4<!>(x)
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt b/idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt
index 44718cdd647..6daf8537af1 100644
--- a/idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt
+++ b/idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt
@@ -16,10 +16,10 @@ fun take0(x: D): Unit = null!!
 
 fun test_1(x: D) {
     val res0: Unit = take0(x)
-    <!OVERLOAD_RESOLUTION_AMBIGUITY(" public fun take1(x: A): AA defined in sample in file common-1.kt public fun take1(x: A): DD defined in sample in file common-2-3.kt public fun take1(x: B): BB defined in sample in file common-2-1.kt public fun take1(x: C): CC defined in sample in file common-2-2.kt")!>take1<!>(x)
+    <!OVERLOAD_RESOLUTION_AMBIGUITY!>take1<!>(x)
     val res2: BB = take2(x)
     val res3: BB = take3(x)
-    <!OVERLOAD_RESOLUTION_AMBIGUITY(" public fun take4(x: A): AA defined in sample in file common-1.kt public fun take4(x: A): DD defined in sample in file common-2-3.kt")!>take4<!>(x)
+    <!OVERLOAD_RESOLUTION_AMBIGUITY!>take4<!>(x)
 }
 
 fun test_2() {
diff --git a/idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt b/idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt
index c07ff2a4d2a..04176df5fb3 100644
--- a/idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt
+++ b/idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt
@@ -1,8 +1,8 @@
 actual class A
 
 // Error: ACTUAL_WITHOUT_EXPECT, becuase we shouldn't see expects through usual dependencies
-actual class <!ACTUAL_WITHOUT_EXPECT("Actual class 'B'", "")!>B<!>
+actual class <!ACTUAL_WITHOUT_EXPECT!>B<!>
 
 // OK: though we can't actualize B, we can see it and use it.
-fun useB(<!UNUSED_PARAMETER("b")!>b<!>: B) {
+fun useB(<!UNUSED_PARAMETER!>b<!>: B) {
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt b/idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt
index c07ff2a4d2a..04176df5fb3 100644
--- a/idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt
+++ b/idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt
@@ -1,8 +1,8 @@
 actual class A
 
 // Error: ACTUAL_WITHOUT_EXPECT, becuase we shouldn't see expects through usual dependencies
-actual class <!ACTUAL_WITHOUT_EXPECT("Actual class 'B'", "")!>B<!>
+actual class <!ACTUAL_WITHOUT_EXPECT!>B<!>
 
 // OK: though we can't actualize B, we can see it and use it.
-fun useB(<!UNUSED_PARAMETER("b")!>b<!>: B) {
+fun useB(<!UNUSED_PARAMETER!>b<!>: B) {
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/differentKindsOfDependencies/b-common/b.kt b/idea/testData/multiplatform/differentKindsOfDependencies/b-common/b.kt
index 8e55c974bfa..1b8c6ac6d95 100644
--- a/idea/testData/multiplatform/differentKindsOfDependencies/b-common/b.kt
+++ b/idea/testData/multiplatform/differentKindsOfDependencies/b-common/b.kt
@@ -1 +1 @@
-expect class <!NO_ACTUAL_FOR_EXPECT("class 'B'", "b-common", "")!>B<!>
\ No newline at end of file
+expect class <!NO_ACTUAL_FOR_EXPECT!>B<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt b/idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt
index b6529b5b63b..e84eaec9c89 100644
--- a/idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt
+++ b/idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt
@@ -1,3 +1,3 @@
 package foo
 
-expect class <!AMBIGUOUS_ACTUALS("Class 'A'", "bottom, middle")!>A<!>
\ No newline at end of file
+expect class <!AMBIGUOUS_ACTUALS!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt b/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt
index e4fecfc1a1e..237a5d750af 100644
--- a/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt
+++ b/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt
@@ -1,3 +1,5 @@
+// !RENDER_DIAGNOSTICS_MESSAGES
+
 package foo
 
 expect class <!AMBIGUOUS_ACTUALS("Class 'ActualInMiddleCompatibleInBottom'", "bottom, middle")!>ActualInMiddleCompatibleInBottom<!>
diff --git a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/bottom/bottom.kt b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/bottom/bottom.kt
index d6d3776a3d4..b04776e46d1 100644
--- a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/bottom/bottom.kt
+++ b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/bottom/bottom.kt
@@ -1,3 +1,3 @@
 package foo
 
-<!ACTUAL_WITHOUT_EXPECT("Class 'A'", " The following declaration is incompatible because visibility is different:     public final expect class A ")!>private<!> class A
\ No newline at end of file
+<!ACTUAL_WITHOUT_EXPECT!>private<!> class A
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt
index b6529b5b63b..2cc6d86f804 100644
--- a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt
+++ b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt
@@ -1,3 +1,5 @@
+// !RENDER_DIAGNOSTICS_MESSAGES
+
 package foo
 
 expect class <!AMBIGUOUS_ACTUALS("Class 'A'", "bottom, middle")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt
index 4975a08653f..35f51d5efbc 100644
--- a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt
+++ b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt
@@ -1,3 +1,5 @@
+// !RENDER_DIAGNOSTICS_MESSAGES
+
 package foo
 
 actual fun foo<!ACTUAL_WITHOUT_EXPECT("Actual function 'foo'", " The following declaration is incompatible because number of value parameters is different:     public expect fun foo(): Int ")!>(x: Int)<!>: Int = x
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt b/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt
index c73c470e0d0..4b63aec7964 100644
--- a/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt
+++ b/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt
@@ -1 +1,3 @@
+// !RENDER_DIAGNOSTICS_MESSAGES
+
 actual class <!AMBIGUOUS_EXPECTS("Actual class 'A'", "left, right")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt
index 2d1e1d02ce9..03905c01a3a 100644
--- a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt
+++ b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt
@@ -1 +1 @@
-expect fun foo<!NO_ACTUAL_FOR_EXPECT("function 'foo'", "bottom for JVM", " The following declaration is incompatible because number of value parameters is different:     public actual fun foo(): Int ")!>(x: Int)<!>: Int
\ No newline at end of file
+expect fun foo<!NO_ACTUAL_FOR_EXPECT!>(x: Int)<!>: Int
\ No newline at end of file
diff --git a/idea/testData/multiplatform/hierarcicalActualization/common/common.kt b/idea/testData/multiplatform/hierarcicalActualization/common/common.kt
index a47be5a627f..8c9f28d9ba5 100644
--- a/idea/testData/multiplatform/hierarcicalActualization/common/common.kt
+++ b/idea/testData/multiplatform/hierarcicalActualization/common/common.kt
@@ -3,4 +3,4 @@ package foo
 expect class ExpectInCommonActualInMiddle
 expect class ExpectInCommonActualInPlatforms
 
-expect class <!NO_ACTUAL_FOR_EXPECT("class 'ExpectInCommonWithoutActual'", "js for JS", ""), NO_ACTUAL_FOR_EXPECT("class 'ExpectInCommonWithoutActual'", "jvm for JVM", "")!>ExpectInCommonWithoutActual<!>
+expect class <!NO_ACTUAL_FOR_EXPECT, NO_ACTUAL_FOR_EXPECT!>ExpectInCommonWithoutActual<!>
diff --git a/idea/testData/multiplatform/hierarcicalActualization/js/js.kt b/idea/testData/multiplatform/hierarcicalActualization/js/js.kt
index c5c68fcd472..df196c6a41f 100644
--- a/idea/testData/multiplatform/hierarcicalActualization/js/js.kt
+++ b/idea/testData/multiplatform/hierarcicalActualization/js/js.kt
@@ -4,7 +4,7 @@ actual class ExpectInCommonActualInPlatforms
 
 actual class ExpectInMiddleActualInPlatforms
 
-expect class <!NO_ACTUAL_FOR_EXPECT("class 'ExpectInJsWithoutActual'", "js for JS", "")!>ExpectInJsWithoutActual<!>
+expect class <!NO_ACTUAL_FOR_EXPECT!>ExpectInJsWithoutActual<!>
 
 expect class ExpectInJsActualInJs
 actual class ExpectInJsActualInJs
\ No newline at end of file
diff --git a/idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt b/idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt
index e3f16d4c7cc..1e805d06dee 100644
--- a/idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt
+++ b/idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt
@@ -3,7 +3,7 @@ package foo
 actual class ExpectInCommonActualInPlatforms
 actual class ExpectInMiddleActualInPlatforms
 
-expect class <!NO_ACTUAL_FOR_EXPECT("class 'ExpectInJvmWithoutActual'", "jvm for JVM", "")!>ExpectInJvmWithoutActual<!>
+expect class <!NO_ACTUAL_FOR_EXPECT!>ExpectInJvmWithoutActual<!>
 
 expect class ExpectInJvmActualInJvm
 actual class ExpectInJvmActualInJvm
diff --git a/idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt b/idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt
index e79bf3093f5..be9956fa5aa 100644
--- a/idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt
+++ b/idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt
@@ -4,4 +4,4 @@ actual class ExpectInCommonActualInMiddle
 
 expect class ExpectInMiddleActualInPlatforms
 
-expect class <!NO_ACTUAL_FOR_EXPECT("class 'ExpectInMiddleWithoutActual'", "js for JS", ""), NO_ACTUAL_FOR_EXPECT("class 'ExpectInMiddleWithoutActual'", "jvm for JVM", "")!>ExpectInMiddleWithoutActual<!>
+expect class <!NO_ACTUAL_FOR_EXPECT, NO_ACTUAL_FOR_EXPECT!>ExpectInMiddleWithoutActual<!>
diff --git a/idea/testData/multiplatform/incompleteActualization/common/common.kt b/idea/testData/multiplatform/incompleteActualization/common/common.kt
index 752b156ba33..593bb03633c 100644
--- a/idea/testData/multiplatform/incompleteActualization/common/common.kt
+++ b/idea/testData/multiplatform/incompleteActualization/common/common.kt
@@ -1,4 +1,4 @@
 package foo
 
-expect class <!NO_ACTUAL_FOR_EXPECT("class 'ExpectInCommonActualInJsOnly'", "jvm for JVM", "")!>ExpectInCommonActualInJsOnly<!>
-expect class <!NO_ACTUAL_FOR_EXPECT("class 'ExpectInCommonActualInJvmOnly'", "js for JS", "")!>ExpectInCommonActualInJvmOnly<!>
+expect class <!NO_ACTUAL_FOR_EXPECT!>ExpectInCommonActualInJsOnly<!>
+expect class <!NO_ACTUAL_FOR_EXPECT!>ExpectInCommonActualInJvmOnly<!>
diff --git a/idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt b/idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt
index 771f51f438b..7c20ed87f58 100644
--- a/idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt
+++ b/idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt
@@ -1,4 +1,4 @@
 package foo
 
-expect class <!NO_ACTUAL_FOR_EXPECT("class 'ExpectInMiddleActualInJsOnly'", "jvm for JVM", "")!>ExpectInMiddleActualInJsOnly<!>
-expect class <!NO_ACTUAL_FOR_EXPECT("class 'ExpectInMiddleActualInJvmOnly'", "js for JS", "")!>ExpectInMiddleActualInJvmOnly<!>
\ No newline at end of file
+expect class <!NO_ACTUAL_FOR_EXPECT!>ExpectInMiddleActualInJsOnly<!>
+expect class <!NO_ACTUAL_FOR_EXPECT!>ExpectInMiddleActualInJvmOnly<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/jvmDefaultNonMpp/clash/clash.kt b/idea/testData/multiplatform/jvmDefaultNonMpp/clash/clash.kt
index 5035c4ab88e..855274eb2fb 100644
--- a/idea/testData/multiplatform/jvmDefaultNonMpp/clash/clash.kt
+++ b/idea/testData/multiplatform/jvmDefaultNonMpp/clash/clash.kt
@@ -6,4 +6,4 @@ interface SubCheck : Check {
     }
 }
 
-class <!EXPLICIT_OVERRIDE_REQUIRED_IN_MIXED_MODE("public open fun test(): String defined in SubCheckClass", "public open fun test(): String defined in base.CheckClass", "all-compatibility")!>SubCheckClass<!> : CheckClass(), SubCheck
\ No newline at end of file
+class <!EXPLICIT_OVERRIDE_REQUIRED_IN_MIXED_MODE!>SubCheckClass<!> : CheckClass(), SubCheck
\ No newline at end of file
diff --git a/idea/testData/multiplatform/lambdas/jvm/jvm.kt b/idea/testData/multiplatform/lambdas/jvm/jvm.kt
index e67f8c39f8f..4d1fafed9e6 100644
--- a/idea/testData/multiplatform/lambdas/jvm/jvm.kt
+++ b/idea/testData/multiplatform/lambdas/jvm/jvm.kt
@@ -10,7 +10,7 @@ fun test() {
     }
 
     anotherUseA {
-        <!UNRESOLVED_REFERENCE("foo")!>foo<!>()
+        <!UNRESOLVED_REFERENCE!>foo<!>()
     }
 
     anotherUseA {
diff --git a/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt b/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt
index 7c16bca35e6..ccd352e371d 100644
--- a/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt
+++ b/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt
@@ -5,6 +5,6 @@ actual class A {
 }
 
 fun test() {
-    <!RESOLUTION_TO_CLASSIFIER("TypealiasFromCommon", "EXPECT_CLASS_AS_FUNCTION", "Expected class TypealiasFromCommon does not have default constructor")!>TypealiasFromCommon<!>().<!DEBUG_INFO_MISSING_UNRESOLVED!>commonMember<!>()
-    <!RESOLUTION_TO_CLASSIFIER("TypealiasFromCommon", "EXPECT_CLASS_AS_FUNCTION", "Expected class TypealiasFromCommon does not have default constructor")!>TypealiasFromCommon<!>().<!DEBUG_INFO_MISSING_UNRESOLVED!>platformwMember<!>()
+    <!RESOLUTION_TO_CLASSIFIER!>TypealiasFromCommon<!>().<!DEBUG_INFO_MISSING_UNRESOLVED!>commonMember<!>()
+    <!RESOLUTION_TO_CLASSIFIER!>TypealiasFromCommon<!>().<!DEBUG_INFO_MISSING_UNRESOLVED!>platformwMember<!>()
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/useCorrectBuiltIns/common/common.kt b/idea/testData/multiplatform/useCorrectBuiltIns/common/common.kt
index af5ca42c9b6..362d41c92f5 100644
--- a/idea/testData/multiplatform/useCorrectBuiltIns/common/common.kt
+++ b/idea/testData/multiplatform/useCorrectBuiltIns/common/common.kt
@@ -1,16 +1,16 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
-import kotlin.<!UNRESOLVED_REFERENCE("browser")!>browser<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>window<!>
-import <!UNRESOLVED_REFERENCE("kotlinx")!>kotlinx<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>cinterop<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>CPointed<!>
+import kotlin.<!UNRESOLVED_REFERENCE!>browser<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>window<!>
+import <!UNRESOLVED_REFERENCE!>kotlinx<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>cinterop<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>CPointed<!>
 
 fun jvmSpecific() {
-    val x: <!UNRESOLVED_REFERENCE("Cloneable")!>Cloneable<!>? = null
+    val x: <!UNRESOLVED_REFERENCE!>Cloneable<!>? = null
 }
 
 fun nativeSpecific() {
-    val x: <!UNRESOLVED_REFERENCE("CPointed")!>CPointed<!>? = null
+    val x: <!UNRESOLVED_REFERENCE!>CPointed<!>? = null
 }
 
 fun jsSpecific() {
-    val windowClosed = <!UNRESOLVED_REFERENCE("window")!>window<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>closed<!>
+    val windowClosed = <!UNRESOLVED_REFERENCE!>window<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>closed<!>
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/useCorrectBuiltIns/js/js.kt b/idea/testData/multiplatform/useCorrectBuiltIns/js/js.kt
index fe651f03f74..d8a4dfafd97 100644
--- a/idea/testData/multiplatform/useCorrectBuiltIns/js/js.kt
+++ b/idea/testData/multiplatform/useCorrectBuiltIns/js/js.kt
@@ -1,14 +1,14 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 import kotlinx.browser.window
-import kotlinx.<!UNRESOLVED_REFERENCE("cinterop")!>cinterop<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>CPointed<!>
+import kotlinx.<!UNRESOLVED_REFERENCE!>cinterop<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>CPointed<!>
 
 fun jvmSpecific() {
-    val x: <!UNRESOLVED_REFERENCE("Cloneable")!>Cloneable<!>? = null
+    val x: <!UNRESOLVED_REFERENCE!>Cloneable<!>? = null
 }
 
 fun nativeSpecific() {
-    val x: <!UNRESOLVED_REFERENCE("CPointed")!>CPointed<!>? = null
+    val x: <!UNRESOLVED_REFERENCE!>CPointed<!>? = null
 }
 
 fun jsSpecific() {
diff --git a/idea/testData/multiplatform/useCorrectBuiltIns/jvmWithSdk/jvmWithSdk.kt b/idea/testData/multiplatform/useCorrectBuiltIns/jvmWithSdk/jvmWithSdk.kt
index 539574f2480..6f3a10549bc 100644
--- a/idea/testData/multiplatform/useCorrectBuiltIns/jvmWithSdk/jvmWithSdk.kt
+++ b/idea/testData/multiplatform/useCorrectBuiltIns/jvmWithSdk/jvmWithSdk.kt
@@ -1,16 +1,16 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
-import kotlin.<!UNRESOLVED_REFERENCE("browser")!>browser<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>window<!>
-import <!UNRESOLVED_REFERENCE("kotlinx")!>kotlinx<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>cinterop<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>CPointed<!>
+import kotlin.<!UNRESOLVED_REFERENCE!>browser<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>window<!>
+import <!UNRESOLVED_REFERENCE!>kotlinx<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>cinterop<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>CPointed<!>
 
 fun jvmSpecific() {
     val x: Cloneable? = null
 }
 
 fun nativeSpecific() {
-    val x: <!UNRESOLVED_REFERENCE("CPointed")!>CPointed<!>? = null
+    val x: <!UNRESOLVED_REFERENCE!>CPointed<!>? = null
 }
 
 fun jsSpecific() {
-    val windowClosed = <!UNRESOLVED_REFERENCE("window")!>window<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>closed<!>
+    val windowClosed = <!UNRESOLVED_REFERENCE!>window<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>closed<!>
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/useCorrectBuiltIns/native/native.kt b/idea/testData/multiplatform/useCorrectBuiltIns/native/native.kt
index af5ca42c9b6..362d41c92f5 100644
--- a/idea/testData/multiplatform/useCorrectBuiltIns/native/native.kt
+++ b/idea/testData/multiplatform/useCorrectBuiltIns/native/native.kt
@@ -1,16 +1,16 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
-import kotlin.<!UNRESOLVED_REFERENCE("browser")!>browser<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>window<!>
-import <!UNRESOLVED_REFERENCE("kotlinx")!>kotlinx<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>cinterop<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>CPointed<!>
+import kotlin.<!UNRESOLVED_REFERENCE!>browser<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>window<!>
+import <!UNRESOLVED_REFERENCE!>kotlinx<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>cinterop<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>CPointed<!>
 
 fun jvmSpecific() {
-    val x: <!UNRESOLVED_REFERENCE("Cloneable")!>Cloneable<!>? = null
+    val x: <!UNRESOLVED_REFERENCE!>Cloneable<!>? = null
 }
 
 fun nativeSpecific() {
-    val x: <!UNRESOLVED_REFERENCE("CPointed")!>CPointed<!>? = null
+    val x: <!UNRESOLVED_REFERENCE!>CPointed<!>? = null
 }
 
 fun jsSpecific() {
-    val windowClosed = <!UNRESOLVED_REFERENCE("window")!>window<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>closed<!>
+    val windowClosed = <!UNRESOLVED_REFERENCE!>window<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>closed<!>
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt
index 50c93af8488..42684e64765 100644
--- a/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt
+++ b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt
@@ -1,4 +1,4 @@
 package sample
 
-actual class <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS("A", "      public final expect fun f(): Unit ")!>A<!> {
+actual class <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>A<!> {
 }
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleIdeResolveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleIdeResolveTest.kt
index 52eedba72f1..fafe2c3a388 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleIdeResolveTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleIdeResolveTest.kt
@@ -99,7 +99,7 @@ abstract class AbstractMultiModuleIdeResolveTest : AbstractMultiModuleTest() {
             getFileText = { it.text },
             uncheckedDiagnostics = emptyList(),
             withNewInferenceDirective = false,
-            renderDiagnosticMessages = true
+            renderDiagnosticMessages = directives.contains(BaseDiagnosticsTest.RENDER_DIAGNOSTICS_MESSAGES)
         ).toString()
 
         KotlinTestUtils.assertEqualsToFile(expectedFile, actualTextWithDiagnostics)