From c72b5dab616d4f1fc47fb11bc5c8f9baa01240c6 Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Thu, 16 Apr 2020 14:13:29 +0200 Subject: Change '<>' to '[]' in default package name as Windows prohibits filenames with '<>' --- .../DefaultDescriptorToDocumentableTranslator.kt | 2 +- plugins/base/src/test/kotlin/model/PackagesTest.kt | 4 +- .../annotatedFunction/out/html/navigation.html | 6 +- .../out/html/root//f.html | 31 -------- .../out/html/root//index.html | 46 ------------ .../out/html/root/[jvm root]/f.html | 31 ++++++++ .../out/html/root/[jvm root]/index.html | 46 ++++++++++++ .../annotatedFunction/out/html/root/index.html | 2 +- .../annotatedFunction/out/html/root/package-list | 4 +- .../annotatedFunction/out/html/scripts/pages.js | 4 +- .../out/html/navigation.html | 10 +-- .../out/html/root//-fancy/-init-.html | 31 -------- .../out/html/root//-fancy/equals.html | 31 -------- .../out/html/root//-fancy/hash-code.html | 31 -------- .../out/html/root//-fancy/index.html | 83 ---------------------- .../out/html/root//-fancy/to-string.html | 31 -------- .../out/html/root//f.html | 31 -------- .../out/html/root//index.html | 62 ---------------- .../out/html/root/[jvm root]/-fancy/-init-.html | 31 ++++++++ .../out/html/root/[jvm root]/-fancy/equals.html | 31 ++++++++ .../out/html/root/[jvm root]/-fancy/hash-code.html | 31 ++++++++ .../out/html/root/[jvm root]/-fancy/index.html | 83 ++++++++++++++++++++++ .../out/html/root/[jvm root]/-fancy/to-string.html | 31 ++++++++ .../out/html/root/[jvm root]/f.html | 31 ++++++++ .../out/html/root/[jvm root]/index.html | 62 ++++++++++++++++ .../out/html/root/index.html | 2 +- .../out/html/root/package-list | 10 +-- .../out/html/scripts/pages.js | 14 ++-- .../expect/function/out/html/navigation.html | 6 +- .../function/out/html/root//fn.html | 33 --------- .../function/out/html/root//index.html | 46 ------------ .../function/out/html/root/[jvm root]/fn.html | 33 +++++++++ .../function/out/html/root/[jvm root]/index.html | 46 ++++++++++++ .../expect/function/out/html/root/index.html | 2 +- .../expect/function/out/html/root/package-list | 4 +- .../expect/function/out/html/scripts/pages.js | 4 +- .../out/html/navigation.html | 10 +-- .../out/html/root//-fancy/-init-.html | 31 -------- .../out/html/root//-fancy/equals.html | 31 -------- .../out/html/root//-fancy/hash-code.html | 31 -------- .../out/html/root//-fancy/index.html | 67 ----------------- .../out/html/root//-fancy/to-string.html | 31 -------- .../out/html/root//function.html | 31 -------- .../out/html/root//index.html | 62 ---------------- .../out/html/root/[jvm root]/-fancy/-init-.html | 31 ++++++++ .../out/html/root/[jvm root]/-fancy/equals.html | 31 ++++++++ .../out/html/root/[jvm root]/-fancy/hash-code.html | 31 ++++++++ .../out/html/root/[jvm root]/-fancy/index.html | 67 +++++++++++++++++ .../out/html/root/[jvm root]/-fancy/to-string.html | 31 ++++++++ .../out/html/root/[jvm root]/function.html | 31 ++++++++ .../out/html/root/[jvm root]/index.html | 62 ++++++++++++++++ .../out/html/root/index.html | 2 +- .../out/html/root/package-list | 10 +-- .../out/html/scripts/pages.js | 14 ++-- .../out/html/navigation.html | 6 +- .../out/html/root//f.html | 31 -------- .../out/html/root//index.html | 46 ------------ .../out/html/root/[jvm root]/f.html | 31 ++++++++ .../out/html/root/[jvm root]/index.html | 46 ++++++++++++ .../out/html/root/index.html | 2 +- .../out/html/root/package-list | 4 +- .../out/html/scripts/pages.js | 4 +- .../out/html/navigation.html | 6 +- .../out/html/root//function.html | 31 -------- .../out/html/root//index.html | 46 ------------ .../out/html/root/[jvm root]/function.html | 31 ++++++++ .../out/html/root/[jvm root]/index.html | 46 ++++++++++++ .../out/html/root/index.html | 2 +- .../out/html/root/package-list | 4 +- .../out/html/scripts/pages.js | 4 +- .../out/html/navigation.html | 6 +- .../out/html/root//f.html | 31 -------- .../out/html/root//index.html | 46 ------------ .../out/html/root/[jvm root]/f.html | 31 ++++++++ .../out/html/root/[jvm root]/index.html | 46 ++++++++++++ .../out/html/root/index.html | 2 +- .../out/html/root/package-list | 4 +- .../out/html/scripts/pages.js | 4 +- .../functionWithParams/out/html/navigation.html | 6 +- .../out/html/root//function.html | 33 --------- .../out/html/root//index.html | 46 ------------ .../out/html/root/[jvm root]/function.html | 33 +++++++++ .../out/html/root/[jvm root]/index.html | 46 ++++++++++++ .../functionWithParams/out/html/root/index.html | 2 +- .../functionWithParams/out/html/root/package-list | 4 +- .../functionWithParams/out/html/scripts/pages.js | 4 +- .../functionWithReceiver/out/html/navigation.html | 6 +- .../out/html/root//fn.html | 39 ---------- .../out/html/root//index.html | 56 --------------- .../out/html/root/[jvm root]/fn.html | 39 ++++++++++ .../out/html/root/[jvm root]/index.html | 56 +++++++++++++++ .../functionWithReceiver/out/html/root/index.html | 2 +- .../out/html/root/package-list | 6 +- .../functionWithReceiver/out/html/scripts/pages.js | 4 +- .../genericFunction/out/html/navigation.html | 6 +- .../out/html/root//generic.html | 33 --------- .../out/html/root//index.html | 46 ------------ .../out/html/root/[jvm root]/generic.html | 33 +++++++++ .../out/html/root/[jvm root]/index.html | 46 ++++++++++++ .../genericFunction/out/html/root/index.html | 2 +- .../genericFunction/out/html/root/package-list | 4 +- .../genericFunction/out/html/scripts/pages.js | 4 +- .../out/html/navigation.html | 6 +- .../out/html/root//generic.html | 33 --------- .../out/html/root//index.html | 46 ------------ .../out/html/root/[jvm root]/generic.html | 33 +++++++++ .../out/html/root/[jvm root]/index.html | 46 ++++++++++++ .../out/html/root/index.html | 2 +- .../out/html/root/package-list | 4 +- .../out/html/scripts/pages.js | 4 +- .../expect/inlineFunction/out/html/navigation.html | 6 +- .../inlineFunction/out/html/root//f.html | 31 -------- .../out/html/root//index.html | 46 ------------ .../inlineFunction/out/html/root/[jvm root]/f.html | 31 ++++++++ .../out/html/root/[jvm root]/index.html | 46 ++++++++++++ .../expect/inlineFunction/out/html/root/index.html | 2 +- .../inlineFunction/out/html/root/package-list | 4 +- .../inlineFunction/out/html/scripts/pages.js | 4 +- .../inlineSuspendFunction/out/html/navigation.html | 6 +- .../out/html/root//f.html | 31 -------- .../out/html/root//index.html | 46 ------------ .../out/html/root/[jvm root]/f.html | 31 ++++++++ .../out/html/root/[jvm root]/index.html | 46 ++++++++++++ .../inlineSuspendFunction/out/html/root/index.html | 2 +- .../out/html/root/package-list | 4 +- .../out/html/scripts/pages.js | 4 +- .../expect/sinceKotlin/out/html/navigation.html | 6 +- .../html/root//available-since1.1.html | 33 --------- .../out/html/root//index.html | 46 ------------ .../html/root/[jvm root]/available-since1.1.html | 33 +++++++++ .../out/html/root/[jvm root]/index.html | 46 ++++++++++++ .../expect/sinceKotlin/out/html/root/index.html | 2 +- .../expect/sinceKotlin/out/html/root/package-list | 4 +- .../expect/sinceKotlin/out/html/scripts/pages.js | 4 +- .../suspendFunction/out/html/navigation.html | 6 +- .../out/html/root//f.html | 31 -------- .../out/html/root//index.html | 46 ------------ .../out/html/root/[jvm root]/f.html | 31 ++++++++ .../out/html/root/[jvm root]/index.html | 46 ++++++++++++ .../suspendFunction/out/html/root/index.html | 2 +- .../suspendFunction/out/html/root/package-list | 4 +- .../suspendFunction/out/html/scripts/pages.js | 4 +- .../suspendInlineFunction/out/html/navigation.html | 6 +- .../out/html/root//f.html | 31 -------- .../out/html/root//index.html | 46 ------------ .../out/html/root/[jvm root]/f.html | 31 ++++++++ .../out/html/root/[jvm root]/index.html | 46 ++++++++++++ .../suspendInlineFunction/out/html/root/index.html | 2 +- .../out/html/root/package-list | 4 +- .../out/html/scripts/pages.js | 4 +- 150 files changed, 1842 insertions(+), 1842 deletions(-) delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root//f.html delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root//-fancy/-init-.html delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root//-fancy/equals.html delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root//-fancy/hash-code.html delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root//-fancy/index.html delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root//-fancy/to-string.html delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root//f.html delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/function/out/html/root//fn.html delete mode 100644 plugins/base/src/test/resources/expect/function/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html create mode 100644 plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//-fancy/-init-.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//-fancy/equals.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//-fancy/hash-code.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//-fancy/index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//-fancy/to-string.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//function.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root//f.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html create mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root//function.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html create mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root//f.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html create mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root//function.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html create mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root//fn.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html create mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root//generic.html delete mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html create mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root//generic.html delete mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html create mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root//f.html delete mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html create mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root//f.html delete mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html create mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root//available-since1.1.html delete mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root//f.html delete mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html create mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html delete mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root//f.html delete mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html create mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html (limited to 'plugins/base/src') diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt index c2f190c2..25e6f6ac 100644 --- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt +++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt @@ -73,7 +73,7 @@ private class DokkaDescriptorVisitor( parent: DRIWithPlatformInfo ): DPackage { val name = descriptor.fqName.asString().takeUnless { it.isBlank() } ?: - "<" + platformData.targets.joinToString(",") + " root>"// TODO: error-prone, find a better way to do it + "[" + platformData.targets.joinToString(" ") + " root]"// TODO: error-prone, find a better way to do it val driWithPlatform = DRI(packageName = name).withEmptyInfo() val scope = descriptor.getMemberScope() diff --git a/plugins/base/src/test/kotlin/model/PackagesTest.kt b/plugins/base/src/test/kotlin/model/PackagesTest.kt index ec8921d6..11d456ce 100644 --- a/plugins/base/src/test/kotlin/model/PackagesTest.kt +++ b/plugins/base/src/test/kotlin/model/PackagesTest.kt @@ -14,8 +14,8 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac """.trimIndent(), prependPackage = false ) { - with((this / "").cast()) { - name equals "" + with((this / "[jvm root]").cast()) { + name equals "[jvm root]" children counts 0 } } diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html index 463b028f..35fe78dc 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html @@ -1,9 +1,9 @@