Correctly support code blocks

2 files changed, 12 insertions, 3 deletions

diff --git a/core/src/test/kotlin/format/JavaLayoutHtmlFormatTest.kt b/core/src/test/kotlin/format/JavaLayoutHtmlFormatTest.kt
index 5da49d345..d32ce5ee6 100644
--- a/core/src/test/kotlin/format/JavaLayoutHtmlFormatTest.kt
+++ b/core/src/test/kotlin/format/JavaLayoutHtmlFormatTest.kt
@@ -16,5 +16,10 @@ class JavaLayoutHtmlFormatTest : JavaLayoutHtmlFormatTestCase() {
         verifyPackageNode("topLevel.kt")
     }
 
-
+    @Test
+    fun codeBlocks() {
+        verifyNode("codeBlocks.kt") { model ->
+            listOf(model.members.single().members.single { it.name == "foo" })
+        }
+    }
 }
\ 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 0b8fca235..dcdd6128a 100644
--- a/core/src/test/kotlin/format/JavaLayoutHtmlFormatTestCase.kt
+++ b/core/src/test/kotlin/format/JavaLayoutHtmlFormatTestCase.kt
@@ -70,7 +70,7 @@ abstract class JavaLayoutHtmlFormatTestCase {
             }
         }
 
-    protected fun verifyNode(fileName: String) {
+    protected fun verifyNode(fileName: String, select: (model: DocumentationNode) -> List<DocumentationNode>) {
         verifyOutput(
             "testdata/format/java-layout-html/$fileName",
             ".html",
@@ -81,12 +81,16 @@ abstract class JavaLayoutHtmlFormatTestCase {
         ) { model, output ->
             buildPagesAndReadInto(
                 model,
-                listOf(model.members.single().members.single()),
+                select(model),
                 output
             )
         }
     }
 
+    protected fun verifyNode(fileName: String) {
+        verifyNode(fileName, { model -> listOf(model.members.single().members.single()) })
+    }
+
     protected fun verifyPackageNode(fileName: String) {
         verifyOutput(
             "testdata/format/java-layout-html/$fileName",