From 99689adee954582da57268ff0375fdec52193a01 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 23 Feb 2017 16:35:45 +0100
Subject: Merge declarations with the same signature defined for multiple
 platforms

---
 core/testdata/format/multiplatform/bar.kt          |  7 ------
 core/testdata/format/multiplatform/foo.kt          |  8 -------
 core/testdata/format/multiplatform/foo.package.md  |  9 --------
 core/testdata/format/multiplatform/js.kt           |  7 ++++++
 core/testdata/format/multiplatform/jvm.kt          |  8 +++++++
 .../format/multiplatform/multiplatform.package.md  |  9 ++++++++
 core/testdata/format/multiplatformMerge/js.kt      |  7 ++++++
 core/testdata/format/multiplatformMerge/jvm.kt     |  8 +++++++
 .../multiplatformMerge/multiplatform.package.md    |  8 +++++++
 .../format/multiplatformMergeMembers/foo.md        | 26 ++++++++++++++++++++++
 .../format/multiplatformMergeMembers/js.kt         | 16 +++++++++++++
 .../format/multiplatformMergeMembers/jvm.kt        | 16 +++++++++++++
 12 files changed, 105 insertions(+), 24 deletions(-)
 delete mode 100644 core/testdata/format/multiplatform/bar.kt
 delete mode 100644 core/testdata/format/multiplatform/foo.kt
 delete mode 100644 core/testdata/format/multiplatform/foo.package.md
 create mode 100644 core/testdata/format/multiplatform/js.kt
 create mode 100644 core/testdata/format/multiplatform/jvm.kt
 create mode 100644 core/testdata/format/multiplatform/multiplatform.package.md
 create mode 100644 core/testdata/format/multiplatformMerge/js.kt
 create mode 100644 core/testdata/format/multiplatformMerge/jvm.kt
 create mode 100644 core/testdata/format/multiplatformMerge/multiplatform.package.md
 create mode 100644 core/testdata/format/multiplatformMergeMembers/foo.md
 create mode 100644 core/testdata/format/multiplatformMergeMembers/js.kt
 create mode 100644 core/testdata/format/multiplatformMergeMembers/jvm.kt

(limited to 'core/testdata')

