From 908d36862fa94f3137c5f13bc762b82463b33998 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Tue, 21 Dec 2021 11:35:28 +0300
Subject: [PATCH] [Kotlin][MPP] Fixup MultiModuleLineMarkerTestGenerated after
 expect/actual marker changes

^KT-50120

GitOrigin-RevId: 3a34f8c6ad63bf4c19af0c42ac9ebcbbfd780187
---
 .../actualConstructorWithProperties/jvm/jvm.kt       |  2 +-
 .../actualDerived/common/common.kt                   |  4 ++--
 .../actualEnumEntries/jvm/jvm.kt                     | 10 +++++-----
 .../actualEnumEntriesInOneLine/jvm/jvm.kt            |  2 +-
 .../expectConstructorWithProperties/common/common.kt |  8 ++++----
 .../expectEnumEntries/common/common.kt               | 10 +++++-----
 .../expectEnumEntriesInOneLine/common/common.kt      |  2 +-
 .../common/common.kt                                 |  4 ++--
 .../expectWithActualInSameModule/common/common.kt    |  8 ++++----
 .../fromActualAnnotation/jvm/jvm.kt                  |  6 +++---
 .../jvm/jvm.kt                                       |  6 +++---
 .../fromActualCompanion/jvm/jvm.kt                   |  6 +++---
 .../fromActualPrimaryConstructor/jvm/jvm.kt          |  5 ++---
 .../fromActualSealedClass/jvm/jvm.kt                 | 10 +++++-----
 .../fromActualSecondaryConstructor/jvm/jvm.kt        |  6 ++----
 .../fromActualTypeAlias/jvm/jvm.kt                   |  3 +--
 .../fromClassToAlias/common/common.kt                |  3 +--
 .../fromClassToJavaAliasInTest/jvm/empty.kt          |  2 +-
 .../fromCommonToJvmHeader/common/common.kt           | 10 +++++-----
 .../fromCommonToJvmImpl/jvm/jvm.kt                   | 12 +++++-------
 .../fromExpectCompanion/common/common.kt             |  6 +++---
 .../fromExpectedAnnotation/common/common.kt          |  8 ++++----
 .../fromExpectedPrimaryConstructor/common/common.kt  |  6 +++---
 .../fromExpectedSealedClass/common/common.kt         | 10 +++++-----
 .../common/common.kt                                 |  4 ++--
 .../fromExpectedTypeAlias/common/common.kt           |  4 ++--
 .../common/common.kt                                 |  6 +++---
 .../common/common.kt                                 |  6 +++---
 .../hierarchyWithExpectClassPlatformSide/jvm/jvm.kt  |  6 +++---
 .../transitive/base_common/common.kt                 |  2 +-
 .../transitiveCommon/user_jvm/jvm.kt                 |  6 +++---
 .../withOverloads/common/common.kt                   |  4 ++--
 32 files changed, 90 insertions(+), 97 deletions(-)

diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt
index 6751687e89cf..ec65b88aea71 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualConstructorWithProperties/jvm/jvm.kt
@@ -1,4 +1,4 @@
-actual class <!LINE_MARKER("descr='Has declaration in common module'")!>WithConstructor<!> actual constructor(actual val x: Int, actual val s: String)
+actual class <!LINE_MARKER("descr='Has expects in common module'")!>WithConstructor<!> actual constructor(actual val x: Int, actual val s: String)
 
 /*
 LINEMARKER: Has declaration in common module
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualDerived/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualDerived/common/common.kt
index 0314f22ab7f5..147a828b0269 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualDerived/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualDerived/common/common.kt
@@ -1,5 +1,5 @@
 open class <!LINE_MARKER("descr='Is subclassed by ExpectedChild [common] ExpectedChild [jvm] SimpleChild  Click or press ... to navigate'")!>SimpleParent<!>
 
-expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>ExpectedChild<!> : SimpleParent
+expect class <!LINE_MARKER("descr='Has actuals in jvm module'")!>ExpectedChild<!> : SimpleParent
 
-class SimpleChild : SimpleParent()
\ No newline at end of file
+class SimpleChild : SimpleParent()
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt
index 0fb926b49851..1a26f791a720 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualEnumEntries/jvm/jvm.kt
@@ -1,8 +1,8 @@
 package test
 
-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<!>,
+actual enum class <!LINE_MARKER("descr='Has expects in common module'")!>Enum<!> {
+    <!LINE_MARKER("descr='Has expects in common module'")!>A<!>,
+    <!LINE_MARKER("descr='Has expects in common module'")!>B<!>,
+    <!LINE_MARKER("descr='Has expects in common module'")!>C<!>,
     D
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt
index 35b3db6102e3..97fe59350ab6 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/actualEnumEntriesInOneLine/jvm/jvm.kt
@@ -1,6 +1,6 @@
 package test
 
-actual enum class <!LINE_MARKER("descr='Has declaration in common module'")!>Enum<!> { A, B, C }
+actual enum class <!LINE_MARKER("descr='Has expects in common module'")!>Enum<!> { A, B, C }
 
 /*
 LINEMARKER: Has declaration in common module
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt
index 2b5478c07683..9e249d2abf24 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectConstructorWithProperties/common/common.kt
@@ -1,5 +1,5 @@
-expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>WithConstructor<!>(x: Int, s: String) {
-    val <!LINE_MARKER("descr='Has actuals in JVM'")!>x<!>: Int
+expect class <!LINE_MARKER("descr='Has actuals in jvm module'")!>WithConstructor<!>(x: Int, s: String) {
+    val <!LINE_MARKER("descr='Has actuals in jvm module'")!>x<!>: Int
 
-    val <!LINE_MARKER("descr='Has actuals in JVM'")!>s<!>: String
-}
\ No newline at end of file
+    val <!LINE_MARKER("descr='Has actuals in jvm module'")!>s<!>: String
+}
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt
index 0ed0bf856308..ab496d10e22f 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectEnumEntries/common/common.kt
@@ -1,7 +1,7 @@
 package test
 
-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
+expect enum class <!LINE_MARKER("descr='Has actuals in jvm module'")!>Enum<!> {
+    <!LINE_MARKER("descr='Has actuals in jvm module'")!>A<!>,
+    <!LINE_MARKER("descr='Has actuals in jvm module'")!>B<!>,
+    <!LINE_MARKER("descr='Has actuals in jvm module'")!>C<!>
+}
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt
index cbf5dcf06755..3295deca6da1 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectEnumEntriesInOneLine/common/common.kt
@@ -1,6 +1,6 @@
 package test
 
-expect enum class <!LINE_MARKER("descr='Has actuals in JVM'")!>Enum<!> { A, B, C, D }
+expect enum class <!LINE_MARKER("descr='Has actuals in jvm module'")!>Enum<!> { A, B, C, D }
 
 /*
 LINEMARKER: Has actuals in JVM
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt
index d66935c2213f..7b42b4e36710 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectEnumWithEnumEntriesInOneLine/common/common.kt
@@ -1,7 +1,7 @@
 package test
 
-expect enum class <!LINE_MARKER("descr='Has actuals in JVM'")!>Enum<!> {
-    <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!>, B, C, D
+expect enum class <!LINE_MARKER("descr='Has actuals in jvm module'")!>Enum<!> {
+    <!LINE_MARKER("descr='Has actuals in jvm module'")!>A<!>, B, C, D
 }
 
 /*
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt
index 390c9123cfd7..de32f7e60556 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt
@@ -1,9 +1,9 @@
 package sample
 
-expect fun <!LINE_MARKER("descr='Has actuals in common'")!>sameFile<!>()
+expect fun <!LINE_MARKER("descr='Has actuals in common module'")!>sameFile<!>()
 
-actual fun <!LINE_MARKER!>sameFile<!>() = Unit
+actual fun <!LINE_MARKER("descr='Has expects in common module'")!>sameFile<!>() = Unit
 
-expect fun <!LINE_MARKER("descr='Has actuals in common'")!>sameModule<!>()
+expect fun <!LINE_MARKER("descr='Has actuals in common module'")!>sameModule<!>()
 
-fun noExpectActualDeclaration() = Unit
\ No newline at end of file
+fun noExpectActualDeclaration() = Unit
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
index c8e656514483..12b7bfae0a86 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
@@ -1,4 +1,4 @@
-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
+actual annotation class <!LINE_MARKER("descr='Has expects in common module'")!>Ann<!> actual constructor(
+        actual val <!LINE_MARKER("descr='Has expects in common module'")!>x<!>: Int,
+        actual val <!LINE_MARKER("descr='Has expects in common module'")!>y<!>: String
 )
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt
index 5abadf3d27de..e821db19fccb 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualAnnotationWithParametersInOneLine/jvm/jvm.kt
@@ -1,6 +1,6 @@
-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
+actual annotation class <!LINE_MARKER("descr='Has expects in common module'")!>Ann<!>(
+        actual val <!LINE_MARKER("descr='Has expects in common module'")!>x<!>: Int, actual val y: String,
+        actual val <!LINE_MARKER("descr='Has expects in common module'")!>z<!>: Double, actual val b: Boolean
 )
 
 /*
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt
index 91f4d34938cf..7827e119a3d8 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualCompanion/jvm/jvm.kt
@@ -1,5 +1,5 @@
-actual class <!LINE_MARKER("descr='Has declaration in common module'")!>WithCompanion<!> {
-    actual companion <!LINE_MARKER("descr='Has declaration in common module'")!>object<!> {
+actual class <!LINE_MARKER("descr='Has expects in common module'")!>WithCompanion<!> {
+    actual companion <!LINE_MARKER("descr='Has expects in common module'")!>object<!> {
 
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt
index 960c0b316018..d6ece49f62af 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualPrimaryConstructor/jvm/jvm.kt
@@ -1,5 +1,4 @@
-actual class <!LINE_MARKER("descr='Has declaration in common module'")!>NoConstructor2<!>(name: String) {
+actual class <!LINE_MARKER("descr='Has expects in common module'")!>NoConstructor2<!>(name: String) {
     val myName = name
-    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>extraFun<!>() {}
+    actual fun <!LINE_MARKER("descr='Has expects in common module'")!>extraFun<!>() {}
 }
-
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt
index a63f22e3dd1b..410e9d1d993d 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt
@@ -1,9 +1,9 @@
-actual sealed class <!LINE_MARKER("descr='Has declaration in common module'"), LINE_MARKER("descr='Is subclassed by Sealed1 in Sealed [jvm] Sealed2 in Sealed [jvm]  Click or press ... to navigate'")!>Sealed<!> {
+actual sealed class <!LINE_MARKER("descr='Has expects in common module'"), LINE_MARKER("descr='Is subclassed by Sealed1 in Sealed [jvm] Sealed2 in Sealed [jvm]  Click or press ... to navigate'")!>Sealed<!> {
 
-    actual object <!LINE_MARKER("descr='Has declaration in common module'")!>Sealed1<!> : Sealed()
+    actual object <!LINE_MARKER("descr='Has expects in common module'")!>Sealed1<!> : Sealed()
 
-    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<!>() = ""
+    actual class <!LINE_MARKER("descr='Has expects in common module'")!>Sealed2<!> : Sealed() {
+        actual val <!LINE_MARKER("descr='Has expects in common module'")!>x<!> = 42
+        actual fun <!LINE_MARKER("descr='Has expects in common module'")!>foo<!>() = ""
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt
index b7e0b67ea7b4..0ec66261705f 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualSecondaryConstructor/jvm/jvm.kt
@@ -1,5 +1,3 @@
-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) {}
+actual class <!LINE_MARKER("descr='Has expects in common module'")!>SecondaryConstructor<!> {
+    actual <!LINE_MARKER("descr='Has expects in common module'")!>constructor<!>(name: String, surname: String) {}
 }
-
-
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt
index a727af437aab..8ad044990cab 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt
@@ -2,5 +2,4 @@ class Some {
     val x: String = "Some"
 }
 
-actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>TypeAlias<!> = Some
-
+actual typealias <!LINE_MARKER("descr='Has expects in common module'")!>TypeAlias<!> = Some
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt
index 9ff4aa951af4..5c08e36f9c54 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromClassToAlias/common/common.kt
@@ -1,4 +1,3 @@
-expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>Header<!> {
+expect class <!LINE_MARKER("descr='Has actuals in jvm module'")!>Header<!> {
 
 }
-
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt
index 680c20354e8c..e6042e071b90 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromClassToJavaAliasInTest/jvm/empty.kt
@@ -1 +1 @@
-actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>Expected<!> = ExpectedImpl
\ No newline at end of file
+actual typealias <!LINE_MARKER("descr='Has expects in common module'")!>Expected<!> = ExpectedImpl
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt
index 0144f6531ec2..ccf91980a6fa 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromCommonToJvmHeader/common/common.kt
@@ -1,11 +1,11 @@
-expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>Header<!> {
-    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(): Int
+expect class <!LINE_MARKER("descr='Has actuals in jvm module'")!>Header<!> {
+    fun <!LINE_MARKER("descr='Has actuals in jvm module'")!>foo<!>(): Int
 }
 
-expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>Incomplete<!> {
+expect class <!LINE_MARKER("descr='Has actuals in jvm module'")!>Incomplete<!> {
     fun foo(): Int
 }
 
-expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(arg: Int): String
+expect fun <!LINE_MARKER("descr='Has actuals in jvm module'")!>foo<!>(arg: Int): String
 
-expect val <!LINE_MARKER("descr='Has actuals in JVM'")!>flag<!>: Boolean
+expect val <!LINE_MARKER("descr='Has actuals in jvm module'")!>flag<!>: Boolean
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt
index dcbf99a22d2c..2fd96ba5c77d 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromCommonToJvmImpl/jvm/jvm.kt
@@ -1,11 +1,9 @@
-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 <!LINE_MARKER("descr='Has expects in common module'")!>Header<!> {
+    actual fun <!LINE_MARKER("descr='Has expects in common module'")!>foo<!>() = 42
 }
 
-actual class <!LINE_MARKER("descr='Has declaration in common module'")!>Incomplete<!>
-
-actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>(arg: Int) = arg.toString()
-
-actual val <!LINE_MARKER("descr='Has declaration in common module'")!>flag<!> = true
+actual class <!LINE_MARKER("descr='Has expects in common module'")!>Incomplete<!>
 
+actual fun <!LINE_MARKER("descr='Has expects in common module'")!>foo<!>(arg: Int) = arg.toString()
 
+actual val <!LINE_MARKER("descr='Has expects in common module'")!>flag<!> = true
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt
index eebedf407a30..53cb2f3a85ec 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectCompanion/common/common.kt
@@ -1,5 +1,5 @@
-expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>WithCompanion<!> {
-    companion <!LINE_MARKER("descr='Has actuals in JVM'")!>object<!> {
+expect class <!LINE_MARKER("descr='Has actuals in jvm module'")!>WithCompanion<!> {
+    companion <!LINE_MARKER("descr='Has actuals in jvm module'")!>object<!> {
 
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
index 99190697843d..2a237d8801af 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
@@ -1,4 +1,4 @@
-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
+expect annotation class <!LINE_MARKER("descr='Has actuals in jvm module'")!>Ann<!>(
+        val <!LINE_MARKER("descr='Has actuals in jvm module'")!>x<!>: Int,
+        val <!LINE_MARKER("descr='Has actuals in jvm module'")!>y<!>: String
+)
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt
index cbf703676761..a33ed08e8906 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedPrimaryConstructor/common/common.kt
@@ -1,3 +1,3 @@
-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
+expect class <!LINE_MARKER("descr='Has actuals in jvm module'")!>NoConstructor2<!> {
+    fun <!LINE_MARKER("descr='Has actuals in jvm module'")!>extraFun<!>()
+}
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt
index 248177e0126a..bac22baa2b32 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt
@@ -1,9 +1,9 @@
-expect sealed class <!LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is subclassed by Sealed1 in Sealed [jvm] Sealed1 [common] Sealed2 in Sealed [jvm] Sealed2 [common]  Click or press ... to navigate'")!>Sealed<!> {
+expect sealed class <!LINE_MARKER("descr='Has actuals in jvm module'"), LINE_MARKER("descr='Is subclassed by Sealed1 in Sealed [jvm] Sealed1 [common] Sealed2 in Sealed [jvm] Sealed2 [common]  Click or press ... to navigate'")!>Sealed<!> {
 
-    object <!LINE_MARKER("descr='Has actuals in JVM'")!>Sealed1<!> : Sealed
+    object <!LINE_MARKER("descr='Has actuals in jvm module'")!>Sealed1<!> : Sealed
 
-    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
+    class <!LINE_MARKER("descr='Has actuals in jvm module'")!>Sealed2<!> : Sealed {
+        val <!LINE_MARKER("descr='Has actuals in jvm module'")!>x<!>: Int
+        fun <!LINE_MARKER("descr='Has actuals in jvm module'")!>foo<!>(): String
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt
index 9fed52110ade..fa6fc8aea567 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedSecondaryConstructor/common/common.kt
@@ -1,3 +1,3 @@
-expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>SecondaryConstructor<!>{
-    <!LINE_MARKER("descr='Has actuals in JVM'")!>constructor<!>(name: String, surname: String)
+expect class <!LINE_MARKER("descr='Has actuals in jvm module'")!>SecondaryConstructor<!>{
+    <!LINE_MARKER("descr='Has actuals in jvm module'")!>constructor<!>(name: String, surname: String)
 }
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt
index 8615ed4a5d5e..f30ae39f52c8 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt
@@ -1,3 +1,3 @@
-expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>TypeAlias<!> {
+expect class <!LINE_MARKER("descr='Has actuals in jvm module'")!>TypeAlias<!> {
     val x: String
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt
index 90ccd1676c7b..122f73a2188f 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSide/common/common.kt
@@ -5,9 +5,9 @@ open class <!LINE_MARKER("descr='Is subclassed by ExpectedChild [common] Expecte
     open val <!LINE_MARKER("descr='Is overridden in test.ExpectedChild test.ExpectedChildChild test.ExpectedChildChildJvm test.SimpleChild'")!>bar<!>: Int get() = 1
 }
 
-expect open class <!LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is subclassed by ExpectedChildChild ExpectedChildChildJvm  Click or press ... to navigate'")!>ExpectedChild<!> : SimpleParent {
-    override fun <!LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'"), LINE_MARKER("descr='Overrides function in 'SimpleParent''")!>foo<!>(n: Int)
-    override val <!LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'"), LINE_MARKER("descr='Overrides property in 'SimpleParent''")!>bar<!>: Int
+expect open class <!LINE_MARKER("descr='Has actuals in jvm module'"), LINE_MARKER("descr='Is subclassed by ExpectedChildChild ExpectedChildChildJvm  Click or press ... to navigate'")!>ExpectedChild<!> : SimpleParent {
+    override fun <!LINE_MARKER("descr='Has actuals in jvm module'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'"), LINE_MARKER("descr='Overrides function in 'SimpleParent''")!>foo<!>(n: Int)
+    override val <!LINE_MARKER("descr='Has actuals in jvm module'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'"), LINE_MARKER("descr='Overrides property in 'SimpleParent''")!>bar<!>: Int
 }
 
 class ExpectedChildChild : ExpectedChild() {
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt
index 09f1cad97700..9244287f0c31 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/hierarchyWithExpectClassCommonSideNonJavaIds/common/common.kt
@@ -5,9 +5,9 @@ open class <!LINE_MARKER("descr='Is subclassed by ExpectedChild [common] Expecte
     open val <!LINE_MARKER("descr='Is overridden in test.ExpectedChild test.ExpectedChildChild test.ExpectedChildChildJvm test.SimpleChild'")!>`bar fun`<!>: Int get() = 1
 }
 
-expect open class <!LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is subclassed by ExpectedChildChild ExpectedChildChildJvm  Click or press ... to navigate'")!>ExpectedChild<!> : SimpleParent {
-    override fun <!LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'"), LINE_MARKER("descr='Overrides function in 'SimpleParent''")!>`foo fun`<!>(n: Int)
-    override val <!LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'"), LINE_MARKER("descr='Overrides property in 'SimpleParent''")!>`bar fun`<!>: Int
+expect open class <!LINE_MARKER("descr='Has actuals in jvm module'"), LINE_MARKER("descr='Is subclassed by ExpectedChildChild ExpectedChildChildJvm  Click or press ... to navigate'")!>ExpectedChild<!> : SimpleParent {
+    override fun <!LINE_MARKER("descr='Has actuals in jvm module'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'"), LINE_MARKER("descr='Overrides function in 'SimpleParent''")!>`foo fun`<!>(n: Int)
+    override val <!LINE_MARKER("descr='Has actuals in jvm module'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChild test.ExpectedChildChildJvm'"), LINE_MARKER("descr='Overrides property in 'SimpleParent''")!>`bar fun`<!>: Int
 }
 
 class ExpectedChildChild : ExpectedChild() {
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt
index 82da71e8efec..58216aa1e9d8 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/hierarchyWithExpectClassPlatformSide/jvm/jvm.kt
@@ -1,8 +1,8 @@
 package test
 
-actual open class <!LINE_MARKER("descr='Has declaration in common module'"), LINE_MARKER("descr='Is subclassed by ExpectedChildChildJvm  Click or press ... to navigate'")!>ExpectedChild<!> : SimpleParent() {
-    actual override fun <!LINE_MARKER("descr='Has declaration in common module'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChildJvm'"), LINE_MARKER("descr='Overrides function in 'SimpleParent''")!>foo<!>(n: Int) {}
-    actual override val <!LINE_MARKER("descr='Has declaration in common module'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChildJvm'"), LINE_MARKER("descr='Overrides property in 'SimpleParent''")!>bar<!>: Int get() = 1
+actual open class <!LINE_MARKER("descr='Has expects in common module'"), LINE_MARKER("descr='Is subclassed by ExpectedChildChildJvm  Click or press ... to navigate'")!>ExpectedChild<!> : SimpleParent() {
+    actual override fun <!LINE_MARKER("descr='Has expects in common module'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChildJvm'"), LINE_MARKER("descr='Overrides function in 'SimpleParent''")!>foo<!>(n: Int) {}
+    actual override val <!LINE_MARKER("descr='Has expects in common module'"), LINE_MARKER("descr='Is overridden in test.ExpectedChildChildJvm'"), LINE_MARKER("descr='Overrides property in 'SimpleParent''")!>bar<!>: Int get() = 1
 }
 
 class ExpectedChildChildJvm : ExpectedChild() {
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/transitive/base_common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/transitive/base_common/common.kt
index 2c6611d4048e..d231928ac6de 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/transitive/base_common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/transitive/base_common/common.kt
@@ -1 +1 @@
-expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(): Int
\ No newline at end of file
+expect fun <!LINE_MARKER("descr='Has actuals in base_jvm module'")!>foo<!>(): Int
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt
index 07b1da0e710b..37e0b5ece8af 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/transitiveCommon/user_jvm/jvm.kt
@@ -1,3 +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
+actual class <!LINE_MARKER("descr='Has expects in user_common module'")!>Expected<!> {
+    actual val <!LINE_MARKER("descr='Has expects in user_common module'")!>some<!> = Some()
+}
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/withOverloads/common/common.kt b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/withOverloads/common/common.kt
index ad60efb0710f..d6167b16b971 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/withOverloads/common/common.kt
+++ b/plugins/kotlin/idea/tests/testData/multiModuleLineMarker/withOverloads/common/common.kt
@@ -1,3 +1,3 @@
-expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(): Int
+expect fun <!LINE_MARKER("descr='Has actuals in jvm module'")!>foo<!>(): Int
 
-expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(arg: Int): Int
+expect fun <!LINE_MARKER("descr='Has actuals in jvm module'")!>foo<!>(arg: Int): Int