From 0e7e657657cc58cc1825f3a8603d1b027c9cd990 Mon Sep 17 00:00:00 2001
From: Alexander Dudinsky <Alexander.Dudinsky@jetbrains.com>
Date: Sat, 10 Oct 2020 10:07:31 +0300
Subject: [PATCH] Migrate `MultiModuleLineMarkerTest` to the new CodeMetaInfo
 test infrastructure

---
 .../checkers/diagnostics/TextDiagnostic.kt    |  2 +-
 .../dependencies.txt                          |  4 ++++
 .../jvm/jvm.kt                                |  2 +-
 .../actualDerived/common/common.kt            |  4 ++--
 .../actualDerived/dependencies.txt            |  4 ++++
 .../actualEnumEntries/dependencies.txt        |  4 ++++
 .../actualEnumEntries/jvm/jvm.kt              |  8 +++----
 .../dependencies.txt                          |  4 ++++
 .../actualEnumEntriesInOneLine/jvm/jvm.kt     |  2 +-
 .../actualWithOverload/dependencies.txt       |  4 ++++
 .../common/common.kt                          |  6 ++---
 .../dependencies.txt                          |  4 ++++
 .../expectEnumEntries/common/common.kt        |  8 +++----
 .../expectEnumEntries/dependencies.txt        |  4 ++++
 .../common/common.kt                          |  2 +-
 .../dependencies.txt                          |  4 ++++
 .../common/common.kt                          |  4 ++--
 .../dependencies.txt                          |  4 ++++
 .../common/common.kt                          |  6 ++---
 .../dependencies.txt                          |  1 +
 .../expectWithOverload/dependencies.txt       |  4 ++++
 .../fromActualAnnotation/dependencies.txt     |  4 ++++
 .../fromActualAnnotation/jvm/jvm.kt           |  6 ++---
 .../dependencies.txt                          |  4 ++++
 .../jvm/jvm.kt                                |  6 ++---
 .../fromActualCompanion/dependencies.txt      |  4 ++++
 .../fromActualCompanion/jvm/jvm.kt            |  4 ++--
 .../dependencies.txt                          |  4 ++++
 .../fromActualPrimaryConstructor/jvm/jvm.kt   |  4 ++--
 .../fromActualSealedClass/dependencies.txt    |  4 ++++
 .../fromActualSealedClass/jvm/jvm.kt          | 10 ++++----
 .../dependencies.txt                          |  4 ++++
 .../fromActualSecondaryConstructor/jvm/jvm.kt |  4 ++--
 .../fromActualTypeAlias/dependencies.txt      |  4 ++++
 .../fromActualTypeAlias/jvm/jvm.kt            |  2 +-
 .../fromClassToAlias/common/common.kt         |  2 +-
 .../fromClassToAlias/dependencies.txt         |  4 ++++
 .../dependencies.txt                          |  4 ++++
 .../fromClassToJavaAliasInTest/jvm/empty.kt   |  2 +-
 .../fromCommonToJvmHeader/common/common.kt    | 10 ++++----
 .../fromCommonToJvmHeader/dependencies.txt    |  4 ++++
 .../fromCommonToJvmImpl/dependencies.txt      |  4 ++++
 .../fromCommonToJvmImpl/jvm/jvm.kt            | 10 ++++----
 .../fromExpectCompanion/common/common.kt      |  4 ++--
 .../fromExpectCompanion/dependencies.txt      |  4 ++++
 .../fromExpectedAnnotation/common/common.kt   |  6 ++---
 .../fromExpectedAnnotation/dependencies.txt   |  4 ++++
 .../common/common.kt                          |  4 ++--
 .../dependencies.txt                          |  4 ++++
 .../fromExpectedSealedClass/common/common.kt  | 10 ++++----
 .../fromExpectedSealedClass/dependencies.txt  |  4 ++++
 .../common/common.kt                          |  4 ++--
 .../dependencies.txt                          |  4 ++++
 .../fromExpectedTypeAlias/common/common.kt    |  2 +-
 .../fromExpectedTypeAlias/dependencies.txt    |  4 ++++
 .../common/common.kt                          | 20 ++++++++--------
 .../dependencies.txt                          |  4 ++++
 .../common/common.kt                          | 20 ++++++++--------
 .../dependencies.txt                          |  4 ++++
 .../dependencies.txt                          |  4 ++++
 .../jvm/jvm.kt                                | 10 ++++----
 .../common/common.kt                          |  4 ++--
 .../dependencies.txt                          |  6 +++++
 .../dependencies.txt                          |  4 ++++
 .../transitive/base_common/common.kt          |  2 +-
 .../transitive/dependencies.txt               |  6 +++++
 .../user.kt                                   |  0
 .../transitiveCommon/dependencies.txt         |  6 +++++
 .../user.kt                                   |  0
 .../transitiveCommon/user_jvm/jvm.kt          |  3 +++
 .../user_jvm_dep(base-common)/jvm.kt          |  3 ---
 .../withOverloads/common/common.kt            |  4 ++--
 .../withOverloads/dependencies.txt            |  4 ++++
 .../AbstractMultiModuleLineMarkerTest.kt      | 16 ++-----------
 .../codeMetaInfo/AbstractCodeMetaInfoTest.kt  | 20 +++++++++++-----
 ...AbstractCodeMetaInfoRenderConfiguration.kt | 23 ++++++++++++-------
 76 files changed, 278 insertions(+), 128 deletions(-)
 create mode 100644 idea/testData/multiModuleLineMarker/actualConstructorWithProperties/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/actualDerived/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/actualEnumEntries/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/actualWithOverload/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/expectConstructorWithProperties/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/expectEnumEntries/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/expectWithActualInSameModule/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/expectWithOverload/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromActualAnnotation/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromActualCompanion/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromActualSealedClass/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromActualTypeAlias/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromClassToAlias/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromExpectCompanion/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromExpectedAnnotation/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromExpectedSealedClass/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/topLevelFunWithKotlinTest/dependencies.txt
 create mode 100644 idea/testData/multiModuleLineMarker/transitive/dependencies.txt
 rename idea/testData/multiModuleLineMarker/transitive/{user_jvm_dep(base-jvm)_dep(base-common) => user_jvm}/user.kt (100%)
 create mode 100644 idea/testData/multiModuleLineMarker/transitiveCommon/dependencies.txt
 rename idea/testData/multiModuleLineMarker/transitiveCommon/{user_common_dep(base-common) => user_common}/user.kt (100%)
 create mode 100644 idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt
 delete mode 100644 idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm_dep(base-common)/jvm.kt
 create mode 100644 idea/testData/multiModuleLineMarker/withOverloads/dependencies.txt

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt
index 327c76c341a..10b44a4f9c1 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt
@@ -107,7 +107,7 @@ class TextDiagnostic(
                 extractDataBefore(matcher.group(2), ":")
 
             val name = matcher.group(3)
-            val parameters = matcher.group(4) ?: return TextDiagnostic(
+            val parameters = matcher.group(5) ?: return TextDiagnostic(
                 name,
                 platform,
                 null,
diff --git a/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/dependencies.txt b/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt
index 463d99ff1d1..6751687e89c 100644
--- a/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt
@@ -1,4 +1,4 @@
-actual class <lineMarker descr="Has declaration in common module">WithConstructor</lineMarker> actual constructor(actual val x: Int, actual val s: String)
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>WithConstructor<!> actual constructor(actual val x: Int, actual val s: String)
 
 /*
 LINEMARKER: Has declaration in common module
diff --git a/idea/testData/multiModuleLineMarker/actualDerived/common/common.kt b/idea/testData/multiModuleLineMarker/actualDerived/common/common.kt
index 13b3b1fe791..0dfc7338f67 100644
--- a/idea/testData/multiModuleLineMarker/actualDerived/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/actualDerived/common/common.kt
@@ -1,6 +1,6 @@
 
-open class <lineMarker descr="<html><body>Is subclassed by<br>&nbsp;&nbsp;&nbsp;&nbsp;<a href="#kotlinClass/testModule_Common:ExpectedChild">ExpectedChild [testModule_Common]</a><br>&nbsp;&nbsp;&nbsp;&nbsp;<a href="#kotlinClass/testModule_JVM:ExpectedChild">ExpectedChild [testModule_JVM]</a><br>&nbsp;&nbsp;&nbsp;&nbsp;<a href="#kotlinClass/testModule_Common:SimpleChild">SimpleChild</a><br><div style='margin-top: 5px'><font size='2'>Click or press Ctrl+Alt+B to navigate</font></div></body</html>">SimpleParent</lineMarker>
+open class <!LINE_MARKER("descr='Is subclassed by ExpectedChild [common] ExpectedChild [jvm] SimpleChild'")!>SimpleParent<!>
 
-expect class <lineMarker descr="Has actuals in JVM">ExpectedChild</lineMarker> : SimpleParent
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>ExpectedChild<!> : SimpleParent
 
 class SimpleChild : SimpleParent()
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/actualDerived/dependencies.txt b/idea/testData/multiModuleLineMarker/actualDerived/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/actualDerived/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/actualEnumEntries/dependencies.txt b/idea/testData/multiModuleLineMarker/actualEnumEntries/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/actualEnumEntries/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt
index c7848f8b937..0fb926b4985 100644
--- a/idea/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt
@@ -1,8 +1,8 @@
 package test
 
-actual enum class <lineMarker>Enum</lineMarker> {
-    <lineMarker>A</lineMarker>,
-    <lineMarker>B</lineMarker>,
-    <lineMarker>C</lineMarker>,
+actual enum class <!LINE_MARKER("descr='Has declaration in common module'")!>Enum<!> {
+    <!LINE_MARKER("descr='Has declaration in common module'")!>A<!>,
+    <!LINE_MARKER("descr='Has declaration in common module'")!>B<!>,
+    <!LINE_MARKER("descr='Has declaration in common module'")!>C<!>,
     D
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/dependencies.txt b/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt
index 0c6e2c14140..35b3db6102e 100644
--- a/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt
@@ -1,6 +1,6 @@
 package test
 
-actual enum class <lineMarker descr="Has declaration in common module">Enum</lineMarker> { A, B, C }
+actual enum class <!LINE_MARKER("descr='Has declaration in common module'")!>Enum<!> { A, B, C }
 
 /*
 LINEMARKER: Has declaration in common module
diff --git a/idea/testData/multiModuleLineMarker/actualWithOverload/dependencies.txt b/idea/testData/multiModuleLineMarker/actualWithOverload/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/actualWithOverload/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt b/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt
index 7a5e725d644..2b5478c0768 100644
--- a/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt
@@ -1,5 +1,5 @@
-expect class <lineMarker>WithConstructor</lineMarker>(x: Int, s: String) {
-    val <lineMarker>x</lineMarker>: Int
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>WithConstructor<!>(x: Int, s: String) {
+    val <!LINE_MARKER("descr='Has actuals in JVM'")!>x<!>: Int
 
-    val <lineMarker>s</lineMarker>: String
+    val <!LINE_MARKER("descr='Has actuals in JVM'")!>s<!>: String
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/dependencies.txt b/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/expectConstructorWithProperties/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt b/idea/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt
index 299bd98f447..0ed0bf85630 100644
--- a/idea/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt
@@ -1,7 +1,7 @@
 package test
 
-expect enum class <lineMarker>Enum</lineMarker> {
-    <lineMarker>A</lineMarker>,
-    <lineMarker>B</lineMarker>,
-    <lineMarker>C</lineMarker>
+expect enum class <!LINE_MARKER("descr='Has actuals in JVM'")!>Enum<!> {
+    <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!>,
+    <!LINE_MARKER("descr='Has actuals in JVM'")!>B<!>,
+    <!LINE_MARKER("descr='Has actuals in JVM'")!>C<!>
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectEnumEntries/dependencies.txt b/idea/testData/multiModuleLineMarker/expectEnumEntries/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/expectEnumEntries/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt b/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt
index 065dd8f0523..cbf5dcf0675 100644
--- a/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt
@@ -1,6 +1,6 @@
 package test
 
-expect enum class <lineMarker descr="Has actuals in JVM">Enum</lineMarker> { A, B, C, D }
+expect enum class <!LINE_MARKER("descr='Has actuals in JVM'")!>Enum<!> { A, B, C, D }
 
 /*
 LINEMARKER: Has actuals in JVM
diff --git a/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/dependencies.txt b/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt b/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt
index 6c0f30ab284..d66935c2213 100644
--- a/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt
@@ -1,7 +1,7 @@
 package test
 
-expect enum class <lineMarker descr="Has actuals in JVM">Enum</lineMarker> {
-    <lineMarker descr="Has actuals in JVM">A</lineMarker>, B, C, D
+expect enum class <!LINE_MARKER("descr='Has actuals in JVM'")!>Enum<!> {
+    <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!>, B, C, D
 }
 
 /*
diff --git a/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/dependencies.txt b/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt
index fa233eae1d0..53282e881ae 100644
--- a/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt
@@ -1,9 +1,9 @@
 package sample
 
-expect fun <lineMarker descr="Has actuals in common">sameFile</lineMarker>()
+expect fun <!LINE_MARKER("descr='Has actuals in common'")!>sameFile<!>()
 
-actual fun <lineMarker>sameFile</lineMarker>() = Unit
+actual fun <!LINE_MARKER("descr='null'")!>sameFile<!>() = Unit
 
-expect fun <lineMarker descr="Has actuals in common">sameModule</lineMarker>()
+expect fun <!LINE_MARKER("descr='Has actuals in common'")!>sameModule<!>()
 
 fun noExpectActualDeclaration() = Unit
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/dependencies.txt b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/dependencies.txt
new file mode 100644
index 00000000000..8da128002e5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/dependencies.txt
@@ -0,0 +1 @@
+MODULE common { platform=[JVM, JS, Native] }
diff --git a/idea/testData/multiModuleLineMarker/expectWithOverload/dependencies.txt b/idea/testData/multiModuleLineMarker/expectWithOverload/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/expectWithOverload/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotation/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualAnnotation/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualAnnotation/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
index 6e2612c3fda..c8e65651448 100644
--- a/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
@@ -1,4 +1,4 @@
-actual annotation class <lineMarker>Ann</lineMarker> actual constructor(
-        actual val <lineMarker>x</lineMarker>: Int,
-        actual val <lineMarker>y</lineMarker>: String
+actual annotation class <!LINE_MARKER("descr='Has declaration in common module'")!>Ann<!> actual constructor(
+        actual val <!LINE_MARKER("descr='Has declaration in common module'")!>x<!>: Int,
+        actual val <!LINE_MARKER("descr='Has declaration in common module'")!>y<!>: String
 )
diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt
index e44371c8b76..5abadf3d27d 100644
--- a/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt
@@ -1,6 +1,6 @@
-actual annotation class <lineMarker descr="Has declaration in common module">Ann</lineMarker>(
-        actual val <lineMarker descr="Has declaration in common module">x</lineMarker>: Int, actual val y: String,
-        actual val <lineMarker descr="Has declaration in common module">z</lineMarker>: Double, actual val b: Boolean
+actual annotation class <!LINE_MARKER("descr='Has declaration in common module'")!>Ann<!>(
+        actual val <!LINE_MARKER("descr='Has declaration in common module'")!>x<!>: Int, actual val y: String,
+        actual val <!LINE_MARKER("descr='Has declaration in common module'")!>z<!>: Double, actual val b: Boolean
 )
 
 /*
diff --git a/idea/testData/multiModuleLineMarker/fromActualCompanion/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualCompanion/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualCompanion/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt
index ec3badfc50f..91f4d34938c 100644
--- a/idea/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt
@@ -1,5 +1,5 @@
-actual class <lineMarker>WithCompanion</lineMarker> {
-    actual companion <lineMarker>object</lineMarker> {
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>WithCompanion<!> {
+    actual companion <!LINE_MARKER("descr='Has declaration in common module'")!>object<!> {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt
index 604846fad0f..960c0b31601 100644
--- a/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt
@@ -1,5 +1,5 @@
-actual class <lineMarker>NoConstructor2</lineMarker>(name: String) {
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>NoConstructor2<!>(name: String) {
     val myName = name
-    actual fun <lineMarker>extraFun</lineMarker>() {}
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>extraFun<!>() {}
 }
 
diff --git a/idea/testData/multiModuleLineMarker/fromActualSealedClass/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualSealedClass/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualSealedClass/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt
index 87cd13f446e..56128a1ab2a 100644
--- a/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt
@@ -1,10 +1,10 @@
-actual sealed class <lineMarker>Sealed</lineMarker> {
+actual sealed class <!LINE_MARKER("descr='Is subclassed by Sealed1 in Sealed [jvm] Sealed2 in Sealed [jvm]'"), LINE_MARKER("descr='Has declaration in common module'")!>Sealed<!> {
 
-    actual object <lineMarker>Sealed1</lineMarker> : Sealed()
+    actual object <!LINE_MARKER("descr='Has declaration in common module'")!>Sealed1<!> : Sealed()
 
-    actual class <lineMarker>Sealed2</lineMarker> : Sealed() {
-        actual val <lineMarker>x</lineMarker> = 42
-        actual fun <lineMarker>foo</lineMarker>() = ""
+    actual class <!LINE_MARKER("descr='Has declaration in common module'")!>Sealed2<!> : Sealed() {
+        actual val <!LINE_MARKER("descr='Has declaration in common module'")!>x<!> = 42
+        actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>() = ""
     }
 }
 
diff --git a/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt
index bb6ef41c824..b7e0b67ea7b 100644
--- a/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt
@@ -1,5 +1,5 @@
-actual class <lineMarker>SecondaryConstructor</lineMarker> {
-    actual <lineMarker>constructor</lineMarker>(name: String, surname: String) {}
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>SecondaryConstructor<!> {
+    actual <!LINE_MARKER("descr='Has declaration in common module'")!>constructor<!>(name: String, surname: String) {}
 }
 
 
diff --git a/idea/testData/multiModuleLineMarker/fromActualTypeAlias/dependencies.txt b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt
index 7ae6035b463..a727af437aa 100644
--- a/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt
@@ -2,5 +2,5 @@ class Some {
     val x: String = "Some"
 }
 
-actual typealias <lineMarker>TypeAlias</lineMarker> = Some
+actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>TypeAlias<!> = Some
 
diff --git a/idea/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt b/idea/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt
index 7a8fcddc333..9ff4aa951af 100644
--- a/idea/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt
@@ -1,4 +1,4 @@
-expect class <lineMarker>Header</lineMarker> {
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>Header<!> {
 
 }
 
diff --git a/idea/testData/multiModuleLineMarker/fromClassToAlias/dependencies.txt b/idea/testData/multiModuleLineMarker/fromClassToAlias/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromClassToAlias/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/dependencies.txt b/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt b/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt
index 41cf458d099..680c20354e8 100644
--- a/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt
+++ b/idea/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt
@@ -1 +1 @@
-actual typealias <lineMarker>Expected</lineMarker> = ExpectedImpl
\ No newline at end of file
+actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>Expected<!> = ExpectedImpl
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt b/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt
index 6477429372c..0144f6531ec 100644
--- a/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt
@@ -1,11 +1,11 @@
-expect class <lineMarker>Header</lineMarker> {
-    fun <lineMarker>foo</lineMarker>(): Int
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>Header<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(): Int
 }
 
-expect class <lineMarker>Incomplete</lineMarker> {
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>Incomplete<!> {
     fun foo(): Int
 }
 
-expect fun <lineMarker>foo</lineMarker>(arg: Int): String
+expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(arg: Int): String
 
-expect val <lineMarker>flag</lineMarker>: Boolean
+expect val <!LINE_MARKER("descr='Has actuals in JVM'")!>flag<!>: Boolean
diff --git a/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/dependencies.txt b/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromCommonToJvmHeader/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/dependencies.txt b/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt
index 6b880d726aa..dcbf99a22d2 100644
--- a/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt
@@ -1,11 +1,11 @@
-actual class <lineMarker>Header</lineMarker> {
-    actual fun <lineMarker>foo</lineMarker>() = 42
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>Header<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>() = 42
 }
 
-actual class <lineMarker>Incomplete</lineMarker>
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>Incomplete<!>
 
-actual fun <lineMarker>foo</lineMarker>(arg: Int) = arg.toString()
+actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>(arg: Int) = arg.toString()
 
-actual val <lineMarker>flag</lineMarker> = true
+actual val <!LINE_MARKER("descr='Has declaration in common module'")!>flag<!> = true
 
 
diff --git a/idea/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt
index c33599807b5..eebedf407a3 100644
--- a/idea/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt
@@ -1,5 +1,5 @@
-expect class <lineMarker>WithCompanion</lineMarker> {
-    companion <lineMarker>object</lineMarker> {
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>WithCompanion<!> {
+    companion <!LINE_MARKER("descr='Has actuals in JVM'")!>object<!> {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectCompanion/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectCompanion/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectCompanion/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
index cd7bdf8b692..99190697843 100644
--- a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
@@ -1,4 +1,4 @@
-expect annotation class <lineMarker>Ann</lineMarker>(
-        val <lineMarker>x</lineMarker>: Int,
-        val <lineMarker>y</lineMarker>: String
+expect annotation class <!LINE_MARKER("descr='Has actuals in JVM'")!>Ann<!>(
+        val <!LINE_MARKER("descr='Has actuals in JVM'")!>x<!>: Int,
+        val <!LINE_MARKER("descr='Has actuals in JVM'")!>y<!>: String
 )
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt
index d5eeccb138e..cbf70367676 100644
--- a/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt
@@ -1,3 +1,3 @@
-expect class <lineMarker>NoConstructor2</lineMarker> {
-    fun <lineMarker>extraFun</lineMarker>()
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>NoConstructor2<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>extraFun<!>()
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt
index 94ca21d39a9..b1a37cd2667 100644
--- a/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt
@@ -1,9 +1,9 @@
-expect sealed class <lineMarker>Sealed</lineMarker> {
+expect sealed class <!LINE_MARKER("descr='Is subclassed by Sealed1 [common] Sealed1 in Sealed [jvm] Sealed2 [common] Sealed2 in Sealed [jvm]'"), LINE_MARKER("descr='Has actuals in JVM'")!>Sealed<!> {
 
-    object <lineMarker>Sealed1</lineMarker> : Sealed
+    object <!LINE_MARKER("descr='Has actuals in JVM'")!>Sealed1<!> : Sealed
 
-    class <lineMarker>Sealed2</lineMarker> : Sealed {
-        val <lineMarker>x</lineMarker>: Int
-        fun <lineMarker>foo</lineMarker>(): String
+    class <!LINE_MARKER("descr='Has actuals in JVM'")!>Sealed2<!> : Sealed {
+        val <!LINE_MARKER("descr='Has actuals in JVM'")!>x<!>: Int
+        fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(): String
     }
 }
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt
index f20aba4ec3c..9fed52110ad 100644
--- a/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt
@@ -1,3 +1,3 @@
-expect class <lineMarker>SecondaryConstructor</lineMarker>{
-    <lineMarker>constructor</lineMarker>(name: String, surname: String)
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>SecondaryConstructor<!>{
+    <!LINE_MARKER("descr='Has actuals in JVM'")!>constructor<!>(name: String, surname: String)
 }
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt
index c19aa8bb8a1..8615ed4a5d5 100644
--- a/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt
@@ -1,3 +1,3 @@
-expect class <lineMarker>TypeAlias</lineMarker> {
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>TypeAlias<!> {
     val x: String
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/dependencies.txt b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt
index 26251a07f1f..1d9bd2cc5c1 100644
--- a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt
@@ -1,21 +1,21 @@
 package test
 
-open class <lineMarker>SimpleParent</lineMarker> {
-    open fun <lineMarker>foo</lineMarker>(n: Int) {}
-    open val <lineMarker>bar</lineMarker>: Int get() = 1
+open class <!LINE_MARKER("descr='Is subclassed by ExpectedChild [common] ExpectedChild [jvm] ExpectedChildChild ExpectedChildChildJvm SimpleChild'")!>SimpleParent<!> {
+    open fun <!LINE_MARKER("descr='Is overridden in test.ExpectedChild test.ExpectedChildChild test.ExpectedChildChildJvm test.SimpleChild'")!>foo<!>(n: Int) {}
+    open val <!LINE_MARKER("descr='Is overridden in test.ExpectedChild test.ExpectedChildChild test.ExpectedChildChildJvm test.SimpleChild'")!>bar<!>: Int get() = 1
 }
 
-expect open class <lineMarker><lineMarker>ExpectedChild</lineMarker></lineMarker> : SimpleParent {
-    override fun <lineMarker><lineMarker>foo</lineMarker></lineMarker>(n: Int)
-    override val <lineMarker><lineMarker>bar</lineMarker></lineMarker>: Int
+expect open class <!LINE_MARKER("descr='Is subclassed by ExpectedChildChild ExpectedChildChildJvm'"), LINE_MARKER("descr='Has actuals in JVM'")!>ExpectedChild<!> : SimpleParent {
+    override fun <!LINE_MARKER("descr='Overrides function in 'SimpleParent''"), LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'")!>foo<!>(n: Int)
+    override val <!LINE_MARKER("descr='Overrides property in 'SimpleParent''"), LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'")!>bar<!>: Int
 }
 
 class ExpectedChildChild : ExpectedChild() {
-    override fun <lineMarker>foo</lineMarker>(n: Int) {}
-    override val <lineMarker>bar</lineMarker>: Int get() = 1
+    override fun <!LINE_MARKER("descr='Overrides function in 'ExpectedChild''")!>foo<!>(n: Int) {}
+    override val <!LINE_MARKER("descr='Overrides property in 'ExpectedChild''")!>bar<!>: Int get() = 1
 }
 
 class SimpleChild : SimpleParent() {
-    override fun <lineMarker>foo</lineMarker>(n: Int) {}
-    override val <lineMarker>bar</lineMarker>: Int get() = 1
+    override fun <!LINE_MARKER("descr='Overrides function in 'SimpleParent''")!>foo<!>(n: Int) {}
+    override val <!LINE_MARKER("descr='Overrides property in 'SimpleParent''")!>bar<!>: Int get() = 1
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/dependencies.txt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt
index c5fb5905f01..5443d3b24bb 100644
--- a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt
@@ -1,21 +1,21 @@
 package test
 
-open class <lineMarker>SimpleParent</lineMarker> {
-    open fun <lineMarker>`foo fun`</lineMarker>(n: Int) {}
-    open val <lineMarker>`bar fun`</lineMarker>: Int get() = 1
+open class <!LINE_MARKER("descr='Is subclassed by ExpectedChild [common] ExpectedChild [jvm] ExpectedChildChild ExpectedChildChildJvm SimpleChild'")!>SimpleParent<!> {
+    open fun <!LINE_MARKER("descr='Is overridden in test.ExpectedChild test.ExpectedChildChild test.ExpectedChildChildJvm test.SimpleChild'")!>`foo fun`<!>(n: Int) {}
+    open val <!LINE_MARKER("descr='Is overridden in test.ExpectedChild test.ExpectedChildChild test.ExpectedChildChildJvm test.SimpleChild'")!>`bar fun`<!>: Int get() = 1
 }
 
-expect open class <lineMarker><lineMarker>ExpectedChild</lineMarker></lineMarker> : SimpleParent {
-    override fun <lineMarker><lineMarker>`foo fun`</lineMarker></lineMarker>(n: Int)
-    override val <lineMarker><lineMarker>`bar fun`</lineMarker></lineMarker>: Int
+expect open class <!LINE_MARKER("descr='Is subclassed by ExpectedChildChild ExpectedChildChildJvm'"), LINE_MARKER("descr='Has actuals in JVM'")!>ExpectedChild<!> : SimpleParent {
+    override fun <!LINE_MARKER("descr='Overrides function in 'SimpleParent''"), LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'")!>`foo fun`<!>(n: Int)
+    override val <!LINE_MARKER("descr='Overrides property in 'SimpleParent''"), LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'")!>`bar fun`<!>: Int
 }
 
 class ExpectedChildChild : ExpectedChild() {
-    override fun <lineMarker>`foo fun`</lineMarker>(n: Int) {}
-    override val <lineMarker>`bar fun`</lineMarker>: Int get() = 1
+    override fun <!LINE_MARKER("descr='Overrides function in 'ExpectedChild''")!>`foo fun`<!>(n: Int) {}
+    override val <!LINE_MARKER("descr='Overrides property in 'ExpectedChild''")!>`bar fun`<!>: Int get() = 1
 }
 
 class SimpleChild : SimpleParent() {
-    override fun <lineMarker>`foo fun`</lineMarker>(n: Int) {}
-    override val <lineMarker>`bar fun`</lineMarker>: Int get() = 1
+    override fun <!LINE_MARKER("descr='Overrides function in 'SimpleParent''")!>`foo fun`<!>(n: Int) {}
+    override val <!LINE_MARKER("descr='Overrides property in 'SimpleParent''")!>`bar fun`<!>: Int get() = 1
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/dependencies.txt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/dependencies.txt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt
index 490d72915ea..4111f1ed22a 100644
--- a/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt
@@ -1,11 +1,11 @@
 package test
 
-actual open class <lineMarker><lineMarker>ExpectedChild</lineMarker></lineMarker> : SimpleParent() {
-    actual override fun <lineMarker><lineMarker><lineMarker>foo</lineMarker></lineMarker></lineMarker>(n: Int) {}
-    actual override val <lineMarker><lineMarker><lineMarker>bar</lineMarker></lineMarker></lineMarker>: Int get() = 1
+actual open class <!LINE_MARKER("descr='Is subclassed by ExpectedChildChildJvm'"), LINE_MARKER("descr='Has declaration in common module'")!>ExpectedChild<!> : SimpleParent() {
+    actual override fun <!LINE_MARKER("descr='Overrides function in 'SimpleParent''"), LINE_MARKER("descr='Has declaration in common module'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChildJvm'")!>foo<!>(n: Int) {}
+    actual override val <!LINE_MARKER("descr='Overrides property in 'SimpleParent''"), LINE_MARKER("descr='Has declaration in common module'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChildJvm'")!>bar<!>: Int get() = 1
 }
 
 class ExpectedChildChildJvm : ExpectedChild() {
-    override fun <lineMarker>foo</lineMarker>(n: Int) {}
-    override val <lineMarker>bar</lineMarker>: Int get() = 1
+    override fun <!LINE_MARKER("descr='Overrides function in 'ExpectedChild''")!>foo<!>(n: Int) {}
+    override val <!LINE_MARKER("descr='Overrides property in 'ExpectedChild''")!>bar<!>: Int get() = 1
 }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/common/common.kt b/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/common/common.kt
index dd5b060371c..418f4218b61 100644
--- a/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/common/common.kt
@@ -1,5 +1,5 @@
-interface <lineMarker>I</lineMarker> {
-    suspend fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;KJs<br>&nbsp;&nbsp;&nbsp;&nbsp;KJvm</body></html>">foo</lineMarker>(s: String)
+interface <!LINE_MARKER("descr='Is implemented by KJs KJvm'")!>I<!> {
+    suspend fun <!LINE_MARKER("descr='Is implemented in KJs KJvm'")!>foo<!>(s: String)
 }
 
 /*
diff --git a/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/dependencies.txt b/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/dependencies.txt
new file mode 100644
index 00000000000..5820c9936e0
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/suspendImplInPlatformModules/dependencies.txt
@@ -0,0 +1,6 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+MODULE js { platform=[JS] }
+
+jvm -> common { kind=DEPENDS_ON }
+js -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/topLevelFunWithKotlinTest/dependencies.txt b/idea/testData/multiModuleLineMarker/topLevelFunWithKotlinTest/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/topLevelFunWithKotlinTest/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/transitive/base_common/common.kt b/idea/testData/multiModuleLineMarker/transitive/base_common/common.kt
index cc1c972043c..2c6611d4048 100644
--- a/idea/testData/multiModuleLineMarker/transitive/base_common/common.kt
+++ b/idea/testData/multiModuleLineMarker/transitive/base_common/common.kt
@@ -1 +1 @@
-expect fun <lineMarker descr="Has actuals in JVM">foo</lineMarker>(): Int
\ No newline at end of file
+expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(): Int
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/transitive/dependencies.txt b/idea/testData/multiModuleLineMarker/transitive/dependencies.txt
new file mode 100644
index 00000000000..b2fde8faed7
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/transitive/dependencies.txt
@@ -0,0 +1,6 @@
+MODULE base_common { platform=[JVM, JS, Native] }
+MODULE base_jvm { platform=[JVM] }
+MODULE user_jvm { platform=[JVM] }
+
+base_jvm -> base_common { kind=DEPENDS_ON }
+user_jvm -> base_common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/transitive/user_jvm_dep(base-jvm)_dep(base-common)/user.kt b/idea/testData/multiModuleLineMarker/transitive/user_jvm/user.kt
similarity index 100%
rename from idea/testData/multiModuleLineMarker/transitive/user_jvm_dep(base-jvm)_dep(base-common)/user.kt
rename to idea/testData/multiModuleLineMarker/transitive/user_jvm/user.kt
diff --git a/idea/testData/multiModuleLineMarker/transitiveCommon/dependencies.txt b/idea/testData/multiModuleLineMarker/transitiveCommon/dependencies.txt
new file mode 100644
index 00000000000..0249f83a26e
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/transitiveCommon/dependencies.txt
@@ -0,0 +1,6 @@
+MODULE base_common { platform=[JVM, JS, Native] }
+MODULE user_common { platform=[JVM, JS, Native] }
+MODULE user_jvm { platform=[JVM] }
+
+user_common -> base_common { kind=DEPENDS_ON }
+user_jvm -> user_common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/transitiveCommon/user_common_dep(base-common)/user.kt b/idea/testData/multiModuleLineMarker/transitiveCommon/user_common/user.kt
similarity index 100%
rename from idea/testData/multiModuleLineMarker/transitiveCommon/user_common_dep(base-common)/user.kt
rename to idea/testData/multiModuleLineMarker/transitiveCommon/user_common/user.kt
diff --git a/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt b/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt
new file mode 100644
index 00000000000..07b1da0e710
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt
@@ -0,0 +1,3 @@
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>Expected<!> {
+    actual val <!LINE_MARKER("descr='Has declaration in common module'")!>some<!> = Some()
+}
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm_dep(base-common)/jvm.kt b/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm_dep(base-common)/jvm.kt
deleted file mode 100644
index 68715f9470e..00000000000
--- a/idea/testData/multiModuleLineMarker/transitiveCommon/user_jvm_dep(base-common)/jvm.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-actual class <lineMarker>Expected</lineMarker> {
-    actual val <lineMarker>some</lineMarker> = Some()
-}
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/withOverloads/common/common.kt b/idea/testData/multiModuleLineMarker/withOverloads/common/common.kt
index a1965111cc2..ad60efb0710 100644
--- a/idea/testData/multiModuleLineMarker/withOverloads/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/withOverloads/common/common.kt
@@ -1,3 +1,3 @@
-expect fun <lineMarker descr="Has actuals in JVM">foo</lineMarker>(): Int
+expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(): Int
 
-expect fun <lineMarker descr="Has actuals in JVM">foo</lineMarker>(arg: Int): Int
+expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(arg: Int): Int
diff --git a/idea/testData/multiModuleLineMarker/withOverloads/dependencies.txt b/idea/testData/multiModuleLineMarker/withOverloads/dependencies.txt
new file mode 100644
index 00000000000..549b0097cf5
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/withOverloads/dependencies.txt
@@ -0,0 +1,4 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+
+jvm -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleLineMarkerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleLineMarkerTest.kt
index 3e104408702..6ed47dac6c9 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleLineMarkerTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleLineMarkerTest.kt
@@ -5,22 +5,10 @@
 
 package org.jetbrains.kotlin.idea.caches.resolve
 
-import org.jetbrains.kotlin.idea.multiplatform.setupMppProjectFromDirStructure
+import org.jetbrains.kotlin.idea.codeMetaInfo.AbstractLineMarkerCodeMetaInfoTest
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
-import java.io.File
 
-abstract class AbstractMultiModuleLineMarkerTest : AbstractMultiModuleHighlightingTest() {
+abstract class AbstractMultiModuleLineMarkerTest : AbstractLineMarkerCodeMetaInfoTest() {
 
     override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/multiModuleLineMarker/"
-
-    override val shouldCheckLineMarkers = true
-
-    override val shouldCheckResult = false
-
-    override fun doTestLineMarkers() = true
-
-    protected fun doTest(path: String) {
-        setupMppProjectFromDirStructure(File(path))
-        checkLineMarkersInProject()
-    }
 }
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt
index b82e39a2f52..b7f5bf28cd6 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt
@@ -29,7 +29,9 @@ import com.intellij.testFramework.runInEdtAndWait
 import com.intellij.util.io.exists
 import gnu.trove.TIntArrayList
 import org.jetbrains.kotlin.checkers.BaseDiagnosticsTest
+import org.jetbrains.kotlin.checkers.diagnostics.DebugInfoDiagnostic
 import org.jetbrains.kotlin.checkers.diagnostics.SyntaxErrorDiagnostic
+import org.jetbrains.kotlin.checkers.diagnostics.factories.DebugInfoDiagnosticFactory0
 import org.jetbrains.kotlin.checkers.utils.CheckerTestUtil
 import org.jetbrains.kotlin.checkers.utils.DiagnosticsRenderingConfiguration
 import org.jetbrains.kotlin.daemon.common.OSKind
@@ -49,9 +51,11 @@ import org.jetbrains.kotlin.idea.stubs.AbstractMultiModuleTest
 import org.jetbrains.kotlin.idea.util.sourceRoots
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.KotlinTestUtils
+import org.junit.Ignore
 import java.io.File
 import java.nio.file.Paths
 
+@Ignore
 class CodeMetaInfoTestCase(
     val codeMetaInfoTypes: Collection<AbstractCodeMetaInfoRenderConfiguration>,
     val checkNoDiagnosticError: Boolean = false
@@ -158,12 +162,11 @@ class CodeMetaInfoTestCase(
                     codeMetaInfo.platforms.add(OSKind.current.toString())
             }
         }
-        if (parsedMetaInfo.isNotEmpty())
-            parsedMetaInfo.forEach {
-                if (it.platforms.isNotEmpty() && OSKind.current.toString() !in it.platforms) codeMetaInfoForCheck.add(
-                    it
-                )
-            }
+        parsedMetaInfo.forEach {
+            if (it.platforms.isNotEmpty() && OSKind.current.toString() !in it.platforms) codeMetaInfoForCheck.add(
+                it
+            )
+        }
         val textWithCodeMetaInfo = CodeMetaInfoRenderer.renderTagsToText(codeMetaInfoForCheck, myEditor.document.text)
         KotlinTestUtils.assertEqualsToFile(
             expectedFile,
@@ -199,6 +202,11 @@ class CodeMetaInfoTestCase(
                                     val diagnostic: AbstractDiagnostic<*> = diagnosticCodeMetaInfo.diagnostic
                                     diagnostic.factory.toString() in (highlightingCodeMetaInfo as HighlightingCodeMetaInfo).highlightingInfo.description
                                 }
+                                is DebugInfoDiagnostic -> {
+                                    val diagnostic: DebugInfoDiagnostic = diagnosticCodeMetaInfo.diagnostic
+                                    diagnostic.factory == DebugInfoDiagnosticFactory0.MISSING_UNRESOLVED &&
+                                            "[DEBUG] Reference is not resolved to anything, but is not marked unresolved" in (highlightingCodeMetaInfo as HighlightingCodeMetaInfo).highlightingInfo.description
+                                }
                                 else -> throw java.lang.IllegalArgumentException("Unknown diagnostic type: ${diagnosticCodeMetaInfo.diagnostic}")
                             }
                 },
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt
index efb82bb2380..2a27efcce1e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt
@@ -17,14 +17,17 @@ import org.jetbrains.kotlin.idea.codeMetaInfo.models.LineMarkerCodeMetaInfo
 
 
 abstract class AbstractCodeMetaInfoRenderConfiguration(var renderParams: Boolean = true) {
-
+    private val clickOrPressRegex = "Click or press (.*)to navigate".toRegex() //We have different hotkeys on different platforms
     open fun asString(codeMetaInfo: CodeMetaInfo) = codeMetaInfo.getTag() + getPlatformsString(codeMetaInfo)
 
     open fun getAdditionalParams(codeMetaInfo: CodeMetaInfo) = ""
 
     protected fun sanitizeLineMarkerTooltip(originalText: String?): String {
         if (originalText == null) return "null"
-        val noHtmlTags = StringUtil.removeHtmlTags(originalText).replace(" ", "")
+        val noHtmlTags = StringUtil.removeHtmlTags(originalText)
+            .replace(" ", "")
+            .replace(clickOrPressRegex, "")
+            .trim()
         return sanitizeLineBreaks(noHtmlTags)
     }
 
@@ -79,15 +82,16 @@ open class DiagnosticCodeMetaInfoRenderConfiguration(
     }
 }
 
-open class LineMarkerRenderConfiguration(val renderDescription: Boolean = true) : AbstractCodeMetaInfoRenderConfiguration() {
+open class LineMarkerRenderConfiguration(var renderDescription: Boolean = true) : AbstractCodeMetaInfoRenderConfiguration() {
     override fun asString(codeMetaInfo: CodeMetaInfo): String {
         if (codeMetaInfo !is LineMarkerCodeMetaInfo) return ""
-        return getTag() + if (renderParams) "(\"${getParamsString(codeMetaInfo)}\")" else ""
+        return getTag() + getParamsString(codeMetaInfo)
     }
 
     fun getTag() = "LINE_MARKER"
 
     private fun getParamsString(lineMarkerCodeMetaInfo: LineMarkerCodeMetaInfo): String {
+        if (!renderParams) return ""
         val params = mutableListOf<String>()
 
         if (renderDescription)
@@ -95,7 +99,8 @@ open class LineMarkerRenderConfiguration(val renderDescription: Boolean = true)
 
         params.add(getAdditionalParams(lineMarkerCodeMetaInfo))
 
-        return params.filter { it.isNotEmpty() }.joinToString("; ")
+        val paramsString = params.filter { it.isNotEmpty() }.joinToString("; ")
+        return if (paramsString.isEmpty()) "" else "(\"$paramsString\")"
     }
 }
 
@@ -107,14 +112,15 @@ open class HighlightingRenderConfiguration(
 
     override fun asString(codeMetaInfo: CodeMetaInfo): String {
         if (codeMetaInfo !is HighlightingCodeMetaInfo) return ""
-        return getTag() + if (renderParams) "(${getParamsString(codeMetaInfo)})" else ""
+        return getTag() + getParamsString(codeMetaInfo)
     }
 
     fun getTag() = "HIGHLIGHTING"
 
     private fun getParamsString(highlightingCodeMetaInfo: HighlightingCodeMetaInfo): String {
-        val params = mutableListOf<String>()
+        if (!renderParams) return ""
 
+        val params = mutableListOf<String>()
         if (renderSeverity)
             params.add("severity='${highlightingCodeMetaInfo.highlightingInfo.severity}'")
         if (renderDescription)
@@ -123,7 +129,8 @@ open class HighlightingRenderConfiguration(
             params.add("textAttributesKey='${highlightingCodeMetaInfo.highlightingInfo.forcedTextAttributesKey}'")
 
         params.add(getAdditionalParams(highlightingCodeMetaInfo))
+        val paramsString = params.filter { it.isNotEmpty() }.joinToString("; ")
 
-        return params.filter { it.isNotEmpty() }.joinToString("; ")
+        return if (paramsString.isEmpty()) "" else "(\"$paramsString\")"
     }
 }
\ No newline at end of file