Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes "The following documentation URLs were checked" message in Android Studio (IntelliJ) #2734

Merged
merged 2 commits into from
Nov 9, 2022
Merged

Fixes "The following documentation URLs were checked" message in Android Studio (IntelliJ) #2734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8326c5
Fixed wrong Javadoc links in Android Studio (IntelliJ); Fixed missing…
bomberaya Oct 28, 2022
2385ce4
Update failing test
bomberaya Nov 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import org.jetbrains.dokka.model.*
internal fun JavadocFunctionNode.getAnchor(): String =
"$name(${parameters.joinToString(",") {
when (val bound = if (it.typeBound is Nullable) it.typeBound.inner else it.typeBound) {
is TypeConstructor -> bound.dri.classNames.orEmpty()
is TypeConstructor -> listOf(bound.dri.packageName, bound.dri.classNames).joinToString(".")
is TypeParameter -> bound.name
is PrimitiveJavaType -> bound.name
is UnresolvedBound -> bound.name
Expand Down
2 changes: 1 addition & 1 deletion plugins/javadoc/src/main/resources/views/class.korte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<main role="main">
<div class="header">
<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">{{ package }}</a></div>
<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">{{ packageName }}</a></div>
<h2 title="{{ kind|capitalize }} {{ name }}" class="title">{{ kind|capitalize }} {{ name }}</h2>
</div>
<div class="contentContainer">
Expand Down
2 changes: 1 addition & 1 deletion plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class JavadocLocationTest : BaseAbstractTest() {
.firstChildOfType<JavadocClasslikePageNode> { it.name == "Test" }
val testFunctionNode = testClassNode.methods.first { it.name == "test2" }
assertEquals(
"""<a href=Test.html#test2(String)>test2</a>(<a href=https://docs.oracle.com/javase/8/docs/api/java/lang/String.html>String</a> s)""",
"""<a href=Test.html#test2(java.lang.String)>test2</a>(<a href=https://docs.oracle.com/javase/8/docs/api/java/lang/String.html>String</a> s)""",
transformer.htmlForContentNode(
testFunctionNode.signature.signatureWithoutModifiers,
testClassNode
Expand Down