From a8a490ea5ac21597e7dd0a8bf46ceaeed9c540e7 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 29 May 2018 17:26:41 +0200 Subject: [PATCH] Test multifile facades in mpp projects --- .../multifileFacade/a_common_dep(stdlib)/common.kt | 7 +++++++ .../multifileFacade/a_jvm_dep(stdlib)/j/Use.java | 8 ++++++++ .../multifileFacade/a_jvm_dep(stdlib)/j/jvm.kt | 5 +++++ .../multifileFacade/b_jvm_dep(a-jvm)/j/Use.java | 8 ++++++++ .../resolve/MultiPlatformHighlightingTestGenerated.java | 5 +++++ 5 files changed, 33 insertions(+) create mode 100644 idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/a_common_dep(stdlib)/common.kt create mode 100644 idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/a_jvm_dep(stdlib)/j/Use.java create mode 100644 idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/a_jvm_dep(stdlib)/j/jvm.kt create mode 100644 idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/b_jvm_dep(a-jvm)/j/Use.java diff --git a/idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/a_common_dep(stdlib)/common.kt b/idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/a_common_dep(stdlib)/common.kt new file mode 100644 index 00000000000..54391209038 --- /dev/null +++ b/idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/a_common_dep(stdlib)/common.kt @@ -0,0 +1,7 @@ +@file:kotlin.jvm.JvmName("MultifileKt") +@file:kotlin.jvm.JvmMultifileClass +package j + +fun common() { + +} \ No newline at end of file diff --git a/idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/a_jvm_dep(stdlib)/j/Use.java b/idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/a_jvm_dep(stdlib)/j/Use.java new file mode 100644 index 00000000000..50eca88130f --- /dev/null +++ b/idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/a_jvm_dep(stdlib)/j/Use.java @@ -0,0 +1,8 @@ +package j; + +public class Use { + public static void use() { + j.MultifileKt.common(); + j.MultifileKt.j(); + } +} \ No newline at end of file diff --git a/idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/a_jvm_dep(stdlib)/j/jvm.kt b/idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/a_jvm_dep(stdlib)/j/jvm.kt new file mode 100644 index 00000000000..6b15c67469c --- /dev/null +++ b/idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/a_jvm_dep(stdlib)/j/jvm.kt @@ -0,0 +1,5 @@ +@file:kotlin.jvm.JvmName("MultifileKt") +@file:kotlin.jvm.JvmMultifileClass +package j + +fun j() {} \ No newline at end of file diff --git a/idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/b_jvm_dep(a-jvm)/j/Use.java b/idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/b_jvm_dep(a-jvm)/j/Use.java new file mode 100644 index 00000000000..50eca88130f --- /dev/null +++ b/idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/b_jvm_dep(a-jvm)/j/Use.java @@ -0,0 +1,8 @@ +package j; + +public class Use { + public static void use() { + j.MultifileKt.common(); + j.MultifileKt.j(); + } +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiPlatformHighlightingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiPlatformHighlightingTestGenerated.java index aee5adc9c57..719b9a7a213 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiPlatformHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiPlatformHighlightingTestGenerated.java @@ -94,6 +94,11 @@ public class MultiPlatformHighlightingTestGenerated extends AbstractMultiPlatfor runTest("idea/testData/multiModuleHighlighting/multiplatform/javaUsesPlatformFacade/"); } + @TestMetadata("multifileFacade") + public void testMultifileFacade() throws Exception { + runTest("idea/testData/multiModuleHighlighting/multiplatform/multifileFacade/"); + } + @TestMetadata("nestedClassWithoutImpl") public void testNestedClassWithoutImpl() throws Exception { runTest("idea/testData/multiModuleHighlighting/multiplatform/nestedClassWithoutImpl/"); -- GitLab