commit 9bad4f0efb6dfb683497db1ad0e782cae22e9038
author Douglas Sigelbaum <sigelbaum@google.com> Mon Dec 18 17:08:07 2017 -0800
committer Douglas Sigelbaum <sigelbaum@google.com> Mon Dec 18 17:08:07 2017 -0800
tree a5012e60b9039d296e16a9e799ff015d01a9b7fb
parent 3ffa236bdc401387b696f09a4450f65a275dcfec
parent 79554fe22e77462e4a49e4124966de70e266bfd9

Merge remote-tracking branch 'upstream/java-layout-html-format' into devsite-with-java-layout-html

core/src/main/kotlin/Formats/JavaLayoutHtmlFormat.kt

diff --git a/core/src/main/kotlin/Formats/JavaLayoutHtmlFormat.kt b/core/src/main/kotlin/Formats/JavaLayoutHtmlFormat.kt
index b40cef7..e8a9a4d 100644
--- a/core/src/main/kotlin/Formats/JavaLayoutHtmlFormat.kt
+++ b/core/src/main/kotlin/Formats/JavaLayoutHtmlFormat.kt
@@ -402,9 +402,7 @@
             is ContentParagraph -> p { appendContent(content.children) }
 
             is ContentNodeLink -> {
-                ""
-
-                a(href = uriProvider.linkTo(content.node!!, uri)) { appendContent(content.children) }
+                a(href = content.node?.let { uriProvider.linkTo(it, uri) } ?: "#unresolved") { appendContent(content.children) }
             }
             is ContentExternalLink -> {
                 a(href = content.href) { appendContent(content.children) }
@@ -457,7 +455,10 @@
         return when (node.kind) {
             NodeKind.Package -> tryGetContainerUri(node)?.resolve("package-summary.html")
             in classLike -> tryGetContainerUri(node)?.resolve("#")
-            in memberLike -> tryGetMainUri(node.owner!!)?.resolveInPage(node)
+            in memberLike -> {
+                val owner = if (node.owner?.kind != NodeKind.ExternalClass) node.owner else node.owner?.owner
+                tryGetMainUri(owner!!)?.resolveInPage(node)
+            }
             NodeKind.TypeParameter -> node.path.asReversed().drop(1).firstNotNullResult(this::tryGetMainUri)?.resolveInPage(node)
             NodeKind.AllTypes -> tryGetContainerUri(node.owner!!)?.resolve("classes.html")
             else -> null