From 090063b4d8d00d8b024ea7e37d88f4f332644ea5 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Fri, 1 Dec 2017 16:07:40 +0300
Subject: [PATCH] Compile actual and expected declarations together

    #KT-20840 fixed

Original commit: fec2d08d226df3187b6030c94edf67b310018733
---
 .../multiplatform/touchActual/X.kt            |  3 +++
 .../multiplatform/touchActual/X.kt.touch.1    |  0
 .../multiplatform/touchActual/Y.kt            |  3 +++
 .../multiplatform/touchActual/Z.kt            |  3 +++
 .../multiplatform/touchActual/build.log       | 19 +++++++++++++++++++
 .../multiplatform/touchActual/commonX.kt      |  5 +++++
 .../multiplatform/touchActual/commonY.kt      |  5 +++++
 .../multiplatform/touchActual/commonZ.kt      |  5 +++++
 .../multiplatform/touchActual/dummy.kt        |  1 +
 .../multiplatform/touchActual/useX.kt         |  3 +++
 .../multiplatform/touchActual/useYZ.kt        |  7 +++++++
 .../touchActual/useYZ.kt.touch.2              |  0
 .../multiplatform/touchExpect/X.kt            |  3 +++
 .../multiplatform/touchExpect/Y.kt            |  3 +++
 .../multiplatform/touchExpect/Z.kt            |  3 +++
 .../multiplatform/touchExpect/build.log       | 19 +++++++++++++++++++
 .../multiplatform/touchExpect/commonX.kt      |  5 +++++
 .../touchExpect/commonX.kt.touch.1            |  0
 .../multiplatform/touchExpect/commonY.kt      |  5 +++++
 .../touchExpect/commonY.kt.touch.2            |  0
 .../multiplatform/touchExpect/commonZ.kt      |  5 +++++
 .../multiplatform/touchExpect/dummy.kt        |  1 +
 .../multiplatform/touchExpect/useX.kt         |  3 +++
 .../touchExpect/useXIncompatible.kt           |  2 ++
 .../multiplatform/touchExpect/useYZ.kt        |  7 +++++++
 25 files changed, 110 insertions(+)
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchActual/X.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchActual/X.kt.touch.1
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchActual/Y.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchActual/Z.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchActual/build.log
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchActual/commonX.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchActual/commonY.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchActual/commonZ.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchActual/dummy.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchActual/useX.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchActual/useYZ.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchActual/useYZ.kt.touch.2
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchExpect/X.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchExpect/Y.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchExpect/Z.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchExpect/build.log
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonX.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonX.kt.touch.1
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonY.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonY.kt.touch.2
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonZ.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchExpect/dummy.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchExpect/useX.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchExpect/useXIncompatible.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiplatform/touchExpect/useYZ.kt

diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchActual/X.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/X.kt
new file mode 100644
index 00000000000..2e6edf9d000
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/X.kt
@@ -0,0 +1,3 @@
+actual class X {
+    actual fun foo(): Any = 0
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchActual/X.kt.touch.1 b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/X.kt.touch.1
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchActual/Y.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/Y.kt
new file mode 100644
index 00000000000..8fea6dc0dfe
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/Y.kt
@@ -0,0 +1,3 @@
+actual class Y {
+    actual fun foo(): Any = 0
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchActual/Z.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/Z.kt
new file mode 100644
index 00000000000..e350bdc939c
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/Z.kt
@@ -0,0 +1,3 @@
+actual class Z {
+    actual fun foo(): Any = 0
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchActual/build.log b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/build.log
new file mode 100644
index 00000000000..dd0d111cbc8
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/build.log
@@ -0,0 +1,19 @@
+================ Step #1 =================
+
+Compiling files:
+    src/X.kt
+    src/commonX.kt
+    src/useX.kt
+End of files
+Exit code: SUCCESS
+
+================ Step #2 =================
+
+Compiling files:
+    src/Y.kt
+    src/Z.kt
+    src/commonY.kt
+    src/commonZ.kt
+    src/useYZ.kt
+End of files
+Exit code: SUCCESS
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchActual/commonX.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/commonX.kt
new file mode 100644
index 00000000000..7fc73e5ec89
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/commonX.kt
@@ -0,0 +1,5 @@
+expect class X {
+    fun foo(): Any
+}
+
+expect fun useX(x: X): Unit
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchActual/commonY.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/commonY.kt
new file mode 100644
index 00000000000..ef8ae049d66
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/commonY.kt
@@ -0,0 +1,5 @@
+expect class Y {
+    fun foo(): Any
+}
+
+expect fun useY(y: Y): Unit
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchActual/commonZ.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/commonZ.kt
new file mode 100644
index 00000000000..80e902ffb27
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/commonZ.kt
@@ -0,0 +1,5 @@
+expect class Z {
+    fun foo(): Any
+}
+
+expect fun useZ(z: Z): Unit
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchActual/dummy.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/dummy.kt
new file mode 100644
index 00000000000..3f0c1c77242
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/dummy.kt
@@ -0,0 +1 @@
+fun dummy() {}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchActual/useX.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/useX.kt
new file mode 100644
index 00000000000..ffb13ada9a6
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/useX.kt
@@ -0,0 +1,3 @@
+actual fun useX(x: X): Unit {
+    x.foo()
+}
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchActual/useYZ.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/useYZ.kt
new file mode 100644
index 00000000000..859c12dd85b
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/useYZ.kt
@@ -0,0 +1,7 @@
+actual fun useY(y: Y): Unit {
+    y.foo()
+}
+
+actual fun useZ(z: Z): Unit {
+    z.foo()
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchActual/useYZ.kt.touch.2 b/jps/jps-plugin/testData/incremental/multiplatform/touchActual/useYZ.kt.touch.2
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/X.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/X.kt
new file mode 100644
index 00000000000..2e6edf9d000
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/X.kt
@@ -0,0 +1,3 @@
+actual class X {
+    actual fun foo(): Any = 0
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/Y.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/Y.kt
new file mode 100644
index 00000000000..8fea6dc0dfe
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/Y.kt
@@ -0,0 +1,3 @@
+actual class Y {
+    actual fun foo(): Any = 0
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/Z.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/Z.kt
new file mode 100644
index 00000000000..e350bdc939c
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/Z.kt
@@ -0,0 +1,3 @@
+actual class Z {
+    actual fun foo(): Any = 0
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/build.log b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/build.log
new file mode 100644
index 00000000000..dd0d111cbc8
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/build.log
@@ -0,0 +1,19 @@
+================ Step #1 =================
+
+Compiling files:
+    src/X.kt
+    src/commonX.kt
+    src/useX.kt
+End of files
+Exit code: SUCCESS
+
+================ Step #2 =================
+
+Compiling files:
+    src/Y.kt
+    src/Z.kt
+    src/commonY.kt
+    src/commonZ.kt
+    src/useYZ.kt
+End of files
+Exit code: SUCCESS
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonX.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonX.kt
new file mode 100644
index 00000000000..7fc73e5ec89
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonX.kt
@@ -0,0 +1,5 @@
+expect class X {
+    fun foo(): Any
+}
+
+expect fun useX(x: X): Unit
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonX.kt.touch.1 b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonX.kt.touch.1
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonY.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonY.kt
new file mode 100644
index 00000000000..ef8ae049d66
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonY.kt
@@ -0,0 +1,5 @@
+expect class Y {
+    fun foo(): Any
+}
+
+expect fun useY(y: Y): Unit
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonY.kt.touch.2 b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonY.kt.touch.2
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonZ.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonZ.kt
new file mode 100644
index 00000000000..80e902ffb27
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/commonZ.kt
@@ -0,0 +1,5 @@
+expect class Z {
+    fun foo(): Any
+}
+
+expect fun useZ(z: Z): Unit
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/dummy.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/dummy.kt
new file mode 100644
index 00000000000..3f0c1c77242
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/dummy.kt
@@ -0,0 +1 @@
+fun dummy() {}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/useX.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/useX.kt
new file mode 100644
index 00000000000..ffb13ada9a6
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/useX.kt
@@ -0,0 +1,3 @@
+actual fun useX(x: X): Unit {
+    x.foo()
+}
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/useXIncompatible.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/useXIncompatible.kt
new file mode 100644
index 00000000000..55bd63557c9
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/useXIncompatible.kt
@@ -0,0 +1,2 @@
+fun useX(x: String): Int =
+        x.length
diff --git a/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/useYZ.kt b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/useYZ.kt
new file mode 100644
index 00000000000..859c12dd85b
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiplatform/touchExpect/useYZ.kt
@@ -0,0 +1,7 @@
+actual fun useY(y: Y): Unit {
+    y.foo()
+}
+
+actual fun useZ(z: Z): Unit {
+    z.foo()
+}
\ No newline at end of file