From b5e2fa5f94150ca16e23bc32ca22d8d2c1d9d9ea Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Mon, 9 Oct 2017 14:35:18 +0300
Subject: [PATCH] Add line marker test for type aliases #KT-20164 Fixed

---
 .../fromActualTypeAlias/common/common.kt                  | 5 +++++
 .../multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt  | 6 ++++++
 .../fromExpectedTypeAlias/common/common.kt                | 3 +++
 .../fromExpectedTypeAlias/jvm/jvm.kt                      | 8 ++++++++
 .../idea/caches/resolve/MultiModuleLineMarkerTest.kt      | 8 ++++++++
 5 files changed, 30 insertions(+)
 create mode 100644 idea/testData/multiModuleLineMarker/fromActualTypeAlias/common/common.kt
 create mode 100644 idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt
 create mode 100644 idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt
 create mode 100644 idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/jvm/jvm.kt

diff --git a/idea/testData/multiModuleLineMarker/fromActualTypeAlias/common/common.kt b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/common/common.kt
new file mode 100644
index 00000000000..142267ad3b4
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/common/common.kt
@@ -0,0 +1,5 @@
+// !CHECK_HIGHLIGHTING
+
+expect class TypeAlias {
+    val x: String
+}
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt
new file mode 100644
index 00000000000..7ae6035b463
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromActualTypeAlias/jvm/jvm.kt
@@ -0,0 +1,6 @@
+class Some {
+    val x: String = "Some"
+}
+
+actual typealias <lineMarker>TypeAlias</lineMarker> = Some
+
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt
new file mode 100644
index 00000000000..c19aa8bb8a1
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/common/common.kt
@@ -0,0 +1,3 @@
+expect class <lineMarker>TypeAlias</lineMarker> {
+    val x: String
+}
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/jvm/jvm.kt
new file mode 100644
index 00000000000..3537b3c1417
--- /dev/null
+++ b/idea/testData/multiModuleLineMarker/fromExpectedTypeAlias/jvm/jvm.kt
@@ -0,0 +1,8 @@
+// !CHECK_HIGHLIGHTING
+
+class Some {
+    val x: String = "Some"
+}
+
+actual typealias TypeAlias = Some
+
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt
index ce50ba2aa7b..68f25620a89 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt
@@ -50,6 +50,10 @@ class MultiModuleLineMarkerTest : AbstractMultiModuleHighlightingTest() {
         doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6])
     }
 
+    fun testFromActualTypeAlias() {
+        doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6])
+    }
+
     fun testFromClassToAlias() {
         doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6])
     }
@@ -78,6 +82,10 @@ class MultiModuleLineMarkerTest : AbstractMultiModuleHighlightingTest() {
         doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6])
     }
 
+    fun testFromExpectedTypeAlias() {
+        doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6])
+    }
+
     fun testKotlinTestAnnotations() {
         doMultiPlatformTest(TargetPlatformKind.JavaScript,
                             configureModule = { module, _ ->