diff options
108 files changed, 246 insertions, 246 deletions
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 / "<jvm root>").cast<DPackage>()) { - name equals "<jvm root>" + with((this / "[jvm root]").cast<DPackage>()) { + 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 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#//"> - <div class="overview"><a href="root/<jvm root>/f.html">f</a></div> + <div class="overview"><a href="root/[jvm root]/f.html">f</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html index 9de96412..6c049b35 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/f.html +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//f/#//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="f.html">f</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div> <div class="cover "> <h1>f</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div> diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html index 1ebe6dce..8ab1c93f 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list index caf6273a..8f1c5fd9 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://f/#// root/<jvm root>/f.html -<jvm root> +$dokka.location://f/#// root/[jvm root]/f.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/pages.js index 68e0c564..310827d1 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "f", "location": "root/<jvm root>/f.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "f", "location": "root/[jvm root]/f.html" } ] diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html index b082a50a..a7486efc 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html @@ -1,12 +1,12 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0-0" pageId="<jvm root>/Fancy////"> - <div class="overview"><a href="root/<jvm root>/-fancy/index.html">Fancy</a></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0-0" pageId="[jvm root]/Fancy////"> + <div class="overview"><a href="root/[jvm root]/-fancy/index.html">Fancy</a></div> </div> <div class="sideMenuPart" id="nav-submenu-0-1" pageId="//f/#//"> - <div class="overview"><a href="root/<jvm root>/f.html">f</a></div> + <div class="overview"><a href="root/[jvm root]/f.html">f</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/-init-.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html index d1bfe590..09cadac4 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/-init-.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html @@ -17,8 +17,8 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../../scripts/pages.js"></script> <script type="text/javascript" src="../../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/Fancy/<init>/#kotlin.Int//"> - <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html"><jvm root></a>/<a href="index.html">Fancy</a>/<a href="-init-.html"><init></a></div> + <div id="content" pageIds="[jvm root]/Fancy/<init>/#kotlin.Int//"> + <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="-init-.html"><init></a></div> <div class="cover "> <h1><init></h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="-init-.html"><init></a>(size: <a href="">Int</a>)</div></div></div> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/equals.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html index 2645051d..0c1760d6 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/equals.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../../scripts/pages.js"></script> <script type="text/javascript" src="../../../scripts/main.js"></script> <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//"> - <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html"><jvm root></a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a></div> + <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a></div> <div class="cover "> <h1>equals</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html index 09cf0e01..654b11b4 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/hash-code.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../../scripts/pages.js"></script> <script type="text/javascript" src="../../../scripts/main.js"></script> <div id="content" pageIds="/Fancy/hashCode/#//"> - <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html"><jvm root></a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a></div> + <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a></div> <div class="cover "> <h1>hashCode</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html index 743c6dcc..c3b383d1 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html @@ -17,8 +17,8 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../../scripts/pages.js"></script> <script type="text/javascript" src="../../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/Fancy////"> - <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html"><jvm root></a>/<a href="index.html">Fancy</a></div> + <div id="content" pageIds="[jvm root]/Fancy////"> + <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a></div> <div class="cover "> <h1>Fancy</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div></div></div> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/to-string.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html index 48b4711c..c0a3a7e0 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/to-string.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../../scripts/pages.js"></script> <script type="text/javascript" src="../../../scripts/main.js"></script> <div id="content" pageIds="/Fancy/toString/#//"> - <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html"><jvm root></a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a></div> + <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a></div> <div class="cover "> <h1>toString</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div> diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html index 9de96412..6c049b35 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/f.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//f/#//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="f.html">f</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div> <div class="cover "> <h1>f</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html index 25340ae7..dfad54b3 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Types</h2> <table> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list index d2e42c86..8dcb9116 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list @@ -1,8 +1,8 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://f/#// root/<jvm root>/f.html -$dokka.location:/Fancy/equals/#kotlin.Any?// root/<jvm root>/-fancy/equals.html -$dokka.location:/Fancy/hashCode/#// root/<jvm root>/-fancy/hash-code.html -$dokka.location:/Fancy/toString/#// root/<jvm root>/-fancy/to-string.html -<jvm root> +$dokka.location://f/#// root/[jvm root]/f.html +$dokka.location:/Fancy/equals/#kotlin.Any?// root/[jvm root]/-fancy/equals.html +$dokka.location:/Fancy/hashCode/#// root/[jvm root]/-fancy/hash-code.html +$dokka.location:/Fancy/toString/#// root/[jvm root]/-fancy/to-string.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/pages.js index 58dc2831..d4254fdd 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/pages.js @@ -1,10 +1,10 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "Fancy", "class": "Fancy", "location": "root/<jvm root>/-fancy/index.html" }, -{ "name": "<init>", "location": "root/<jvm root>/-fancy/-init-.html" }, -{ "name": "equals", "location": "root/<jvm root>/-fancy/equals.html" }, -{ "name": "hashCode", "location": "root/<jvm root>/-fancy/hash-code.html" }, -{ "name": "toString", "location": "root/<jvm root>/-fancy/to-string.html" }, -{ "name": "f", "location": "root/<jvm root>/f.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "Fancy", "class": "Fancy", "location": "root/[jvm root]/-fancy/index.html" }, +{ "name": "<init>", "location": "root/[jvm root]/-fancy/-init-.html" }, +{ "name": "equals", "location": "root/[jvm root]/-fancy/equals.html" }, +{ "name": "hashCode", "location": "root/[jvm root]/-fancy/hash-code.html" }, +{ "name": "toString", "location": "root/[jvm root]/-fancy/to-string.html" }, +{ "name": "f", "location": "root/[jvm root]/f.html" } ] diff --git a/plugins/base/src/test/resources/expect/function/out/html/navigation.html b/plugins/base/src/test/resources/expect/function/out/html/navigation.html index 0158be7d..3e532bec 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/function/out/html/navigation.html @@ -1,9 +1,9 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//fn/#//"> - <div class="overview"><a href="root/<jvm root>/fn.html">fn</a></div> + <div class="overview"><a href="root/[jvm root]/fn.html">fn</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/fn.html b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html index e49ade86..f6ae6ff7 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/fn.html +++ b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//fn/#//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="fn.html">fn</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="fn.html">fn</a></div> <div class="cover "> <h1>fn</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div></div></div> diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html index 58d5c404..23d4864c 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/index.html b/plugins/base/src/test/resources/expect/function/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/function/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/package-list b/plugins/base/src/test/resources/expect/function/out/html/root/package-list index 3a7c6807..9430f445 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/function/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://fn/#// root/<jvm root>/fn.html -<jvm root> +$dokka.location://fn/#// root/[jvm root]/fn.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/function/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/function/out/html/scripts/pages.js index c6ec7c4b..8a0c4c55 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/function/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "fn", "location": "root/<jvm root>/fn.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "fn", "location": "root/[jvm root]/fn.html" } ] diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/navigation.html index 73443522..df89ba77 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/navigation.html @@ -1,12 +1,12 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0-0" pageId="<jvm root>/Fancy////"> - <div class="overview"><a href="root/<jvm root>/-fancy/index.html">Fancy</a></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0-0" pageId="[jvm root]/Fancy////"> + <div class="overview"><a href="root/[jvm root]/-fancy/index.html">Fancy</a></div> </div> <div class="sideMenuPart" id="nav-submenu-0-1" pageId="//function/#kotlin.Function0[kotlin.Unit]//"> - <div class="overview"><a href="root/<jvm root>/function.html">function</a></div> + <div class="overview"><a href="root/[jvm root]/function.html">function</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/-init-.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html index 03d4d238..6fa1a1f0 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/-init-.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html @@ -17,8 +17,8 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../../scripts/pages.js"></script> <script type="text/javascript" src="../../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/Fancy/<init>/#//"> - <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html"><jvm root></a>/<a href="index.html">Fancy</a>/<a href="-init-.html"><init></a></div> + <div id="content" pageIds="[jvm root]/Fancy/<init>/#//"> + <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="-init-.html"><init></a></div> <div class="cover "> <h1><init></h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="-init-.html"><init></a>()</div></div></div> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/equals.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html index 2645051d..0c1760d6 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/equals.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../../scripts/pages.js"></script> <script type="text/javascript" src="../../../scripts/main.js"></script> <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//"> - <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html"><jvm root></a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a></div> + <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a></div> <div class="cover "> <h1>equals</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html index 09cf0e01..654b11b4 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/hash-code.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../../scripts/pages.js"></script> <script type="text/javascript" src="../../../scripts/main.js"></script> <div id="content" pageIds="/Fancy/hashCode/#//"> - <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html"><jvm root></a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a></div> + <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a></div> <div class="cover "> <h1>hashCode</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html index 4f02e43a..2f458d5a 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/index.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html @@ -17,8 +17,8 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../../scripts/pages.js"></script> <script type="text/javascript" src="../../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/Fancy////"> - <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html"><jvm root></a>/<a href="index.html">Fancy</a></div> + <div id="content" pageIds="[jvm root]/Fancy////"> + <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a></div> <div class="cover "> <h1>Fancy</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div></div></div> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/to-string.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html index 48b4711c..c0a3a7e0 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/to-string.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../../scripts/pages.js"></script> <script type="text/javascript" src="../../../scripts/main.js"></script> <div id="content" pageIds="/Fancy/toString/#//"> - <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html"><jvm root></a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a></div> + <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a></div> <div class="cover "> <h1>toString</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div> diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/function.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html index 6464397a..9e0ce05c 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/function.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//function/#kotlin.Function0[kotlin.Unit]//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="function.html">function</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="function.html">function</a></div> <div class="cover "> <h1>function</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -> <a href="">Unit</a></div>)</div></div></div> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html index b6f76db9..5a7adf9f 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Types</h2> <table> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list index 0b48e7e0..141e96fd 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list @@ -1,8 +1,8 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://function/#kotlin.Function0[kotlin.Unit]// root/<jvm root>/function.html -$dokka.location:/Fancy/equals/#kotlin.Any?// root/<jvm root>/-fancy/equals.html -$dokka.location:/Fancy/hashCode/#// root/<jvm root>/-fancy/hash-code.html -$dokka.location:/Fancy/toString/#// root/<jvm root>/-fancy/to-string.html -<jvm root> +$dokka.location://function/#kotlin.Function0[kotlin.Unit]// root/[jvm root]/function.html +$dokka.location:/Fancy/equals/#kotlin.Any?// root/[jvm root]/-fancy/equals.html +$dokka.location:/Fancy/hashCode/#// root/[jvm root]/-fancy/hash-code.html +$dokka.location:/Fancy/toString/#// root/[jvm root]/-fancy/to-string.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/pages.js index 74e79947..95ff3d6f 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/pages.js @@ -1,10 +1,10 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "Fancy", "class": "Fancy", "location": "root/<jvm root>/-fancy/index.html" }, -{ "name": "<init>", "location": "root/<jvm root>/-fancy/-init-.html" }, -{ "name": "equals", "location": "root/<jvm root>/-fancy/equals.html" }, -{ "name": "hashCode", "location": "root/<jvm root>/-fancy/hash-code.html" }, -{ "name": "toString", "location": "root/<jvm root>/-fancy/to-string.html" }, -{ "name": "function", "location": "root/<jvm root>/function.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "Fancy", "class": "Fancy", "location": "root/[jvm root]/-fancy/index.html" }, +{ "name": "<init>", "location": "root/[jvm root]/-fancy/-init-.html" }, +{ "name": "equals", "location": "root/[jvm root]/-fancy/equals.html" }, +{ "name": "hashCode", "location": "root/[jvm root]/-fancy/hash-code.html" }, +{ "name": "toString", "location": "root/[jvm root]/-fancy/to-string.html" }, +{ "name": "function", "location": "root/[jvm root]/function.html" } ] diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/navigation.html index 388f9e2f..6d159123 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/navigation.html @@ -1,9 +1,9 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#kotlin.String//"> - <div class="overview"><a href="root/<jvm root>/f.html">f</a></div> + <div class="overview"><a href="root/[jvm root]/f.html">f</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html index 47b3db1c..bde81d3f 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/f.html +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//f/#kotlin.String//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="f.html">f</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div> <div class="cover "> <h1>f</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(x: <a href="">String</a>)</div></div></div> diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html index fb7eacf2..16e168fa 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list index c8e4e8e1..2887ed99 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://f/#kotlin.String// root/<jvm root>/f.html -<jvm root> +$dokka.location://f/#kotlin.String// root/[jvm root]/f.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/pages.js index 68e0c564..310827d1 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "f", "location": "root/<jvm root>/f.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "f", "location": "root/[jvm root]/f.html" } ] diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/navigation.html index c0205733..b3a068a3 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/navigation.html @@ -1,9 +1,9 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//function/#kotlin.Function0[kotlin.Unit]//"> - <div class="overview"><a href="root/<jvm root>/function.html">function</a></div> + <div class="overview"><a href="root/[jvm root]/function.html">function</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/function.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html index 6464397a..9e0ce05c 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/function.html +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//function/#kotlin.Function0[kotlin.Unit]//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="function.html">function</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="function.html">function</a></div> <div class="cover "> <h1>function</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -> <a href="">Unit</a></div>)</div></div></div> diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html index c509e95e..48dcf46a 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list index 7de7dd3b..4200e2d8 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://function/#kotlin.Function0[kotlin.Unit]// root/<jvm root>/function.html -<jvm root> +$dokka.location://function/#kotlin.Function0[kotlin.Unit]// root/[jvm root]/function.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/pages.js index cf4e69e1..88b23abe 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "function", "location": "root/<jvm root>/function.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "function", "location": "root/[jvm root]/function.html" } ] diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/navigation.html index 463b028f..35fe78dc 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/navigation.html @@ -1,9 +1,9 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#//"> - <div class="overview"><a href="root/<jvm root>/f.html">f</a></div> + <div class="overview"><a href="root/[jvm root]/f.html">f</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html index 9de96412..6c049b35 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/<jvm root>/f.html +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//f/#//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="f.html">f</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div> <div class="cover "> <h1>f</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div> diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html index 1ebe6dce..8ab1c93f 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list index caf6273a..8f1c5fd9 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://f/#// root/<jvm root>/f.html -<jvm root> +$dokka.location://f/#// root/[jvm root]/f.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/pages.js index 68e0c564..310827d1 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "f", "location": "root/<jvm root>/f.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "f", "location": "root/[jvm root]/f.html" } ] diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/navigation.html index 4f3b7eda..9e098fd0 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/navigation.html @@ -1,9 +1,9 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//function/#kotlin.Int//"> - <div class="overview"><a href="root/<jvm root>/function.html">function</a></div> + <div class="overview"><a href="root/[jvm root]/function.html">function</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/function.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html index 6e34095f..e70eca57 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/function.html +++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//function/#kotlin.Int//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="function.html">function</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="function.html">function</a></div> <div class="cover "> <h1>function</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(x: <a href="">Int</a>)</div></div></div> diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html index 42458c2a..57ff2cc6 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list index 8b5d43ee..6394d253 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://function/#kotlin.Int// root/<jvm root>/function.html -<jvm root> +$dokka.location://function/#kotlin.Int// root/[jvm root]/function.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/pages.js index cf4e69e1..88b23abe 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "function", "location": "root/<jvm root>/function.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "function", "location": "root/[jvm root]/function.html" } ] diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/navigation.html index f59f7e4c..d5d3a9f4 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/navigation.html @@ -1,9 +1,9 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//fn/kotlin.String#//"> - <div class="overview"><a href="root/<jvm root>/fn.html">fn</a></div> + <div class="overview"><a href="root/[jvm root]/fn.html">fn</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/fn.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html index fdcd4a9d..8d47a590 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/fn.html +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//fn/kotlin.String#//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="fn.html">fn</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="fn.html">fn</a></div> <div class="cover "> <h1>fn</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>()</div></div></div> diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html index 4e481086..d60b6d9d 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list index 13dc2923..faeb244b 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list @@ -1,6 +1,6 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://fn/kotlin.String#// root/<jvm root>/fn.html -$dokka.location://fn/kotlin.String#kotlin.Int// root/<jvm root>/fn.html -<jvm root> +$dokka.location://fn/kotlin.String#// root/[jvm root]/fn.html +$dokka.location://fn/kotlin.String#kotlin.Int// root/[jvm root]/fn.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/pages.js index c6ec7c4b..8a0c4c55 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "fn", "location": "root/<jvm root>/fn.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "fn", "location": "root/[jvm root]/fn.html" } ] diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/navigation.html index 86a7862e..006a9e3e 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/navigation.html @@ -1,9 +1,9 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//generic/#//"> - <div class="overview"><a href="root/<jvm root>/generic.html">generic</a></div> + <div class="overview"><a href="root/[jvm root]/generic.html">generic</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/generic.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html index 2d8a5c7f..a9efa176 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/generic.html +++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//generic/#//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="generic.html">generic</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="generic.html">generic</a></div> <div class="cover "> <h1>generic</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">private final fun <<a href="generic.html">T</a> : <a href="">Any</a>> <a href="generic.html">generic</a>()</div></div></div> diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html index 4cf172df..3d9a7000 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list index 30905d0f..468c6cb4 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://generic/#// root/<jvm root>/generic.html -<jvm root> +$dokka.location://generic/#// root/[jvm root]/generic.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/pages.js index b8b18755..ee6a2f7a 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "generic", "location": "root/<jvm root>/generic.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "generic", "location": "root/[jvm root]/generic.html" } ] diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html index 86a7862e..006a9e3e 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html @@ -1,9 +1,9 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//generic/#//"> - <div class="overview"><a href="root/<jvm root>/generic.html">generic</a></div> + <div class="overview"><a href="root/[jvm root]/generic.html">generic</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/generic.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html index 0c00617f..360045a2 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/generic.html +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//generic/#//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="generic.html">generic</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="generic.html">generic</a></div> <div class="cover "> <h1>generic</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <<a href="generic.html">T</a> : R, <a href="generic.html">R</a> : <a href="">Any</a>> <a href="generic.html">generic</a>()</div></div></div> diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html index a59f1ad7..bc4888ba 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list index 30905d0f..468c6cb4 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://generic/#// root/<jvm root>/generic.html -<jvm root> +$dokka.location://generic/#// root/[jvm root]/generic.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/pages.js index b8b18755..ee6a2f7a 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "generic", "location": "root/<jvm root>/generic.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "generic", "location": "root/[jvm root]/generic.html" } ] diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/navigation.html index 8c279fe3..f949d074 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/navigation.html @@ -1,9 +1,9 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#kotlin.Function0[kotlin.String]//"> - <div class="overview"><a href="root/<jvm root>/f.html">f</a></div> + <div class="overview"><a href="root/[jvm root]/f.html">f</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html index 37795eb2..5b26e5a8 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/f.html +++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="f.html">f</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div> <div class="cover "> <h1>f</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -> <a href="">String</a></div>)</div></div></div> diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html index cfd0ab30..27fbc21c 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list index 60993388..ce137c16 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://f/#kotlin.Function0[kotlin.String]// root/<jvm root>/f.html -<jvm root> +$dokka.location://f/#kotlin.Function0[kotlin.String]// root/[jvm root]/f.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/pages.js index 68e0c564..310827d1 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "f", "location": "root/<jvm root>/f.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "f", "location": "root/[jvm root]/f.html" } ] diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/navigation.html index 8c279fe3..f949d074 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/navigation.html @@ -1,9 +1,9 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#kotlin.Function0[kotlin.String]//"> - <div class="overview"><a href="root/<jvm root>/f.html">f</a></div> + <div class="overview"><a href="root/[jvm root]/f.html">f</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html index 37795eb2..5b26e5a8 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/<jvm root>/f.html +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="f.html">f</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div> <div class="cover "> <h1>f</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -> <a href="">String</a></div>)</div></div></div> diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html index cfd0ab30..27fbc21c 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list index 60993388..ce137c16 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://f/#kotlin.Function0[kotlin.String]// root/<jvm root>/f.html -<jvm root> +$dokka.location://f/#kotlin.Function0[kotlin.String]// root/[jvm root]/f.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/scripts/pages.js index 68e0c564..310827d1 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "f", "location": "root/<jvm root>/f.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "f", "location": "root/[jvm root]/f.html" } ] diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html index 96a19bec..ff1a753c 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html @@ -1,9 +1,9 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//availableSince1.1/#//"> - <div class="overview"><a href="root/<jvm root>/available-since1.1.html">availableSince1.1</a></div> + <div class="overview"><a href="root/[jvm root]/available-since1.1.html">availableSince1.1</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/<jvm root>/available-since1.1.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html index 628af947..3c8a55a7 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/<jvm root>/available-since1.1.html +++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//availableSince1.1/#//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="available-since1.1.html">availableSince1.1</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="available-since1.1.html">availableSince1.1</a></div> <div class="cover "> <h1>availableSince1.1</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="available-since1.1.html">availableSince1.1</a>(): <a href="">String</a></div></div></div> diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html index 0f343034..9d7ae2e7 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list index 8810ec13..adc667ec 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://availableSince1.1/#// root/<jvm root>/available-since1.1.html -<jvm root> +$dokka.location://availableSince1.1/#// root/[jvm root]/available-since1.1.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/pages.js index 8af77c2e..de75fd20 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "availableSince1.1", "location": "root/<jvm root>/available-since1.1.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "availableSince1.1", "location": "root/[jvm root]/available-since1.1.html" } ] diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/navigation.html index 463b028f..35fe78dc 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/navigation.html @@ -1,9 +1,9 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#//"> - <div class="overview"><a href="root/<jvm root>/f.html">f</a></div> + <div class="overview"><a href="root/[jvm root]/f.html">f</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html index 9de96412..6c049b35 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/f.html +++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//f/#//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="f.html">f</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div> <div class="cover "> <h1>f</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div> diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html index 1ebe6dce..8ab1c93f 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list index caf6273a..8f1c5fd9 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://f/#// root/<jvm root>/f.html -<jvm root> +$dokka.location://f/#// root/[jvm root]/f.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/suspendFunction/out/html/scripts/pages.js index 68e0c564..310827d1 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "f", "location": "root/<jvm root>/f.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "f", "location": "root/[jvm root]/f.html" } ] diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/navigation.html index 8c279fe3..f949d074 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/navigation.html @@ -1,9 +1,9 @@ <div class="sideMenuPart" id="nav-submenu" pageId="/////"> <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0" pageId="<jvm root>/////"> - <div class="overview"><a href="root/<jvm root>/index.html"><jvm root></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////"> + <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#kotlin.Function0[kotlin.String]//"> - <div class="overview"><a href="root/<jvm root>/f.html">f</a></div> + <div class="overview"><a href="root/[jvm root]/f.html">f</a></div> </div> </div> </div> diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html index 37795eb2..5b26e5a8 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/<jvm root>/f.html +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html @@ -18,7 +18,7 @@ <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a>/<a href="f.html">f</a></div> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div> <div class="cover "> <h1>f</h1> <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -> <a href="">String</a></div>)</div></div></div> diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html index cfd0ab30..27fbc21c 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/<jvm root>/index.html +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html @@ -1,7 +1,7 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title><jvm root></title> + <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> @@ -17,10 +17,10 @@ <div id="searchBar"></div> <script type="text/javascript" src="../../scripts/pages.js"></script> <script type="text/javascript" src="../../scripts/main.js"></script> - <div id="content" pageIds="<jvm root>/////"> - <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html"><jvm root></a></div> + <div id="content" pageIds="[jvm root]/////"> + <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div> <div class="cover "> - <h1>Package <jvm root></h1> + <h1>Package [jvm root]</h1> </div> <h2>Functions</h2> <table> diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html @@ -27,7 +27,7 @@ <thead></thead> <tbody> <tr class="platform-tagged"> - <td class="content"><a href="<jvm root>/index.html"><jvm root></a></td> + <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td> <td class="platform-tagged"> <div class="platform-tag jvm">JVM</div> </td> diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list index 60993388..ce137c16 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://f/#kotlin.Function0[kotlin.String]// root/<jvm root>/f.html -<jvm root> +$dokka.location://f/#kotlin.Function0[kotlin.String]// root/[jvm root]/f.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/scripts/pages.js index 68e0c564..310827d1 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "<jvm root>", "location": "root/<jvm root>/index.html" }, -{ "name": "f", "location": "root/<jvm root>/f.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "f", "location": "root/[jvm root]/f.html" } ] |