diff options
author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-02-27 21:27:37 +0300 |
---|---|---|
committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-02-27 21:27:37 +0300 |
commit | d43d47b9486bbd7e926cf1a3fc6372f2a457a5e5 (patch) | |
tree | 925229bac0b49943f38766d07802026beed11910 /core/testdata/format | |
parent | 05c5a8f20167b652f918e8260fd16453efadf5ff (diff) | |
parent | bc71b31be28ed558e022babcf40ec1fd3bff923a (diff) | |
download | dokka-d43d47b9486bbd7e926cf1a3fc6372f2a457a5e5.tar.gz dokka-d43d47b9486bbd7e926cf1a3fc6372f2a457a5e5.tar.bz2 dokka-d43d47b9486bbd7e926cf1a3fc6372f2a457a5e5.zip |
Merge branch 'semoro/multiplatform'
Diffstat (limited to 'core/testdata/format')
-rw-r--r-- | core/testdata/format/multiplatform/implied/foo.md (renamed from core/testdata/format/multiplatformImplied/foo.md) | 0 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/implied/js.kt (renamed from core/testdata/format/multiplatformImplied/js.kt) | 0 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/implied/jvm.kt (renamed from core/testdata/format/multiplatformImplied/jvm.kt) | 0 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/merge/js.kt (renamed from core/testdata/format/multiplatformMerge/js.kt) | 0 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/merge/jvm.kt (renamed from core/testdata/format/multiplatform/jvm.kt) | 0 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/merge/multiplatform.package.md (renamed from core/testdata/format/multiplatformMerge/multiplatform.package.md) | 2 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/mergeMembers/foo.md (renamed from core/testdata/format/multiplatformMergeMembers/foo.md) | 0 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/mergeMembers/js.kt (renamed from core/testdata/format/multiplatformMergeMembers/js.kt) | 0 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/mergeMembers/jvm.kt (renamed from core/testdata/format/multiplatformMergeMembers/jvm.kt) | 0 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/omitRedundant/foo.md (renamed from core/testdata/format/multiplatformOmitRedundant/foo.md) | 0 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/omitRedundant/js.kt (renamed from core/testdata/format/multiplatformOmitRedundant/js.kt) | 0 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/omitRedundant/jvm.kt (renamed from core/testdata/format/multiplatformOmitRedundant/jvm.kt) | 0 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/packagePlatformsFromMembers/js.kt | 3 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/packagePlatformsFromMembers/jvm.kt | 3 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.index.md | 8 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.package.md | 10 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/simple/js.kt (renamed from core/testdata/format/multiplatform/js.kt) | 0 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/simple/jvm.kt (renamed from core/testdata/format/multiplatformMerge/jvm.kt) | 0 | ||||
-rw-r--r-- | core/testdata/format/multiplatform/simple/multiplatform.package.md (renamed from core/testdata/format/multiplatform/multiplatform.package.md) | 0 | ||||
-rw-r--r-- | core/testdata/format/sinceKotlin.package.md | 2 |
20 files changed, 28 insertions, 0 deletions
diff --git a/core/testdata/format/multiplatformImplied/foo.md b/core/testdata/format/multiplatform/implied/foo.md index c615dd8e..c615dd8e 100644 --- a/core/testdata/format/multiplatformImplied/foo.md +++ b/core/testdata/format/multiplatform/implied/foo.md diff --git a/core/testdata/format/multiplatformImplied/js.kt b/core/testdata/format/multiplatform/implied/js.kt index dd2de5bc..dd2de5bc 100644 --- a/core/testdata/format/multiplatformImplied/js.kt +++ b/core/testdata/format/multiplatform/implied/js.kt diff --git a/core/testdata/format/multiplatformImplied/jvm.kt b/core/testdata/format/multiplatform/implied/jvm.kt index 8d73ce25..8d73ce25 100644 --- a/core/testdata/format/multiplatformImplied/jvm.kt +++ b/core/testdata/format/multiplatform/implied/jvm.kt diff --git a/core/testdata/format/multiplatformMerge/js.kt b/core/testdata/format/multiplatform/merge/js.kt index bbf1dd7c..bbf1dd7c 100644 --- a/core/testdata/format/multiplatformMerge/js.kt +++ b/core/testdata/format/multiplatform/merge/js.kt diff --git a/core/testdata/format/multiplatform/jvm.kt b/core/testdata/format/multiplatform/merge/jvm.kt index cb77273f..cb77273f 100644 --- a/core/testdata/format/multiplatform/jvm.kt +++ b/core/testdata/format/multiplatform/merge/jvm.kt diff --git a/core/testdata/format/multiplatformMerge/multiplatform.package.md b/core/testdata/format/multiplatform/merge/multiplatform.package.md index a423f603..8e463327 100644 --- a/core/testdata/format/multiplatformMerge/multiplatform.package.md +++ b/core/testdata/format/multiplatform/merge/multiplatform.package.md @@ -2,6 +2,8 @@ ## Package foo +**Platform and version requirements:** JVM, JS + ### 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/multiplatform/mergeMembers/foo.md index 7490c878..7490c878 100644 --- a/core/testdata/format/multiplatformMergeMembers/foo.md +++ b/core/testdata/format/multiplatform/mergeMembers/foo.md diff --git a/core/testdata/format/multiplatformMergeMembers/js.kt b/core/testdata/format/multiplatform/mergeMembers/js.kt index dd2de5bc..dd2de5bc 100644 --- a/core/testdata/format/multiplatformMergeMembers/js.kt +++ b/core/testdata/format/multiplatform/mergeMembers/js.kt diff --git a/core/testdata/format/multiplatformMergeMembers/jvm.kt b/core/testdata/format/multiplatform/mergeMembers/jvm.kt index 8d73ce25..8d73ce25 100644 --- a/core/testdata/format/multiplatformMergeMembers/jvm.kt +++ b/core/testdata/format/multiplatform/mergeMembers/jvm.kt diff --git a/core/testdata/format/multiplatformOmitRedundant/foo.md b/core/testdata/format/multiplatform/omitRedundant/foo.md index 088ced2c..088ced2c 100644 --- a/core/testdata/format/multiplatformOmitRedundant/foo.md +++ b/core/testdata/format/multiplatform/omitRedundant/foo.md diff --git a/core/testdata/format/multiplatformOmitRedundant/js.kt b/core/testdata/format/multiplatform/omitRedundant/js.kt index d1b1429c..d1b1429c 100644 --- a/core/testdata/format/multiplatformOmitRedundant/js.kt +++ b/core/testdata/format/multiplatform/omitRedundant/js.kt diff --git a/core/testdata/format/multiplatformOmitRedundant/jvm.kt b/core/testdata/format/multiplatform/omitRedundant/jvm.kt index 35e3c08d..35e3c08d 100644 --- a/core/testdata/format/multiplatformOmitRedundant/jvm.kt +++ b/core/testdata/format/multiplatform/omitRedundant/jvm.kt diff --git a/core/testdata/format/multiplatform/packagePlatformsFromMembers/js.kt b/core/testdata/format/multiplatform/packagePlatformsFromMembers/js.kt new file mode 100644 index 00000000..86d09289 --- /dev/null +++ b/core/testdata/format/multiplatform/packagePlatformsFromMembers/js.kt @@ -0,0 +1,3 @@ +package foo.bar + +fun buz() {} diff --git a/core/testdata/format/multiplatform/packagePlatformsFromMembers/jvm.kt b/core/testdata/format/multiplatform/packagePlatformsFromMembers/jvm.kt new file mode 100644 index 00000000..86d09289 --- /dev/null +++ b/core/testdata/format/multiplatform/packagePlatformsFromMembers/jvm.kt @@ -0,0 +1,3 @@ +package foo.bar + +fun buz() {} diff --git a/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.index.md b/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.index.md new file mode 100644 index 00000000..294513ed --- /dev/null +++ b/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.index.md @@ -0,0 +1,8 @@ +[test](test/index) + +### Packages + +| [foo.bar](test/foo.bar/index)<br>(JVM, JS) | | + +### Index + diff --git a/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.package.md b/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.package.md new file mode 100644 index 00000000..2921cdd1 --- /dev/null +++ b/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.package.md @@ -0,0 +1,10 @@ +[test](test/index) / [foo.bar](test/foo.bar/index) + +## Package foo.bar + +**Platform and version requirements:** JVM, JS + +### Functions + +| [buz](test/foo.bar/buz)<br>(JVM, JS) | `fun buz(): Unit` | + diff --git a/core/testdata/format/multiplatform/js.kt b/core/testdata/format/multiplatform/simple/js.kt index e6d66ffd..e6d66ffd 100644 --- a/core/testdata/format/multiplatform/js.kt +++ b/core/testdata/format/multiplatform/simple/js.kt diff --git a/core/testdata/format/multiplatformMerge/jvm.kt b/core/testdata/format/multiplatform/simple/jvm.kt index cb77273f..cb77273f 100644 --- a/core/testdata/format/multiplatformMerge/jvm.kt +++ b/core/testdata/format/multiplatform/simple/jvm.kt diff --git a/core/testdata/format/multiplatform/multiplatform.package.md b/core/testdata/format/multiplatform/simple/multiplatform.package.md index 3574942c..3574942c 100644 --- a/core/testdata/format/multiplatform/multiplatform.package.md +++ b/core/testdata/format/multiplatform/simple/multiplatform.package.md diff --git a/core/testdata/format/sinceKotlin.package.md b/core/testdata/format/sinceKotlin.package.md index 2af0c9ee..c811749c 100644 --- a/core/testdata/format/sinceKotlin.package.md +++ b/core/testdata/format/sinceKotlin.package.md @@ -2,6 +2,8 @@ ## Package <root> +**Platform and version requirements:** Kotlin 1.1 + ### Types | [Since1.1](test/-since1.1/index)<br>(Kotlin 1.1) | `class Since1.1`<br>Useful | |