From abe161a118d3d7df40ad0e1df8b8adf07773103b Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 1 Mar 2017 22:26:28 +0300 Subject: Correct merging of different type namesake declarations between platforms --- core/testdata/format/multiplatform/groupNode/js.kt | 8 ++++ .../testdata/format/multiplatform/groupNode/jvm.kt | 9 ++++ .../multiplatform/groupNode/multiplatform.md | 20 ++++++++ .../groupNode/multiplatform.package.md | 13 +++++ .../format/website/dataTagsInGroupNode/jre7.kt | 0 .../format/website/dataTagsInGroupNode/js.kt | 8 ++++ .../format/website/dataTagsInGroupNode/jvm.kt | 9 ++++ .../website/dataTagsInGroupNode/multiplatform.md | 56 ++++++++++++++++++++++ .../dataTagsInGroupNode/multiplatform.package.md | 43 +++++++++++++++++ 9 files changed, 166 insertions(+) create mode 100644 core/testdata/format/multiplatform/groupNode/js.kt create mode 100644 core/testdata/format/multiplatform/groupNode/jvm.kt create mode 100644 core/testdata/format/multiplatform/groupNode/multiplatform.md create mode 100644 core/testdata/format/multiplatform/groupNode/multiplatform.package.md create mode 100644 core/testdata/format/website/dataTagsInGroupNode/jre7.kt create mode 100644 core/testdata/format/website/dataTagsInGroupNode/js.kt create mode 100644 core/testdata/format/website/dataTagsInGroupNode/jvm.kt create mode 100644 core/testdata/format/website/dataTagsInGroupNode/multiplatform.md create mode 100644 core/testdata/format/website/dataTagsInGroupNode/multiplatform.package.md (limited to 'core/testdata/format') diff --git a/core/testdata/format/multiplatform/groupNode/js.kt b/core/testdata/format/multiplatform/groupNode/js.kt new file mode 100644 index 00000000..045f3f0d --- /dev/null +++ b/core/testdata/format/multiplatform/groupNode/js.kt @@ -0,0 +1,8 @@ +package pack + +class Some { + + fun magic() { + + } +} \ No newline at end of file diff --git a/core/testdata/format/multiplatform/groupNode/jvm.kt b/core/testdata/format/multiplatform/groupNode/jvm.kt new file mode 100644 index 00000000..57f36742 --- /dev/null +++ b/core/testdata/format/multiplatform/groupNode/jvm.kt @@ -0,0 +1,9 @@ +package pack + +class SomeCoolJvmClass { + fun magic() { + + } +} + +typealias Some = SomeCoolJvmClass \ No newline at end of file diff --git a/core/testdata/format/multiplatform/groupNode/multiplatform.md b/core/testdata/format/multiplatform/groupNode/multiplatform.md new file mode 100644 index 00000000..c0ef14b1 --- /dev/null +++ b/core/testdata/format/multiplatform/groupNode/multiplatform.md @@ -0,0 +1,20 @@ +[test](test/index) / [pack](test/pack/index) / [Some](test/pack/-some/index) + +# Some + +`typealias Some = SomeCoolJvmClass` + +**Platform and version requirements:** JVM + +`class Some` + +**Platform and version requirements:** JS + +### Constructors + +| [<init>](test/pack/-some/-some/-init-) | `Some()` | + +### Functions + +| [magic](test/pack/-some/-some/magic) | `fun magic(): Unit` | + diff --git a/core/testdata/format/multiplatform/groupNode/multiplatform.package.md b/core/testdata/format/multiplatform/groupNode/multiplatform.package.md new file mode 100644 index 00000000..a9e2e404 --- /dev/null +++ b/core/testdata/format/multiplatform/groupNode/multiplatform.package.md @@ -0,0 +1,13 @@ +[test](test/index) / [pack](test/pack/index) + +## Package pack + +### Types + +| [Some](test/pack/-some/index)
(JS) | `class Some` | +| [SomeCoolJvmClass](test/pack/-some-cool-jvm-class/index)
(JVM) | `class SomeCoolJvmClass` | + +### Type Aliases + +| [Some](test/pack/-some/index)
(JVM) | `typealias Some = SomeCoolJvmClass` | + diff --git a/core/testdata/format/website/dataTagsInGroupNode/jre7.kt b/core/testdata/format/website/dataTagsInGroupNode/jre7.kt new file mode 100644 index 00000000..e69de29b diff --git a/core/testdata/format/website/dataTagsInGroupNode/js.kt b/core/testdata/format/website/dataTagsInGroupNode/js.kt new file mode 100644 index 00000000..045f3f0d --- /dev/null +++ b/core/testdata/format/website/dataTagsInGroupNode/js.kt @@ -0,0 +1,8 @@ +package pack + +class Some { + + fun magic() { + + } +} \ No newline at end of file diff --git a/core/testdata/format/website/dataTagsInGroupNode/jvm.kt b/core/testdata/format/website/dataTagsInGroupNode/jvm.kt new file mode 100644 index 00000000..57f36742 --- /dev/null +++ b/core/testdata/format/website/dataTagsInGroupNode/jvm.kt @@ -0,0 +1,9 @@ +package pack + +class SomeCoolJvmClass { + fun magic() { + + } +} + +typealias Some = SomeCoolJvmClass \ No newline at end of file diff --git a/core/testdata/format/website/dataTagsInGroupNode/multiplatform.md b/core/testdata/format/website/dataTagsInGroupNode/multiplatform.md new file mode 100644 index 00000000..78f6adf2 --- /dev/null +++ b/core/testdata/format/website/dataTagsInGroupNode/multiplatform.md @@ -0,0 +1,56 @@ +--- +title: pack.Some - test +layout: api +--- + +
test / pack / Some
+ +# Some + +
+ +
typealias Some = SomeCoolJvmClass
+ +**Platform and version requirements:** JVM + +
+ +
+ +
class Some
+ +**Platform and version requirements:** JS + +### Constructors + + + + + + + + +
+<init> + +
Some()
+ +
+ +### Functions + + + + + + + + +
+magic + +
fun magic(): Unit
+ +
+ +
diff --git a/core/testdata/format/website/dataTagsInGroupNode/multiplatform.package.md b/core/testdata/format/website/dataTagsInGroupNode/multiplatform.package.md new file mode 100644 index 00000000..a6e7d63b --- /dev/null +++ b/core/testdata/format/website/dataTagsInGroupNode/multiplatform.package.md @@ -0,0 +1,43 @@ +--- +title: pack - test +layout: api +--- + +
test / pack
+ +## Package pack + +### Types + + + + + + + + +
+Some + +
class Some
+ +
+SomeCoolJvmClass + +
class SomeCoolJvmClass
+ +
+ +### Type Aliases + + + + + + +
+Some + +
typealias Some = SomeCoolJvmClass
+ +
-- cgit