Support extensions on external classes correctly

2 files changed, 19 insertions, 5 deletions

diff --git a/core/src/test/kotlin/format/JavaLayoutHtmlFormatTest.kt b/core/src/test/kotlin/format/JavaLayoutHtmlFormatTest.kt
index d32ce5ee6..7a16df516 100644
--- a/core/src/test/kotlin/format/JavaLayoutHtmlFormatTest.kt
+++ b/core/src/test/kotlin/format/JavaLayoutHtmlFormatTest.kt
@@ -22,4 +22,16 @@ class JavaLayoutHtmlFormatTest : JavaLayoutHtmlFormatTestCase() {
             listOf(model.members.single().members.single { it.name == "foo" })
         }
     }
+
+    @Test
+    fun externalClassExtension() {
+        verifyPackageNode("externalClassExtension.kt")
+    }
+
+    @Test
+    fun unresolvedExternalClass() {
+        verifyNode("unresolvedExternalClass.kt", noStdlibLink = true) { model ->
+            listOf(model.members.single().members.single { it.name == "MyException" })
+        }
+    }
 }
\ No newline at end of file
diff --git a/core/src/test/kotlin/format/JavaLayoutHtmlFormatTestCase.kt b/core/src/test/kotlin/format/JavaLayoutHtmlFormatTestCase.kt
index dcdd6128a..260ca9974 100644
--- a/core/src/test/kotlin/format/JavaLayoutHtmlFormatTestCase.kt
+++ b/core/src/test/kotlin/format/JavaLayoutHtmlFormatTestCase.kt
@@ -70,13 +70,13 @@ abstract class JavaLayoutHtmlFormatTestCase {
             }
         }
 
-    protected fun verifyNode(fileName: String, select: (model: DocumentationNode) -> List<DocumentationNode>) {
+    protected fun verifyNode(fileName: String, noStdlibLink: Boolean = false, select: (model: DocumentationNode) -> List<DocumentationNode>) {
         verifyOutput(
             "testdata/format/java-layout-html/$fileName",
             ".html",
             format = "java-layout-html",
             withKotlinRuntime = true,
-            noStdlibLink = false,
+            noStdlibLink = noStdlibLink,
             collectInheritedExtensionsFromLibraries = true
         ) { model, output ->
             buildPagesAndReadInto(
@@ -88,14 +88,16 @@ abstract class JavaLayoutHtmlFormatTestCase {
     }
 
     protected fun verifyNode(fileName: String) {
-        verifyNode(fileName, { model -> listOf(model.members.single().members.single()) })
+        verifyNode(fileName) { model -> listOf(model.members.single().members.single()) }
     }
 
-    protected fun verifyPackageNode(fileName: String) {
+    protected fun verifyPackageNode(fileName: String, noStdlibLink: Boolean = false) {
         verifyOutput(
             "testdata/format/java-layout-html/$fileName",
             ".package-summary.html",
-            format = "java-layout-html"
+            format = "java-layout-html",
+            withKotlinRuntime = true,
+            noStdlibLink = noStdlibLink
         ) { model, output ->
             buildPagesAndReadInto(
                 model,