From ef753c8a1b9f02d9f6f026d555d628fbb207c574 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Mon, 27 Feb 2017 18:30:30 +0300
Subject: Package platforms detected based on it's members, refactored
 multiplatform tests layout

---
 .idea/runConfigurations/Stdlib.xml                 |  2 +-
 .../kotlin/Formats/KotlinWebsiteFormatService.kt   |  2 +-
 .../main/kotlin/Formats/StructuredFormatService.kt | 11 ++++++---
 core/src/test/kotlin/format/MarkdownFormatTest.kt  | 25 ++++++++++++++-------
 core/testdata/format/multiplatform/implied/foo.md  | 24 ++++++++++++++++++++
 core/testdata/format/multiplatform/implied/js.kt   | 16 +++++++++++++
 core/testdata/format/multiplatform/implied/jvm.kt  | 16 +++++++++++++
 core/testdata/format/multiplatform/js.kt           |  7 ------
 core/testdata/format/multiplatform/jvm.kt          |  8 -------
 core/testdata/format/multiplatform/merge/js.kt     |  7 ++++++
 core/testdata/format/multiplatform/merge/jvm.kt    |  8 +++++++
 .../multiplatform/merge/multiplatform.package.md   |  8 +++++++
 .../format/multiplatform/mergeMembers/foo.md       | 26 ++++++++++++++++++++++
 .../format/multiplatform/mergeMembers/js.kt        | 16 +++++++++++++
 .../format/multiplatform/mergeMembers/jvm.kt       | 16 +++++++++++++
 .../format/multiplatform/multiplatform.package.md  |  9 --------
 .../format/multiplatform/omitRedundant/foo.md      | 22 ++++++++++++++++++
 .../format/multiplatform/omitRedundant/js.kt       |  2 ++
 .../format/multiplatform/omitRedundant/jvm.kt      | 11 +++++++++
 .../packagePlatformsFromMembers/js.kt              |  3 +++
 .../packagePlatformsFromMembers/jvm.kt             |  3 +++
 .../multiplatform.index.md                         |  8 +++++++
 core/testdata/format/multiplatform/simple/js.kt    |  7 ++++++
 core/testdata/format/multiplatform/simple/jvm.kt   |  8 +++++++
 .../multiplatform/simple/multiplatform.package.md  |  9 ++++++++
 core/testdata/format/multiplatformImplied/foo.md   | 24 --------------------
 core/testdata/format/multiplatformImplied/js.kt    | 16 -------------
 core/testdata/format/multiplatformImplied/jvm.kt   | 16 -------------
 core/testdata/format/multiplatformMerge/js.kt      |  7 ------
 core/testdata/format/multiplatformMerge/jvm.kt     |  8 -------
 .../multiplatformMerge/multiplatform.package.md    |  8 -------
 .../format/multiplatformMergeMembers/foo.md        | 26 ----------------------
 .../format/multiplatformMergeMembers/js.kt         | 16 -------------
 .../format/multiplatformMergeMembers/jvm.kt        | 16 -------------
 .../format/multiplatformOmitRedundant/foo.md       | 22 ------------------
 .../format/multiplatformOmitRedundant/js.kt        |  2 --
 .../format/multiplatformOmitRedundant/jvm.kt       | 11 ---------
 37 files changed, 237 insertions(+), 209 deletions(-)
 create mode 100644 core/testdata/format/multiplatform/implied/foo.md
 create mode 100644 core/testdata/format/multiplatform/implied/js.kt
 create mode 100644 core/testdata/format/multiplatform/implied/jvm.kt
 delete mode 100644 core/testdata/format/multiplatform/js.kt
 delete mode 100644 core/testdata/format/multiplatform/jvm.kt
 create mode 100644 core/testdata/format/multiplatform/merge/js.kt
 create mode 100644 core/testdata/format/multiplatform/merge/jvm.kt
 create mode 100644 core/testdata/format/multiplatform/merge/multiplatform.package.md
 create mode 100644 core/testdata/format/multiplatform/mergeMembers/foo.md
 create mode 100644 core/testdata/format/multiplatform/mergeMembers/js.kt
 create mode 100644 core/testdata/format/multiplatform/mergeMembers/jvm.kt
 delete mode 100644 core/testdata/format/multiplatform/multiplatform.package.md
 create mode 100644 core/testdata/format/multiplatform/omitRedundant/foo.md
 create mode 100644 core/testdata/format/multiplatform/omitRedundant/js.kt
 create mode 100644 core/testdata/format/multiplatform/omitRedundant/jvm.kt
 create mode 100644 core/testdata/format/multiplatform/packagePlatformsFromMembers/js.kt
 create mode 100644 core/testdata/format/multiplatform/packagePlatformsFromMembers/jvm.kt
 create mode 100644 core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.index.md
 create mode 100644 core/testdata/format/multiplatform/simple/js.kt
 create mode 100644 core/testdata/format/multiplatform/simple/jvm.kt
 create mode 100644 core/testdata/format/multiplatform/simple/multiplatform.package.md
 delete mode 100644 core/testdata/format/multiplatformImplied/foo.md
 delete mode 100644 core/testdata/format/multiplatformImplied/js.kt
 delete mode 100644 core/testdata/format/multiplatformImplied/jvm.kt
 delete mode 100644 core/testdata/format/multiplatformMerge/js.kt
 delete mode 100644 core/testdata/format/multiplatformMerge/jvm.kt
 delete mode 100644 core/testdata/format/multiplatformMerge/multiplatform.package.md
 delete mode 100644 core/testdata/format/multiplatformMergeMembers/foo.md
 delete mode 100644 core/testdata/format/multiplatformMergeMembers/js.kt
 delete mode 100644 core/testdata/format/multiplatformMergeMembers/jvm.kt
 delete mode 100644 core/testdata/format/multiplatformOmitRedundant/foo.md
 delete mode 100644 core/testdata/format/multiplatformOmitRedundant/js.kt
 delete mode 100644 core/testdata/format/multiplatformOmitRedundant/jvm.kt

