From 9198b7a039a133a8910248c5b66732bd142f1c4b Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Thu, 17 Oct 2019 14:29:02 +0300 Subject: [PATCH] Add test on weakly incompatible actual in intermediate source-set --- .../bottom/bottom.kt | 0 .../dependencies.txt | 6 ++++++ .../middle/middle.kt | 4 ++++ .../weaklyIncompatibleActualInIntermediateModule/top/top.kt | 5 +++++ .../resolve/HierarchicalExpectActualTestGenerated.java | 5 +++++ 5 files changed, 20 insertions(+) create mode 100644 idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/bottom/bottom.kt create mode 100644 idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/dependencies.txt create mode 100644 idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt create mode 100644 idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/top/top.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/bottom/bottom.kt b/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/bottom/bottom.kt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/dependencies.txt b/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/dependencies.txt new file mode 100644 index 00000000000..3a7e0373a33 --- /dev/null +++ b/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/dependencies.txt @@ -0,0 +1,6 @@ +MODULE top { platform=[JVM, JS, Native] } +MODULE middle { platform=[JVM, JS] } +MODULE bottom { platform=[JVM] } + +middle -> top { kind=DEPENDS_ON } +bottom -> middle { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt b/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt new file mode 100644 index 00000000000..50c93af8488 --- /dev/null +++ b/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt @@ -0,0 +1,4 @@ +package sample + +actual class A { +} \ No newline at end of file diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/top/top.kt b/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/top/top.kt new file mode 100644 index 00000000000..54bf6400c61 --- /dev/null +++ b/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/top/top.kt @@ -0,0 +1,5 @@ +package sample + +expect class A { + fun f() +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HierarchicalExpectActualTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HierarchicalExpectActualTestGenerated.java index 0f91be23e1e..7a7c9f3d60d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HierarchicalExpectActualTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HierarchicalExpectActualTestGenerated.java @@ -97,4 +97,9 @@ public class HierarchicalExpectActualTestGenerated extends AbstractHierarchicalE public void testIncompleteActualization() throws Exception { runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/incompleteActualization/"); } + + @TestMetadata("weaklyIncompatibleActualInIntermediateModule") + public void testWeaklyIncompatibleActualInIntermediateModule() throws Exception { + runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/"); + } }