aboutsummaryrefslogtreecommitdiff
path: root/core/testdata/format/multiplatform
diff options
context:
space:
mode:
authorSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2017-03-01 22:26:28 +0300
committerSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2017-03-01 22:26:28 +0300
commitabe161a118d3d7df40ad0e1df8b8adf07773103b (patch)
tree4176768eaaac9eec7240fdcbb954238d790edae8 /core/testdata/format/multiplatform
parent1934463c0a2a708acfde371daf0692811f479a7a (diff)
downloaddokka-abe161a118d3d7df40ad0e1df8b8adf07773103b.tar.gz
dokka-abe161a118d3d7df40ad0e1df8b8adf07773103b.tar.bz2
dokka-abe161a118d3d7df40ad0e1df8b8adf07773103b.zip
Correct merging of different type namesake declarations between platforms
Diffstat (limited to 'core/testdata/format/multiplatform')
-rw-r--r--core/testdata/format/multiplatform/groupNode/js.kt8
-rw-r--r--core/testdata/format/multiplatform/groupNode/jvm.kt9
-rw-r--r--core/testdata/format/multiplatform/groupNode/multiplatform.md20
-rw-r--r--core/testdata/format/multiplatform/groupNode/multiplatform.package.md13
4 files changed, 50 insertions, 0 deletions
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
+
+| [&lt;init&gt;](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)<br>(JS) | `class Some` |
+| [SomeCoolJvmClass](test/pack/-some-cool-jvm-class/index)<br>(JVM) | `class SomeCoolJvmClass` |
+
+### Type Aliases
+
+| [Some](test/pack/-some/index)<br>(JVM) | `typealias Some = SomeCoolJvmClass` |
+