diff --git a/.idea/runConfigurations/Stdlib.xml b/.idea/runConfigurations/Stdlib.xml
index 91f85056..fc196ae4 100644
--- a/.idea/runConfigurations/Stdlib.xml
+++ b/.idea/runConfigurations/Stdlib.xml
@@ -3,7 +3,7 @@
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="org.jetbrains.dokka.MainKt" />
     <option name="VM_PARAMETERS" value="-Xmx2048m -Xms256m" />
-    <option name="PROGRAM_PARAMETERS" value="JVM::../kotlin/libraries/stdlib/src JVM::../kotlin/core/builtins JVM::../kotlin/core/reflection.jvm JVM::../kotlin/core/runtime.jvm JVM,JRE7::../kotlin/libraries/stdlib/jre7/src JVM,JRE8::../kotlin/libraries/stdlib/jre8/src JS::../kotlin/core/builtins JS::../kotlin/dist/kotlin-stdlib-js-sources -samples ../kotlin/libraries/stdlib/test -output ../kotlin-web-site/pages/api/latest/jvm -module stdlib -include ../kotlin/libraries/stdlib/src/Module.md -format kotlin-website -nodeprecated -srcLink ../kotlin=http://github.com/JetBrains/kotlin/blob/master#L -impliedPlatforms JVM,JS" />
+    <option name="PROGRAM_PARAMETERS" value="JVM::../kotlin/libraries/stdlib/src JVM::../kotlin/core/builtins JVM::../kotlin/core/reflection.jvm JVM::../kotlin/core/runtime.jvm JVM,JRE7::../kotlin/libraries/stdlib/jre7/src JVM,JRE8::../kotlin/libraries/stdlib/jre8/src JS::../kotlin/core/builtins JS::../kotlin/dist/kotlin-stdlib-js-sources -samples ../kotlin/libraries/stdlib/test -output ../kotlin-web-site/pages/api/latest/jvm -module stdlib -include ../kotlin/libraries/stdlib/src/Module.md -format kotlin-website-samples -nodeprecated -srcLink ../kotlin=http://github.com/JetBrains/kotlin/blob/master#L -impliedPlatforms JVM,JS" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
diff --git a/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt b/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt
index 6366ff61..0444a25a 100644
--- a/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt
+++ b/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt
@@ -148,7 +148,7 @@ open class KotlinWebsiteOutputBuilder(to: StringBuilder,
 
     override fun appendIndexRow(platforms: Set<String>, block: () -> Unit) {
         if (platforms.isNotEmpty())
-            wrap("<tr data-platform=\"${platforms.joinToString(" ")}\">", "</tr>", block)
+            wrap("<tr data-platform=\"${platforms.joinToString()}\">", "</tr>", block)
         else
             appendTableRow(block)
     }
diff --git a/core/src/main/kotlin/Formats/StructuredFormatService.kt b/core/src/main/kotlin/Formats/StructuredFormatService.kt
index b5a35356..79ebabe0 100644
--- a/core/src/main/kotlin/Formats/StructuredFormatService.kt
+++ b/core/src/main/kotlin/Formats/StructuredFormatService.kt
@@ -408,7 +408,7 @@ abstract class StructuredOutputBuilder(val to: StringBuilder,
                 return
             }
 
-            appendSection("Packages", node.members(NodeKind.Package))
+            appendSection("Packages", node.members(NodeKind.Package), platformsBasedOnMembers = true)
             appendSection("Types", node.members.filter { it.kind in NodeKind.classLike && it.kind != NodeKind.TypeAlias && it.kind != NodeKind.AnnotationClass && it.kind != NodeKind.Exception })
             appendSection("Annotations", node.members(NodeKind.AnnotationClass))
             appendSection("Exceptions", node.members(NodeKind.Exception))
@@ -463,7 +463,8 @@ abstract class StructuredOutputBuilder(val to: StringBuilder,
 
         private fun appendSection(caption: String, members: List<DocumentationNode>,
                                   sortMembers: Boolean = true,
-                                  omitSamePlatforms: Boolean = false) {
+                                  omitSamePlatforms: Boolean = false,
+                                  platformsBasedOnMembers: Boolean = false) {
             if (members.isEmpty()) return
 
             appendHeader(3) { appendText(caption) }
@@ -476,7 +477,11 @@ abstract class StructuredOutputBuilder(val to: StringBuilder,
             appendTable("Name", "Summary") {
                 appendTableBody {
                     for ((memberLocation, members) in membersMap) {
-                        val platforms = platformsOfItems(members, omitSamePlatforms)
+                        val elementPlatforms = platformsOfItems(members, omitSamePlatforms)
+                        val platforms = if (platformsBasedOnMembers)
+                            members.flatMapTo(mutableSetOf()) { platformsOfItems(it.members) } + elementPlatforms
+                        else
+                            elementPlatforms
                         appendIndexRow(platforms) {
                             appendTableCell {
                                 appendLink(memberLocation)
diff --git a/core/src/test/kotlin/format/MarkdownFormatTest.kt b/core/src/test/kotlin/format/MarkdownFormatTest.kt
index 4830d760..e87811ee 100644
--- a/core/src/test/kotlin/format/MarkdownFormatTest.kt
+++ b/core/src/test/kotlin/format/MarkdownFormatTest.kt
@@ -255,35 +255,44 @@ class MarkdownFormatTest {
     }
 
     @Test fun multiplePlatforms() {
-        verifyMultiplatformPackage(buildMultiplePlatforms("multiplatform"), "multiplatform")
+        verifyMultiplatformPackage(buildMultiplePlatforms("multiplatform/simple"), "multiplatform/simple")
     }
 
     @Test fun multiplePlatformsMerge() {
-        verifyMultiplatformPackage(buildMultiplePlatforms("multiplatformMerge"), "multiplatformMerge")
+        verifyMultiplatformPackage(buildMultiplePlatforms("multiplatform/merge"), "multiplatform/merge")
     }
 
     @Test fun multiplePlatformsMergeMembers() {
-        val module = buildMultiplePlatforms("multiplatformMergeMembers")
-        verifyModelOutput(module, ".md", "testdata/format/multiplatformMergeMembers/foo.kt") { model, output ->
+        val module = buildMultiplePlatforms("multiplatform/mergeMembers")
+        verifyModelOutput(module, ".md", "testdata/format/multiplatform/mergeMembers/foo.kt") { model, output ->
             markdownService.createOutputBuilder(output, tempLocation).appendNodes(model.members.single().members)
         }
     }
 
     @Test fun multiplePlatformsOmitRedundant() {
-        val module = buildMultiplePlatforms("multiplatformOmitRedundant")
-        verifyModelOutput(module, ".md", "testdata/format/multiplatformOmitRedundant/foo.kt") { model, output ->
+        val module = buildMultiplePlatforms("multiplatform/omitRedundant")
+        verifyModelOutput(module, ".md", "testdata/format/multiplatform/omitRedundant/foo.kt") { model, output ->
             markdownService.createOutputBuilder(output, tempLocation).appendNodes(model.members.single().members)
         }
     }
 
     @Test fun multiplePlatformsImplied() {
-        val module = buildMultiplePlatforms("multiplatformImplied")
-        verifyModelOutput(module, ".md", "testdata/format/multiplatformImplied/foo.kt") { model, output ->
+        val module = buildMultiplePlatforms("multiplatform/implied")
+        verifyModelOutput(module, ".md", "testdata/format/multiplatform/implied/foo.kt") { model, output ->
             MarkdownFormatService(InMemoryLocationService, KotlinLanguageService(), listOf("JVM", "JS"))
                     .createOutputBuilder(output, tempLocation).appendNodes(model.members.single().members)
         }
     }
 
+    @Test fun multiplePlatformsPackagePlatformFromMembers() {
+        val module = buildMultiplePlatforms("multiplatform/packagePlatformsFromMembers")
+        verifyModelOutput(module, ".md", "testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.index.kt") {
+            model, output ->
+            MarkdownFormatService(InMemoryLocationService, KotlinLanguageService(), listOf())
+                    .createOutputBuilder(output, tempLocation).appendNodes(model.members)
+        }
+    }
+
     private fun buildMultiplePlatforms(path: String): DocumentationModule {
         val module = DocumentationModule("test")
         val options = DocumentationOptions("", "html", generateIndexPages = false)
diff --git a/core/testdata/format/multiplatform/implied/foo.md b/core/testdata/format/multiplatform/implied/foo.md
new file mode 100644
index 00000000..c615dd8e
--- /dev/null
+++ b/core/testdata/format/multiplatform/implied/foo.md
@@ -0,0 +1,24 @@
+[test](test/index) / [foo](test/foo/index) / [Foo](test/foo/-foo/index)
+
+# Foo
+
+`class Foo`
+
+This is a foo.
+
+### Constructors
+
+| [&lt;init&gt;](test/foo/-foo/-init-) | `Foo()`<br>This is a foo. |
+
+### Properties
+
+| [propJs](test/foo/-foo/prop-js)<br>(JS) | `val propJs: String` |
+| [propJvm](test/foo/-foo/prop-jvm)<br>(JVM) | `val propJvm: String` |
+| [propJvmAndJs](test/foo/-foo/prop-jvm-and-js) | `val propJvmAndJs: Int` |
+
+### Functions
+
+| [bothJvmAndJs](test/foo/-foo/both-jvm-and-js) | `fun bothJvmAndJs(): Unit` |
+| [js](test/foo/-foo/js)<br>(JS) | `fun js(): Unit` |
+| [jvm](test/foo/-foo/jvm)<br>(JVM) | `fun jvm(): Unit` |
+
diff --git a/core/testdata/format/multiplatform/implied/js.kt b/core/testdata/format/multiplatform/implied/js.kt
new file mode 100644
index 00000000..dd2de5bc
--- /dev/null
+++ b/core/testdata/format/multiplatform/implied/js.kt
@@ -0,0 +1,16 @@
+package foo
+
+/**
+ * This is a foo.
+ */
+class Foo {
+    fun bothJvmAndJs() {
+    }
+
+    fun js() {
+    }
+
+    val propJvmAndJs = 0
+
+    val propJs = "abc"
+}
diff --git a/core/testdata/format/multiplatform/implied/jvm.kt b/core/testdata/format/multiplatform/implied/jvm.kt
new file mode 100644
index 00000000..8d73ce25
--- /dev/null
+++ b/core/testdata/format/multiplatform/implied/jvm.kt
@@ -0,0 +1,16 @@
+package foo
+
+/**
+ * This is a foo.
+ */
+class Foo {
+    fun bothJvmAndJs() {
+    }
+
+    fun jvm() {
+    }
+
+    val propJvmAndJs = 0
+
+    val propJvm = "abc"
+}
diff --git a/core/testdata/format/multiplatform/js.kt b/core/testdata/format/multiplatform/js.kt
deleted file mode 100644
index e6d66ffd..00000000
--- a/core/testdata/format/multiplatform/js.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo
-
-/**
- * This is a bar.
- */
-class Bar {
-}
diff --git a/core/testdata/format/multiplatform/jvm.kt b/core/testdata/format/multiplatform/jvm.kt
deleted file mode 100644
index cb77273f..00000000
--- a/core/testdata/format/multiplatform/jvm.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-/**
- * This is a foo.
- */
-class Foo {
-
-}
diff --git a/core/testdata/format/multiplatform/merge/js.kt b/core/testdata/format/multiplatform/merge/js.kt
new file mode 100644
index 00000000..bbf1dd7c
--- /dev/null
+++ b/core/testdata/format/multiplatform/merge/js.kt
@@ -0,0 +1,7 @@
+package foo
+
+/**
+ * This is a foo.
+ */
+class Foo {
+}
diff --git a/core/testdata/format/multiplatform/merge/jvm.kt b/core/testdata/format/multiplatform/merge/jvm.kt
new file mode 100644
index 00000000..cb77273f
--- /dev/null
+++ b/core/testdata/format/multiplatform/merge/jvm.kt
@@ -0,0 +1,8 @@
+package foo
+
+/**
+ * This is a foo.
+ */
+class Foo {
+
+}
diff --git a/core/testdata/format/multiplatform/merge/multiplatform.package.md b/core/testdata/format/multiplatform/merge/multiplatform.package.md
new file mode 100644
index 00000000..a423f603
--- /dev/null
+++ b/core/testdata/format/multiplatform/merge/multiplatform.package.md
@@ -0,0 +1,8 @@
+[test](test/index) / [foo](test/foo/index)
+
+## Package foo
+
+### Types
+
+| [Foo](test/foo/-foo/index)<br>(JVM, JS) | `class Foo`<br>This is a foo. |
+
diff --git a/core/testdata/format/multiplatform/mergeMembers/foo.md b/core/testdata/format/multiplatform/mergeMembers/foo.md
new file mode 100644
index 00000000..7490c878
--- /dev/null
+++ b/core/testdata/format/multiplatform/mergeMembers/foo.md
@@ -0,0 +1,26 @@
+[test](test/index) / [foo](test/foo/index) / [Foo](test/foo/-foo/index)
+
+# Foo
+
+`class Foo`
+
+**Platform and version requirements:** JVM, JS
+
+This is a foo.
+
+### Constructors
+
+| [&lt;init&gt;](test/foo/-foo/-init-) | `Foo()`<br>This is a foo. |
+
+### Properties
+
+| [propJs](test/foo/-foo/prop-js)<br>(JS) | `val propJs: String` |
+| [propJvm](test/foo/-foo/prop-jvm)<br>(JVM) | `val propJvm: String` |
+| [propJvmAndJs](test/foo/-foo/prop-jvm-and-js) | `val propJvmAndJs: Int` |
+
+### Functions
+
+| [bothJvmAndJs](test/foo/-foo/both-jvm-and-js) | `fun bothJvmAndJs(): Unit` |
+| [js](test/foo/-foo/js)<br>(JS) | `fun js(): Unit` |
+| [jvm](test/foo/-foo/jvm)<br>(JVM) | `fun jvm(): Unit` |
+
diff --git a/core/testdata/format/multiplatform/mergeMembers/js.kt b/core/testdata/format/multiplatform/mergeMembers/js.kt
new file mode 100644
index 00000000..dd2de5bc
--- /dev/null
+++ b/core/testdata/format/multiplatform/mergeMembers/js.kt
@@ -0,0 +1,16 @@
+package foo
+
+/**
+ * This is a foo.
+ */
+class Foo {
+    fun bothJvmAndJs() {
+    }
+
+    fun js() {
+    }
+
+    val propJvmAndJs = 0
+
+    val propJs = "abc"
+}
diff --git a/core/testdata/format/multiplatform/mergeMembers/jvm.kt b/core/testdata/format/multiplatform/mergeMembers/jvm.kt
new file mode 100644
index 00000000..8d73ce25
--- /dev/null
+++ b/core/testdata/format/multiplatform/mergeMembers/jvm.kt
@@ -0,0 +1,16 @@
+package foo
+
+/**
+ * This is a foo.
+ */
+class Foo {
+    fun bothJvmAndJs() {
+    }
+
+    fun jvm() {
+    }
+
+    val propJvmAndJs = 0
+
+    val propJvm = "abc"
+}
diff --git a/core/testdata/format/multiplatform/multiplatform.package.md b/core/testdata/format/multiplatform/multiplatform.package.md
deleted file mode 100644
index 3574942c..00000000
--- a/core/testdata/format/multiplatform/multiplatform.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/omitRedundant/foo.md b/core/testdata/format/multiplatform/omitRedundant/foo.md
new file mode 100644
index 00000000..088ced2c
--- /dev/null
+++ b/core/testdata/format/multiplatform/omitRedundant/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
+
+| [&lt;init&gt;](test/foo/-foo/-init-) | `Foo()`<br>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/multiplatform/omitRedundant/js.kt b/core/testdata/format/multiplatform/omitRedundant/js.kt
new file mode 100644
index 00000000..d1b1429c
--- /dev/null
+++ b/core/testdata/format/multiplatform/omitRedundant/js.kt
@@ -0,0 +1,2 @@
+package foo
+
diff --git a/core/testdata/format/multiplatform/omitRedundant/jvm.kt b/core/testdata/format/multiplatform/omitRedundant/jvm.kt
new file mode 100644
index 00000000..35e3c08d
--- /dev/null
+++ b/core/testdata/format/multiplatform/omitRedundant/jvm.kt
@@ -0,0 +1,11 @@
+package foo
+
+/**
+ * This is a foo.
+ */
+class Foo {
+    fun jvm() {
+    }
+
+    val propJvm = "abc"
+}
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..0440bb1d
--- /dev/null
+++ b/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.index.md
@@ -0,0 +1,8 @@
+[test](test/index) / [foo.bar](test/foo.bar/index)
+
+## Package foo.bar
+
+### Functions
+
+| [buz](test/foo.bar/buz)<br>(JVM, JS) | `fun buz(): Unit` |
+
diff --git a/core/testdata/format/multiplatform/simple/js.kt b/core/testdata/format/multiplatform/simple/js.kt
new file mode 100644
index 00000000..e6d66ffd
--- /dev/null
+++ b/core/testdata/format/multiplatform/simple/js.kt
@@ -0,0 +1,7 @@
+package foo
+
+/**
+ * This is a bar.
+ */
+class Bar {
+}
diff --git a/core/testdata/format/multiplatform/simple/jvm.kt b/core/testdata/format/multiplatform/simple/jvm.kt
new file mode 100644
index 00000000..cb77273f
--- /dev/null
+++ b/core/testdata/format/multiplatform/simple/jvm.kt
@@ -0,0 +1,8 @@
+package foo
+
+/**
+ * This is a foo.
+ */
+class Foo {
+
+}
diff --git a/core/testdata/format/multiplatform/simple/multiplatform.package.md b/core/testdata/format/multiplatform/simple/multiplatform.package.md
new file mode 100644
index 00000000..3574942c
--- /dev/null
+++ b/core/testdata/format/multiplatform/simple/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. |
+
diff --git a/core/testdata/format/multiplatformImplied/foo.md b/core/testdata/format/multiplatformImplied/foo.md
deleted file mode 100644
index c615dd8e..00000000
--- a/core/testdata/format/multiplatformImplied/foo.md
+++ /dev/null
@@ -1,24 +0,0 @@
-[test](test/index) / [foo](test/foo/index) / [Foo](test/foo/-foo/index)
-
-# Foo
-
-`class Foo`
-
-This is a foo.
-
-### Constructors
-
-| [&lt;init&gt;](test/foo/-foo/-init-) | `Foo()`<br>This is a foo. |
-
-### Properties
-
-| [propJs](test/foo/-foo/prop-js)<br>(JS) | `val propJs: String` |
-| [propJvm](test/foo/-foo/prop-jvm)<br>(JVM) | `val propJvm: String` |
-| [propJvmAndJs](test/foo/-foo/prop-jvm-and-js) | `val propJvmAndJs: Int` |
-
-### Functions
-
-| [bothJvmAndJs](test/foo/-foo/both-jvm-and-js) | `fun bothJvmAndJs(): Unit` |
-| [js](test/foo/-foo/js)<br>(JS) | `fun js(): Unit` |
-| [jvm](test/foo/-foo/jvm)<br>(JVM) | `fun jvm(): Unit` |
-
diff --git a/core/testdata/format/multiplatformImplied/js.kt b/core/testdata/format/multiplatformImplied/js.kt
deleted file mode 100644
index dd2de5bc..00000000
--- a/core/testdata/format/multiplatformImplied/js.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package foo
-
-/**
- * This is a foo.
- */
-class Foo {
-    fun bothJvmAndJs() {
-    }
-
-    fun js() {
-    }
-
-    val propJvmAndJs = 0
-
-    val propJs = "abc"
-}
diff --git a/core/testdata/format/multiplatformImplied/jvm.kt b/core/testdata/format/multiplatformImplied/jvm.kt
deleted file mode 100644
index 8d73ce25..00000000
--- a/core/testdata/format/multiplatformImplied/jvm.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package foo
-
-/**
- * This is a foo.
- */
-class Foo {
-    fun bothJvmAndJs() {
-    }
-
-    fun jvm() {
-    }
-
-    val propJvmAndJs = 0
-
-    val propJvm = "abc"
-}
diff --git a/core/testdata/format/multiplatformMerge/js.kt b/core/testdata/format/multiplatformMerge/js.kt
deleted file mode 100644
index bbf1dd7c..00000000
--- a/core/testdata/format/multiplatformMerge/js.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo
-
-/**
- * This is a foo.
- */
-class Foo {
-}
diff --git a/core/testdata/format/multiplatformMerge/jvm.kt b/core/testdata/format/multiplatformMerge/jvm.kt
deleted file mode 100644
index cb77273f..00000000
--- a/core/testdata/format/multiplatformMerge/jvm.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-/**
- * This is a foo.
- */
-class Foo {
-
-}
diff --git a/core/testdata/format/multiplatformMerge/multiplatform.package.md b/core/testdata/format/multiplatformMerge/multiplatform.package.md
deleted file mode 100644
index a423f603..00000000
--- a/core/testdata/format/multiplatformMerge/multiplatform.package.md
+++ /dev/null
@@ -1,8 +0,0 @@
-[test](test/index) / [foo](test/foo/index)
-
-## Package foo
-
-### 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/multiplatformMergeMembers/foo.md
deleted file mode 100644
index 7490c878..00000000
--- a/core/testdata/format/multiplatformMergeMembers/foo.md
+++ /dev/null
@@ -1,26 +0,0 @@
-[test](test/index) / [foo](test/foo/index) / [Foo](test/foo/-foo/index)
-
-# Foo
-
-`class Foo`
-
-**Platform and version requirements:** JVM, JS
-
-This is a foo.
-
-### Constructors
-
-| [&lt;init&gt;](test/foo/-foo/-init-) | `Foo()`<br>This is a foo. |
-
-### Properties
-
-| [propJs](test/foo/-foo/prop-js)<br>(JS) | `val propJs: String` |
-| [propJvm](test/foo/-foo/prop-jvm)<br>(JVM) | `val propJvm: String` |
-| [propJvmAndJs](test/foo/-foo/prop-jvm-and-js) | `val propJvmAndJs: Int` |
-
-### Functions
-
-| [bothJvmAndJs](test/foo/-foo/both-jvm-and-js) | `fun bothJvmAndJs(): Unit` |
-| [js](test/foo/-foo/js)<br>(JS) | `fun js(): Unit` |
-| [jvm](test/foo/-foo/jvm)<br>(JVM) | `fun jvm(): Unit` |
-
diff --git a/core/testdata/format/multiplatformMergeMembers/js.kt b/core/testdata/format/multiplatformMergeMembers/js.kt
deleted file mode 100644
index dd2de5bc..00000000
--- a/core/testdata/format/multiplatformMergeMembers/js.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package foo
-
-/**
- * This is a foo.
- */
-class Foo {
-    fun bothJvmAndJs() {
-    }
-
-    fun js() {
-    }
-
-    val propJvmAndJs = 0
-
-    val propJs = "abc"
-}
diff --git a/core/testdata/format/multiplatformMergeMembers/jvm.kt b/core/testdata/format/multiplatformMergeMembers/jvm.kt
deleted file mode 100644
index 8d73ce25..00000000
--- a/core/testdata/format/multiplatformMergeMembers/jvm.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package foo
-
-/**
- * This is a foo.
- */
-class Foo {
-    fun bothJvmAndJs() {
-    }
-
-    fun jvm() {
-    }
-
-    val propJvmAndJs = 0
-
-    val propJvm = "abc"
-}
diff --git a/core/testdata/format/multiplatformOmitRedundant/foo.md b/core/testdata/format/multiplatformOmitRedundant/foo.md
deleted file mode 100644
index 088ced2c..00000000
--- a/core/testdata/format/multiplatformOmitRedundant/foo.md
+++ /dev/null
@@ -1,22 +0,0 @@
-[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
-
-| [&lt;init&gt;](test/foo/-foo/-init-) | `Foo()`<br>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
deleted file mode 100644
index d1b1429c..00000000
--- a/core/testdata/format/multiplatformOmitRedundant/js.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package foo
-
diff --git a/core/testdata/format/multiplatformOmitRedundant/jvm.kt b/core/testdata/format/multiplatformOmitRedundant/jvm.kt
deleted file mode 100644
index 35e3c08d..00000000
--- a/core/testdata/format/multiplatformOmitRedundant/jvm.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package foo
-
-/**
- * This is a foo.
- */
-class Foo {
-    fun jvm() {
-    }
-
-    val propJvm = "abc"
-}
-- 
cgit