From c3abb27b31c022f339be90410e238b415737c666 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Fri, 17 Apr 2020 12:37:11 +0300
Subject: [PATCH] Add test for KT-35957

Original commit: 2442abadc379fd7fb7826ae957e3d7db4fa67db7
---
 .../mpp/jvmOnly/multifilePartChanged/X.kt          |  4 ++++
 .../mpp/jvmOnly/multifilePartChanged/build.log     | 14 ++++++++++++++
 .../mpp/jvmOnly/multifilePartChanged/commonX.kt    |  5 +++++
 .../mpp/jvmOnly/multifilePartChanged/dummy.kt      |  1 +
 .../jvmOnly/multifilePartChanged/utilsActual.kt    |  4 ++++
 .../multifilePartChanged/utilsActual.kt.new        |  6 ++++++
 .../jvmOnly/multifilePartChanged/utilsNoActual.kt  |  4 ++++
 7 files changed, 38 insertions(+)
 create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt
 create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log
 create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt
 create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt
 create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt
 create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new
 create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt

diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt
new file mode 100644
index 00000000000..e47e8dbdb7d
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt
@@ -0,0 +1,4 @@
+actual class X {
+    actual fun foo(): Any = 0
+    fun bar(): Any = 1
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log
new file mode 100644
index 00000000000..5cec33fd7c5
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log
@@ -0,0 +1,14 @@
+================ Step #1 =================
+
+Compiling files:
+  src/X.kt
+  src/commonX.kt
+  src/utilsActual.kt
+  src/utilsNoActual.kt
+End of files
+Exit code: ABORT
+------------------------------------------
+COMPILATION FAILED
+Class 'X' has several compatible actual declarations in modules <multifilePartChanged>, <multifilePartChanged>
+Function 'foo' has several compatible actual declarations in modules <multifilePartChanged>, <multifilePartChanged>
+Function 'useX' has several compatible actual declarations in modules <multifilePartChanged>, <multifilePartChanged>
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt
new file mode 100644
index 00000000000..14468f025b7
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt
@@ -0,0 +1,5 @@
+expect class X {
+    fun foo(): Any
+}
+
+expect fun useX(x: X): Any
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt
new file mode 100644
index 00000000000..3f0c1c77242
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt
@@ -0,0 +1 @@
+fun dummy() {}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt
new file mode 100644
index 00000000000..fa048f3f576
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt
@@ -0,0 +1,4 @@
+@file:JvmMultifileClass
+@file:JvmName("Utils")
+
+actual fun useX(x: X): Any = x.foo()
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new
new file mode 100644
index 00000000000..eda951b5556
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new
@@ -0,0 +1,6 @@
+@file:JvmMultifileClass
+@file:JvmName("Utils")
+
+actual fun useX(x: X): Any = x.foo()
+
+fun newFun() = 1
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt
new file mode 100644
index 00000000000..c58549d42e4
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt
@@ -0,0 +1,4 @@
+@file:JvmMultifileClass
+@file:JvmName("Utils")
+
+fun useXBar(x: X) = x.bar()
\ No newline at end of file