From 0ebe9d576a01349407c23442b55a914c2959255c Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 9 Oct 2017 13:23:55 +0300 Subject: [PATCH] Add line marker test for sealed classes #KT-20043 Fixed --- .../fromActualSealedClass/common/common.kt | 11 +++++++++++ .../fromActualSealedClass/jvm/jvm.kt | 11 +++++++++++ .../fromExpectedSealedClass/common/common.kt | 9 +++++++++ .../fromExpectedSealedClass/jvm/jvm.kt | 13 +++++++++++++ .../caches/resolve/MultiModuleLineMarkerTest.kt | 8 ++++++++ 5 files changed, 52 insertions(+) create mode 100644 idea/testData/multiModuleLineMarker/fromActualSealedClass/common/common.kt create mode 100644 idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt create mode 100644 idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt create mode 100644 idea/testData/multiModuleLineMarker/fromExpectedSealedClass/jvm/jvm.kt diff --git a/idea/testData/multiModuleLineMarker/fromActualSealedClass/common/common.kt b/idea/testData/multiModuleLineMarker/fromActualSealedClass/common/common.kt new file mode 100644 index 00000000000..05180025d44 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromActualSealedClass/common/common.kt @@ -0,0 +1,11 @@ +// !CHECK_HIGHLIGHTING + +expect sealed class Sealed { + + object Sealed1 : Sealed + + class Sealed2 : Sealed { + val x: Int + fun foo(): String + } +} diff --git a/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt new file mode 100644 index 00000000000..87cd13f446e --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromActualSealedClass/jvm/jvm.kt @@ -0,0 +1,11 @@ +actual sealed class Sealed { + + actual object Sealed1 : Sealed() + + actual class Sealed2 : Sealed() { + actual val x = 42 + actual fun foo() = "" + } +} + + diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt new file mode 100644 index 00000000000..94ca21d39a9 --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/common/common.kt @@ -0,0 +1,9 @@ +expect sealed class Sealed { + + object Sealed1 : Sealed + + class Sealed2 : Sealed { + val x: Int + fun foo(): String + } +} diff --git a/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/jvm/jvm.kt new file mode 100644 index 00000000000..992929cea9c --- /dev/null +++ b/idea/testData/multiModuleLineMarker/fromExpectedSealedClass/jvm/jvm.kt @@ -0,0 +1,13 @@ +// !CHECK_HIGHLIGHTING + +actual sealed class Sealed { + + actual object Sealed1 : Sealed() + + actual class Sealed2 : Sealed() { + actual val x = 42 + actual fun foo() = "" + } +} + + 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 78f5cb915e6..17e2fcba10d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt @@ -34,6 +34,10 @@ class MultiModuleLineMarkerTest : AbstractMultiModuleHighlightingTest() { override fun doTestLineMarkers() = true + fun testFromActualSealedClass() { + doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]) + } + fun testFromActualSecondaryConstructor() { doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]) } @@ -50,6 +54,10 @@ class MultiModuleLineMarkerTest : AbstractMultiModuleHighlightingTest() { doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]) } + fun testFromExpectedSealedClass() { + doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]) + } + fun testFromExpectedSecondaryConstructor() { doMultiPlatformTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]) }