diff --git a/core/testdata/format/multiplatform/bar.kt b/core/testdata/format/multiplatform/bar.kt
deleted file mode 100644
index e6d66ffd..00000000
--- a/core/testdata/format/multiplatform/bar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo
-
-/**
- * This is a bar.
- */
-class Bar {
-}
diff --git a/core/testdata/format/multiplatform/foo.kt b/core/testdata/format/multiplatform/foo.kt
deleted file mode 100644
index cb77273f..00000000
--- a/core/testdata/format/multiplatform/foo.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-/**
- * This is a foo.
- */
-class Foo {
-
-}
diff --git a/core/testdata/format/multiplatform/foo.package.md b/core/testdata/format/multiplatform/foo.package.md
deleted file mode 100644
index 3574942c..00000000
--- a/core/testdata/format/multiplatform/foo.package.md
+++ /dev/null
@@ -1,9 +0,0 @@
-[test](test/index) / [foo](test/foo/index)
-
-## Package foo
-
-### Types
-
-| [Bar](test/foo/-bar/index)<br>(JS) | `class Bar`<br>This is a bar. |
-| [Foo](test/foo/-foo/index)<br>(JVM) | `class Foo`<br>This is a foo. |
-
diff --git a/core/testdata/format/multiplatform/js.kt b/core/testdata/format/multiplatform/js.kt
new file mode 100644
index 00000000..e6d66ffd
--- /dev/null
+++ b/core/testdata/format/multiplatform/js.kt
@@ -0,0 +1,7 @@
+package foo
+
+/**
+ * This is a bar.
+ */
+class Bar {
+}
diff --git a/core/testdata/format/multiplatform/jvm.kt b/core/testdata/format/multiplatform/jvm.kt
new file mode 100644
index 00000000..cb77273f
--- /dev/null
+++ b/core/testdata/format/multiplatform/jvm.kt
@@ -0,0 +1,8 @@
+package foo
+
+/**
+ * This is a foo.
+ */
+class Foo {
+
+}
diff --git a/core/testdata/format/multiplatform/multiplatform.package.md b/core/testdata/format/multiplatform/multiplatform.package.md
new file mode 100644
index 00000000..3574942c
--- /dev/null
+++ b/core/testdata/format/multiplatform/multiplatform.package.md
@@ -0,0 +1,9 @@
+[test](test/index) / [foo](test/foo/index)
+
+## Package foo
+
+### Types
+
+| [Bar](test/foo/-bar/index)<br>(JS) | `class Bar`<br>This is a bar. |
+| [Foo](test/foo/-foo/index)<br>(JVM) | `class Foo`<br>This is a foo. |
+
diff --git a/core/testdata/format/multiplatformMerge/js.kt b/core/testdata/format/multiplatformMerge/js.kt
new file mode 100644
index 00000000..bbf1dd7c
--- /dev/null
+++ b/core/testdata/format/multiplatformMerge/js.kt
@@ -0,0 +1,7 @@
+package foo
+
+/**
+ * This is a foo.
+ */
+class Foo {
+}
diff --git a/core/testdata/format/multiplatformMerge/jvm.kt b/core/testdata/format/multiplatformMerge/jvm.kt
new file mode 100644
index 00000000..cb77273f
--- /dev/null
+++ b/core/testdata/format/multiplatformMerge/jvm.kt
@@ -0,0 +1,8 @@
+package foo
+
+/**
+ * This is a foo.
+ */
+class Foo {
+
+}
diff --git a/core/testdata/format/multiplatformMerge/multiplatform.package.md b/core/testdata/format/multiplatformMerge/multiplatform.package.md
new file mode 100644
index 00000000..a423f603
--- /dev/null
+++ b/core/testdata/format/multiplatformMerge/multiplatform.package.md
@@ -0,0 +1,8 @@
+[test](test/index) / [foo](test/foo/index)
+
+## Package foo
+
+### Types
+
+| [Foo](test/foo/-foo/index)<br>(JVM, JS) | `class Foo`<br>This is a foo. |
+
diff --git a/core/testdata/format/multiplatformMergeMembers/foo.md b/core/testdata/format/multiplatformMergeMembers/foo.md
new file mode 100644
index 00000000..3bf19fe1
--- /dev/null
+++ b/core/testdata/format/multiplatformMergeMembers/foo.md
@@ -0,0 +1,26 @@
+[test](test/index) / [foo](test/foo/index) / [Foo](test/foo/-foo/index)
+
+# Foo
+
+`class Foo`
+
+**Platform and version requirements:** JVM, JS
+
+This is a foo.
+
+### Constructors
+
+| [&lt;init&gt;](test/foo/-foo/-init-)<br>(JVM, JS) | `Foo()`<br>This is a foo. |
+
+### Properties
+
+| [propJs](test/foo/-foo/prop-js)<br>(JS) | `val propJs: String` |
+| [propJvm](test/foo/-foo/prop-jvm)<br>(JVM) | `val propJvm: String` |
+| [propJvmAndJs](test/foo/-foo/prop-jvm-and-js)<br>(JVM, JS) | `val propJvmAndJs: Int` |
+
+### Functions
+
+| [bothJvmAndJs](test/foo/-foo/both-jvm-and-js)<br>(JVM, JS) | `fun bothJvmAndJs(): Unit` |
+| [js](test/foo/-foo/js)<br>(JS) | `fun js(): Unit` |
+| [jvm](test/foo/-foo/jvm)<br>(JVM) | `fun jvm(): Unit` |
+
diff --git a/core/testdata/format/multiplatformMergeMembers/js.kt b/core/testdata/format/multiplatformMergeMembers/js.kt
new file mode 100644
index 00000000..dd2de5bc
--- /dev/null
+++ b/core/testdata/format/multiplatformMergeMembers/js.kt
@@ -0,0 +1,16 @@
+package foo
+
+/**
+ * This is a foo.
+ */
+class Foo {
+    fun bothJvmAndJs() {
+    }
+
+    fun js() {
+    }
+
+    val propJvmAndJs = 0
+
+    val propJs = "abc"
+}
diff --git a/core/testdata/format/multiplatformMergeMembers/jvm.kt b/core/testdata/format/multiplatformMergeMembers/jvm.kt
new file mode 100644
index 00000000..8d73ce25
--- /dev/null
+++ b/core/testdata/format/multiplatformMergeMembers/jvm.kt
@@ -0,0 +1,16 @@
+package foo
+
+/**
+ * This is a foo.
+ */
+class Foo {
+    fun bothJvmAndJs() {
+    }
+
+    fun jvm() {
+    }
+
+    val propJvmAndJs = 0
+
+    val propJvm = "abc"
+}
-- 
cgit