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 ++++++++
 core/testdata/format/multiplatform/multiplatform.package.md | 9 +++++++++
 6 files changed, 24 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

(limited to 'core/testdata/format/multiplatform')

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. |
+
-- 
cgit