From a3c7641398de9a3cd594a273538bb9e916139830 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 24 Feb 2017 13:15:30 +0100 Subject: Omit platform of members when it's the same as the platform of the defining class --- .../format/multiplatformMergeMembers/foo.md | 6 +++--- .../format/multiplatformOmitRedundant/foo.md | 22 ++++++++++++++++++++++ .../format/multiplatformOmitRedundant/js.kt | 2 ++ .../format/multiplatformOmitRedundant/jvm.kt | 11 +++++++++++ 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 core/testdata/format/multiplatformOmitRedundant/foo.md create mode 100644 core/testdata/format/multiplatformOmitRedundant/js.kt create mode 100644 core/testdata/format/multiplatformOmitRedundant/jvm.kt (limited to 'core/testdata') diff --git a/core/testdata/format/multiplatformMergeMembers/foo.md b/core/testdata/format/multiplatformMergeMembers/foo.md index 3bf19fe1..7490c878 100644 --- a/core/testdata/format/multiplatformMergeMembers/foo.md +++ b/core/testdata/format/multiplatformMergeMembers/foo.md @@ -10,17 +10,17 @@ This is a foo. ### Constructors -| [<init>](test/foo/-foo/-init-)
(JVM, JS) | `Foo()`
This is a foo. | +| [<init>](test/foo/-foo/-init-) | `Foo()`
This is a foo. | ### Properties | [propJs](test/foo/-foo/prop-js)
(JS) | `val propJs: String` | | [propJvm](test/foo/-foo/prop-jvm)
(JVM) | `val propJvm: String` | -| [propJvmAndJs](test/foo/-foo/prop-jvm-and-js)
(JVM, JS) | `val propJvmAndJs: Int` | +| [propJvmAndJs](test/foo/-foo/prop-jvm-and-js) | `val propJvmAndJs: Int` | ### Functions -| [bothJvmAndJs](test/foo/-foo/both-jvm-and-js)
(JVM, JS) | `fun bothJvmAndJs(): Unit` | +| [bothJvmAndJs](test/foo/-foo/both-jvm-and-js) | `fun bothJvmAndJs(): Unit` | | [js](test/foo/-foo/js)
(JS) | `fun js(): Unit` | | [jvm](test/foo/-foo/jvm)
(JVM) | `fun jvm(): Unit` | diff --git a/core/testdata/format/multiplatformOmitRedundant/foo.md b/core/testdata/format/multiplatformOmitRedundant/foo.md new file mode 100644 index 00000000..088ced2c --- /dev/null +++ b/core/testdata/format/multiplatformOmitRedundant/foo.md @@ -0,0 +1,22 @@ +[test](test/index) / [foo](test/foo/index) / [Foo](test/foo/-foo/index) + +# Foo + +`class Foo` + +**Platform and version requirements:** JVM + +This is a foo. + +### Constructors + +| [<init>](test/foo/-foo/-init-) | `Foo()`
This is a foo. | + +### Properties + +| [propJvm](test/foo/-foo/prop-jvm) | `val propJvm: String` | + +### Functions + +| [jvm](test/foo/-foo/jvm) | `fun jvm(): Unit` | + diff --git a/core/testdata/format/multiplatformOmitRedundant/js.kt b/core/testdata/format/multiplatformOmitRedundant/js.kt new file mode 100644 index 00000000..d1b1429c --- /dev/null +++ b/core/testdata/format/multiplatformOmitRedundant/js.kt @@ -0,0 +1,2 @@ +package foo + diff --git a/core/testdata/format/multiplatformOmitRedundant/jvm.kt b/core/testdata/format/multiplatformOmitRedundant/jvm.kt new file mode 100644 index 00000000..35e3c08d --- /dev/null +++ b/core/testdata/format/multiplatformOmitRedundant/jvm.kt @@ -0,0 +1,11 @@ +package foo + +/** + * This is a foo. + */ +class Foo { + fun jvm() { + } + + val propJvm = "abc" +} -- cgit