diff options
| author | Kamil Doległo <kamilok1965@interia.pl> | 2020-08-19 11:45:08 +0200 |
|---|---|---|
| committer | Sebastian Sellmair <34319766+sellmair@users.noreply.github.com> | 2020-08-19 13:34:10 +0200 |
| commit | 6ca48a067d90b200cb93332235821549bb1a742b (patch) | |
| tree | 70d22fc0c1f3858fb83283413d5f10b501dc95f0 /plugins/base/src/main/kotlin/resolvers | |
| parent | be9614ff2d5ab4a65f0e2dbc2d33c884de8e12e2 (diff) | |
| download | dokka-6ca48a067d90b200cb93332235821549bb1a742b.tar.gz dokka-6ca48a067d90b200cb93332235821549bb1a742b.tar.bz2 dokka-6ca48a067d90b200cb93332235821549bb1a742b.zip | |
Fix relocation id creation in the Dokka010ExternalLocationProvider
Diffstat (limited to 'plugins/base/src/main/kotlin/resolvers')
| -rw-r--r-- | plugins/base/src/main/kotlin/resolvers/external/Dokka010ExternalLocationProvider.kt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/base/src/main/kotlin/resolvers/external/Dokka010ExternalLocationProvider.kt b/plugins/base/src/main/kotlin/resolvers/external/Dokka010ExternalLocationProvider.kt index 33bc96d8..c645157a 100644 --- a/plugins/base/src/main/kotlin/resolvers/external/Dokka010ExternalLocationProvider.kt +++ b/plugins/base/src/main/kotlin/resolvers/external/Dokka010ExternalLocationProvider.kt @@ -14,8 +14,10 @@ open class Dokka010ExternalLocationProvider( override fun resolve(dri: DRI): String? { val docURL = externalDocumentation.documentationURL.toString().removeSuffix("/") + "/" + val fqName = listOfNotNull(dri.packageName.takeIf { it?.isNotBlank() == true }, + dri.classNames.takeIf { it?.isNotBlank() == true }).joinToString(".") val relocationId = - "${dri.packageName}.${dri.classNames}".let { if (dri.callable != null) it + "$" + dri.callable!!.toOldString() else it } + fqName.let { if (dri.callable != null) it + "$" + dri.callable!!.toOldString() else it } externalDocumentation.packageList.locations[relocationId]?.let { path -> return "$docURL$path" } val classNamesChecked = dri.classNames ?: return "$docURL${dri.packageName ?: ""}/index$extension" @@ -26,5 +28,5 @@ open class Dokka010ExternalLocationProvider( return "$docURL$classLink/" + identifierToFilename(callableChecked.name) + extension } - private fun Callable.toOldString() = name + params.joinToString(", ", "(", ")") + receiver?.let { "#$it" } + private fun Callable.toOldString() = name + params.joinToString(", ", "(", ")") + (receiver?.let { "#$it" } ?: "") } |