foo bar
*/ - parsed.assertEquals(paragraph("*_foo *bar*_*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Emphasis( + "_", + Text("foo "), + Emphasis("*", Text("bar")), + ), + ), + ), + ) } @Test @@ -36,7 +52,15 @@ class MarkdownProcessorDocumentParsingExtraTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("**foo *bar***")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + Text("foo "), + Emphasis("*", Text("bar")), + ), + ), + ) } @Test @@ -47,7 +71,19 @@ class MarkdownProcessorDocumentParsingExtraTest { * Expected HTML: *foo bar a
*/ - parsed.assertEquals(paragraph("*_foo *bar* a_*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Emphasis( + "_", + Text("foo "), + Emphasis("*", Text("bar")), + Text(" a"), + ), + ), + ), + ) } @Test @@ -58,7 +94,16 @@ class MarkdownProcessorDocumentParsingExtraTest { * Expected HTML: *foo bar a
*/ - parsed.assertEquals(paragraph("**foo *bar* a**")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + Text("foo "), + Emphasis("*", Text("bar")), + Text(" a"), + ), + ), + ) } @Test @@ -67,8 +112,23 @@ class MarkdownProcessorDocumentParsingExtraTest { /* * Expected HTML: - *foo bar a
+ *foo bar a
*/ - parsed.assertEquals(paragraph("*_*foo *bar* a*_*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Emphasis( + "_", + Emphasis( + "*", + Text("foo "), + Emphasis("*", Text("bar")), + Text(" a"), + ), + ), + ), + ), + ) } } diff --git a/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/MarkdownProcessorDocumentParsingTest.kt b/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/MarkdownProcessorDocumentParsingTest.kt index af9d12100..d40cd14ac 100644 --- a/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/MarkdownProcessorDocumentParsingTest.kt +++ b/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/MarkdownProcessorDocumentParsingTest.kt @@ -1,14 +1,24 @@ package org.jetbrains.jewel.markdown +import org.jetbrains.jewel.markdown.InlineMarkdown.Code +import org.jetbrains.jewel.markdown.InlineMarkdown.Emphasis +import org.jetbrains.jewel.markdown.InlineMarkdown.HardLineBreak +import org.jetbrains.jewel.markdown.InlineMarkdown.HtmlInline +import org.jetbrains.jewel.markdown.InlineMarkdown.Image +import org.jetbrains.jewel.markdown.InlineMarkdown.Link +import org.jetbrains.jewel.markdown.InlineMarkdown.SoftLineBreak +import org.jetbrains.jewel.markdown.InlineMarkdown.StrongEmphasis +import org.jetbrains.jewel.markdown.InlineMarkdown.Text +import org.jetbrains.jewel.markdown.MarkdownBlock.Heading +import org.jetbrains.jewel.markdown.MarkdownBlock.Paragraph import org.jetbrains.jewel.markdown.processing.MarkdownProcessor -import org.junit.Ignore import org.junit.Test /** - * This class tests that all the snippets in the CommonMark 0.31.2 specs are - * rendered correctly into MarkdownBlocks, matching what the CommonMark - * 0.20 HTML renderer tests also validate. - *Foo
*/ - parsed.assertEquals(heading(level = 1, "Foo")) + parsed.assertEquals(heading(level = 1, Text("Foo"))) } @Test @@ -223,7 +234,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
*/ - parsed.assertEquals(paragraph("\\!\"#\$%&'\\(\\)\\*+,-./:;\\<=\\>?@\\[\\\\\\]^\\_\\`{|}\\~")) + parsed.assertEquals(paragraph("!\"#\$%&'()*+,-./:;<=>?@[\\]^_`{|}~")) } @Test @@ -242,16 +253,16 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |\*not emphasized* - |\not a tag - |\[not a link](/foo) - |\`not code` - |1\. not a list - |\* not a list - |\# not a heading - |\[foo]: /url "not a reference" - |\ö not a character entity - """ + |\*not emphasized* + |\
not a tag + |\[not a link](/foo) + |\`not code` + |1\. not a list + |\* not a list + |\# not a heading + |\[foo]: /url "not a reference" + |\ö not a character entity + """ .trimMargin(), ) @@ -268,16 +279,24 @@ class MarkdownProcessorDocumentParsingTest { * ö not a character entity */ parsed.assertEquals( - paragraph( - "\\*not emphasized\\* " + - "\\
not a tag " + - "\\[not a link\\]\\(/foo\\) " + - "\\`not code\\` " + - "1. not a list " + - "\\* not a list " + - "# not a heading " + - "\\[foo\\]: /url \"not a reference\" " + - "\\ö not a character entity", + Paragraph( + Text("*not emphasized*"), + SoftLineBreak, + Text("
not a tag"), + SoftLineBreak, + Text("[not a link](/foo)"), + SoftLineBreak, + Text("`not code`"), + SoftLineBreak, + Text("1. not a list"), + SoftLineBreak, + Text("* not a list"), + SoftLineBreak, + Text("# not a heading"), + SoftLineBreak, + Text("[foo]: /url \"not a reference\""), + SoftLineBreak, + Text("ö not a character entity"), ), ) } @@ -290,7 +309,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *
\emphasis
*/ - parsed.assertEquals(paragraph("\\\\*emphasis*")) + parsed.assertEquals(Paragraph(Text("\\"), Emphasis("*", Text("emphasis")))) } @Test @@ -298,9 +317,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |foo\ - |bar - """ + |foo\ + |bar + """ .trimMargin(), ) @@ -309,7 +328,7 @@ class MarkdownProcessorDocumentParsingTest { *foo
* bar
\[\`
föö
*foo* * foo
*/ - parsed.assertEquals(paragraph("\\*foo\\* *foo*")) + parsed.assertEquals( + Paragraph( + Text("*foo*"), + SoftLineBreak, + Emphasis("*", Text("foo")), + ), + ) } @Test @@ -622,10 +671,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |* foo - | - |* foo - """ + |* foo + | + |* foo + """ .trimMargin(), ) @@ -637,7 +686,7 @@ class MarkdownProcessorDocumentParsingTest { * */ parsed.assertEquals( - paragraph("\\* foo"), + paragraph("* foo"), unorderedList(listItem(paragraph("foo")), marker = "*"), ) } @@ -674,7 +723,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[a](url "tit")
*/ - parsed.assertEquals(paragraph("\\[a\\]\\(url \"tit\"\\)")) + parsed.assertEquals(paragraph("[a](url \"tit\")")) } @Test @@ -682,9 +731,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |- `one - |- two` - """ + |- `one + |- two` + """ .trimMargin(), ) @@ -697,8 +746,8 @@ class MarkdownProcessorDocumentParsingTest { */ parsed.assertEquals( unorderedList( - listItem(paragraph("\\`one")), - listItem(paragraph("two\\`")), + listItem(paragraph("`one")), + listItem(paragraph("two`")), ), ) } @@ -708,10 +757,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |*** - |--- - |___ - """ + |*** + |--- + |___ + """ .trimMargin(), ) @@ -755,10 +804,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |-- - |** - |__ - """ + |-- + |** + |__ + """ .trimMargin(), ) @@ -768,7 +817,15 @@ class MarkdownProcessorDocumentParsingTest { * ** * __ */ - parsed.assertEquals(paragraph("-- \\*\\* \\_\\_")) + parsed.assertEquals( + Paragraph( + Text("--"), + SoftLineBreak, + Text("**"), + SoftLineBreak, + Text("__"), + ), + ) } @Test @@ -776,10 +833,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | *** - | *** - | *** - """ + | *** + | *** + | *** + """ .trimMargin(), ) @@ -813,9 +870,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - | *** - """ + |Foo + | *** + """ .trimMargin(), ) @@ -824,7 +881,7 @@ class MarkdownProcessorDocumentParsingTest { *Foo * ***
*/ - parsed.assertEquals(paragraph("Foo \\*\\*\\*")) + parsed.assertEquals(Paragraph(Text("Foo"), SoftLineBreak, Text("***"))) } @Test @@ -887,12 +944,12 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |_ _ _ _ a - | - |a------ - | - |---a--- - """ + |_ _ _ _ a + | + |a------ + | + |---a--- + """ .trimMargin(), ) @@ -903,7 +960,7 @@ class MarkdownProcessorDocumentParsingTest { *---a---
*/ parsed.assertEquals( - paragraph("\\_ \\_ \\_ \\_ a"), + paragraph("_ _ _ _ a"), paragraph("a------"), paragraph("---a---"), ) @@ -917,7 +974,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *-
*/ - parsed.assertEquals(paragraph("*-*")) + parsed.assertEquals(Paragraph(Emphasis("*", Text("-")))) } @Test @@ -925,10 +982,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |- foo - |*** - |- bar - """ + |- foo + |*** + |- bar + """ .trimMargin(), ) @@ -954,10 +1011,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - |*** - |bar - """ + |Foo + |*** + |bar + """ .trimMargin(), ) @@ -979,10 +1036,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - |--- - |bar - """ + |Foo + |--- + |bar + """ .trimMargin(), ) @@ -992,7 +1049,7 @@ class MarkdownProcessorDocumentParsingTest { *bar
*/ parsed.assertEquals( - heading(2, "Foo"), + heading(2, Text("Foo")), paragraph("bar"), ) } @@ -1002,10 +1059,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |* Foo - |* * * - |* Bar - """ + |* Foo + |* * * + |* Bar + """ .trimMargin(), ) @@ -1031,9 +1088,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |- Foo - |- * * * - """ + |- Foo + |- * * * + """ .trimMargin(), ) @@ -1059,13 +1116,13 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |# foo - |## foo - |### foo - |#### foo - |##### foo - |###### foo - """ + |# foo + |## foo + |### foo + |#### foo + |##### foo + |###### foo + """ .trimMargin(), ) @@ -1079,12 +1136,12 @@ class MarkdownProcessorDocumentParsingTest { *foo
*/ parsed.assertEquals( - heading(1, "foo"), - heading(2, "foo"), - heading(3, "foo"), - heading(4, "foo"), - heading(5, "foo"), - heading(6, "foo"), + heading(1, Text("foo")), + heading(2, Text("foo")), + heading(3, Text("foo")), + heading(4, Text("foo")), + heading(5, Text("foo")), + heading(6, Text("foo")), ) } @@ -1104,10 +1161,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |#5 bolt - | - |#hashtag - """ + |#5 bolt + | + |#hashtag + """ .trimMargin(), ) @@ -1142,7 +1199,12 @@ class MarkdownProcessorDocumentParsingTest { *foo bar *baz*
*/ parsed.assertEquals( - heading(level = 1, "foo *bar* \\*baz\\*"), + heading( + level = 1, + Text("foo "), + Emphasis("*", Text("bar")), + Text(" *baz*"), + ), ) } @@ -1154,7 +1216,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo
*/ - parsed.assertEquals(heading(level = 1, "foo")) + parsed.assertEquals(heading(level = 1, Text("foo"))) } @Test @@ -1162,10 +1224,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | ### foo - | ## foo - | # foo - """ + | ### foo + | ## foo + | # foo + """ .trimMargin(), ) @@ -1176,9 +1238,9 @@ class MarkdownProcessorDocumentParsingTest { *foo
*/ parsed.assertEquals( - heading(level = 3, "foo"), - heading(level = 2, "foo"), - heading(level = 1, "foo"), + heading(level = 3, Text("foo")), + heading(level = 2, Text("foo")), + heading(level = 1, Text("foo")), ) } @@ -1199,9 +1261,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |foo - | # bar - """ + |foo + | # bar + """ .trimMargin(), ) @@ -1210,7 +1272,7 @@ class MarkdownProcessorDocumentParsingTest { *foo * # bar
*/ - parsed.assertEquals(paragraph("foo # bar")) + parsed.assertEquals(Paragraph(Text("foo"), SoftLineBreak, Text("# bar"))) } @Test @@ -1218,9 +1280,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |## foo ## - | ### bar ### - """ + |## foo ## + | ### bar ### + """ .trimMargin(), ) @@ -1230,8 +1292,8 @@ class MarkdownProcessorDocumentParsingTest { *bar
*/ parsed.assertEquals( - heading(level = 2, "foo"), - heading(level = 3, "bar"), + heading(level = 2, Text("foo")), + heading(level = 3, Text("bar")), ) } @@ -1240,9 +1302,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |# foo ################################## - |##### foo ## - """ + |# foo ################################## + |##### foo ## + """ .trimMargin(), ) @@ -1252,8 +1314,8 @@ class MarkdownProcessorDocumentParsingTest { *foo
*/ parsed.assertEquals( - heading(level = 1, "foo"), - heading(level = 5, "foo"), + heading(level = 1, Text("foo")), + heading(level = 5, Text("foo")), ) } @@ -1265,7 +1327,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo
*/ - parsed.assertEquals(heading(level = 3, "foo")) + parsed.assertEquals(heading(level = 3, Text("foo"))) } @Test @@ -1276,7 +1338,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo ### b
*/ - parsed.assertEquals(heading(level = 3, "foo ### b")) + parsed.assertEquals(heading(level = 3, Text("foo ### b"))) } @Test @@ -1287,7 +1349,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo#
*/ - parsed.assertEquals(heading(level = 1, "foo#")) + parsed.assertEquals(heading(level = 1, Text("foo#"))) } @Test @@ -1295,10 +1357,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |### foo \### - |## foo #\## - |# foo \# - """ + |### foo \### + |## foo #\## + |# foo \# + """ .trimMargin(), ) @@ -1309,9 +1371,9 @@ class MarkdownProcessorDocumentParsingTest { *foo #
*/ parsed.assertEquals( - heading(level = 3, "foo ###"), - heading(level = 2, "foo ###"), - heading(level = 1, "foo #"), + heading(level = 3, Text("foo ###")), + heading(level = 2, Text("foo ###")), + heading(level = 1, Text("foo #")), ) } @@ -1320,10 +1382,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |**** - |## foo - |**** - """ + |**** + |## foo + |**** + """ .trimMargin(), ) @@ -1335,7 +1397,7 @@ class MarkdownProcessorDocumentParsingTest { */ parsed.assertEquals( thematicBreak(), - heading(level = 2, "foo"), + heading(level = 2, Text("foo")), thematicBreak(), ) } @@ -1345,10 +1407,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo bar - |# baz - |Bar foo - """ + |Foo bar + |# baz + |Bar foo + """ .trimMargin(), ) @@ -1360,7 +1422,7 @@ class MarkdownProcessorDocumentParsingTest { */ parsed.assertEquals( paragraph("Foo bar"), - heading(level = 1, "baz"), + heading(level = 1, Text("baz")), paragraph("Bar foo"), ) } @@ -1370,10 +1432,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |## - |# - |### ### - """ + |## + |# + |### ### + """ .trimMargin(), ) @@ -1384,9 +1446,9 @@ class MarkdownProcessorDocumentParsingTest { * */ parsed.assertEquals( - heading(level = 2, ""), - heading(level = 1, ""), - heading(level = 3, ""), + Heading(emptyList(), level = 2), + Heading(emptyList(), level = 1), + Heading(emptyList(), level = 3), ) } @@ -1395,12 +1457,12 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo *bar* - |========= - | - |Foo *bar* - |--------- - """ + |Foo *bar* + |========= + | + |Foo *bar* + |--------- + """ .trimMargin(), ) @@ -1411,8 +1473,8 @@ class MarkdownProcessorDocumentParsingTest { */ parsed.assertEquals( - heading(level = 1, "Foo *bar*"), - heading(level = 2, "Foo *bar*"), + heading(level = 1, Text("Foo "), Emphasis("*", Text("bar"))), + heading(level = 2, Text("Foo "), Emphasis("*", Text("bar"))), ) } @@ -1421,10 +1483,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo *bar - |baz* - |==== - """ + |Foo *bar + |baz* + |==== + """ .trimMargin(), ) @@ -1433,7 +1495,13 @@ class MarkdownProcessorDocumentParsingTest { *Foo bar * baz
*/ - parsed.assertEquals(heading(level = 1, "Foo *bar baz*")) + parsed.assertEquals( + heading( + level = 1, + Text("Foo "), + Emphasis("*", Text("bar"), SoftLineBreak, Text("baz")), + ), + ) } @Test @@ -1445,7 +1513,14 @@ class MarkdownProcessorDocumentParsingTest { *Foo bar * baz
*/ - parsed.assertEquals(heading(level = 1, "Foo *bar baz*")) + parsed.assertEquals( + heading( + level = 1, + Text("Foo "), + Emphasis("*", Text("bar"), SoftLineBreak, Text("baz")), + Text(""), + ), + ) } @Test @@ -1453,12 +1528,12 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - |------------------------- - | - |Foo - |= - """ + |Foo + |------------------------- + | + |Foo + |= + """ .trimMargin(), ) @@ -1468,8 +1543,8 @@ class MarkdownProcessorDocumentParsingTest { *Foo
*/ parsed.assertEquals( - heading(level = 2, "Foo"), - heading(level = 1, "Foo"), + heading(level = 2, Text("Foo")), + heading(level = 1, Text("Foo")), ) } @@ -1478,15 +1553,15 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | Foo - |--- - | - | Foo - |----- - | - | Foo - | === - """ + | Foo + |--- + | + | Foo + |----- + | + | Foo + | === + """ .trimMargin(), ) @@ -1497,9 +1572,9 @@ class MarkdownProcessorDocumentParsingTest { *Foo
*/ parsed.assertEquals( - heading(level = 2, "Foo"), - heading(level = 2, "Foo"), - heading(level = 1, "Foo"), + heading(level = 2, Text("Foo")), + heading(level = 2, Text("Foo")), + heading(level = 1, Text("Foo")), ) } @@ -1508,12 +1583,12 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | Foo - | --- - | - | Foo - |--- - """ + | Foo + | --- + | + | Foo + |--- + """ .trimMargin(), ) @@ -1537,9 +1612,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - | ---- - """ + |Foo + | ---- + """ .trimMargin(), ) @@ -1547,7 +1622,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *Foo
*/ - parsed.assertEquals(heading(level = 2, "Foo")) + parsed.assertEquals(heading(level = 2, Text("Foo"))) } @Test @@ -1555,9 +1630,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - | --- - """ + |Foo + | --- + """ .trimMargin(), ) @@ -1566,7 +1641,7 @@ class MarkdownProcessorDocumentParsingTest { *Foo * ---
*/ - parsed.assertEquals(paragraph("Foo ---")) + parsed.assertEquals(Paragraph(Text("Foo"), SoftLineBreak, Text("---"))) } @Test @@ -1574,12 +1649,12 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - |= = - | - |Foo - |--- - - """ + |Foo + |= = + | + |Foo + |--- - + """ .trimMargin(), ) @@ -1591,7 +1666,7 @@ class MarkdownProcessorDocumentParsingTest { **/ parsed.assertEquals( - paragraph("Foo = ="), + Paragraph(Text("Foo"), SoftLineBreak, Text("= =")), paragraph("Foo"), thematicBreak(), ) @@ -1602,9 +1677,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - |----- - """ + |Foo + |----- + """ .trimMargin(), ) @@ -1612,7 +1687,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *
Foo
*/ - parsed.assertEquals(heading(level = 2, "Foo")) + parsed.assertEquals(heading(level = 2, Text("Foo"))) } @Test @@ -1620,9 +1695,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo\ - |---- - """ + |Foo\ + |---- + """ .trimMargin(), ) @@ -1630,7 +1705,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *Foo\
*/ - parsed.assertEquals(heading(level = 2, "Foo\\")) + parsed.assertEquals(heading(level = 2, Text("Foo\\"))) } @Test @@ -1638,14 +1713,14 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |`Foo - |---- - |` - | - | - """ + |`Foo + |---- + |` + | + | + """ .trimMargin(), ) @@ -1657,10 +1732,10 @@ class MarkdownProcessorDocumentParsingTest { *of dashes"/>
*/ parsed.assertEquals( - heading(level = 2, "\\`Foo"), - paragraph("\\`"), - heading(level = 2, "\\"), + heading(level = 2, Text("`Foo")), + paragraph("`"), + heading(level = 2, Text(""), ) } @@ -1669,9 +1744,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |> Foo - |--- - """ + |> Foo + |--- + """ .trimMargin(), ) @@ -1693,10 +1768,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |> foo - |bar - |=== - """ + |> foo + |bar + |=== + """ .trimMargin(), ) @@ -1708,7 +1783,17 @@ class MarkdownProcessorDocumentParsingTest { * === * */ - parsed.assertEquals(blockQuote(paragraph("foo bar ==="))) + parsed.assertEquals( + blockQuote( + Paragraph( + Text("foo"), + SoftLineBreak, + Text("bar"), + SoftLineBreak, + Text("==="), + ), + ), + ) } @Test @@ -1716,9 +1801,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |- Foo - |--- - """ + |- Foo + |--- + """ .trimMargin(), ) @@ -1740,10 +1825,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - |Bar - |--- - """ + |Foo + |Bar + |--- + """ .trimMargin(), ) @@ -1752,7 +1837,7 @@ class MarkdownProcessorDocumentParsingTest { *Foo * Bar
*/ - parsed.assertEquals(heading(level = 2, "Foo Bar")) + parsed.assertEquals(heading(level = 2, Text("Foo"), SoftLineBreak, Text("Bar"))) } @Test @@ -1760,13 +1845,13 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |--- - |Foo - |--- - |Bar - |--- - |Baz - """ + |--- + |Foo + |--- + |Bar + |--- + |Baz + """ .trimMargin(), ) @@ -1779,8 +1864,8 @@ class MarkdownProcessorDocumentParsingTest { */ parsed.assertEquals( thematicBreak(), - heading(level = 2, "Foo"), - heading(level = 2, "Bar"), + heading(level = 2, Text("Foo")), + heading(level = 2, Text("Bar")), paragraph("Baz"), ) } @@ -1790,9 +1875,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | - |==== - """ + | + |==== + """ .trimMargin(), ) @@ -1808,9 +1893,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |--- - |--- - """ + |--- + |--- + """ .trimMargin(), ) @@ -1830,9 +1915,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |- foo - |----- - """ + |- foo + |----- + """ .trimMargin(), ) @@ -1854,9 +1939,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | foo - |--- - """ + | foo + |--- + """ .trimMargin(), ) @@ -1877,9 +1962,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |> foo - |----- - """ + |> foo + |----- + """ .trimMargin(), ) @@ -1901,9 +1986,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |\> foo - |------ - """ + |\> foo + |------ + """ .trimMargin(), ) @@ -1911,7 +1996,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *> foo
*/ - parsed.assertEquals(heading(level = 2, "\\> foo")) + parsed.assertEquals(heading(level = 2, Text("> foo"))) } @Test @@ -1919,12 +2004,12 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - | - |bar - |--- - |baz - """ + |Foo + | + |bar + |--- + |baz + """ .trimMargin(), ) @@ -1936,7 +2021,7 @@ class MarkdownProcessorDocumentParsingTest { */ parsed.assertEquals( paragraph("Foo"), - heading(level = 2, "bar"), + heading(level = 2, Text("bar")), paragraph("baz"), ) } @@ -1946,13 +2031,13 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - |bar - | - |--- - | - |baz - """ + |Foo + |bar + | + |--- + | + |baz + """ .trimMargin(), ) @@ -1964,7 +2049,7 @@ class MarkdownProcessorDocumentParsingTest { *baz
*/ parsed.assertEquals( - paragraph("Foo bar"), + Paragraph(Text("Foo"), SoftLineBreak, Text("bar")), thematicBreak(), paragraph("baz"), ) @@ -1975,11 +2060,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - |bar - |* * * - |baz - """ + |Foo + |bar + |* * * + |baz + """ .trimMargin(), ) @@ -1991,7 +2076,7 @@ class MarkdownProcessorDocumentParsingTest { *baz
*/ parsed.assertEquals( - paragraph("Foo bar"), + Paragraph(Text("Foo"), SoftLineBreak, Text("bar")), thematicBreak(), paragraph("baz"), ) @@ -2002,11 +2087,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - |bar - |\--- - |baz - """ + |Foo + |bar + |\--- + |baz + """ .trimMargin(), ) @@ -2017,7 +2102,17 @@ class MarkdownProcessorDocumentParsingTest { * --- * baz */ - parsed.assertEquals(paragraph("Foo bar --- baz")) + parsed.assertEquals( + Paragraph( + Text("Foo"), + SoftLineBreak, + Text("bar"), + SoftLineBreak, + Text("---"), + SoftLineBreak, + Text("baz"), + ), + ) } @Test @@ -2025,9 +2120,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | a simple - | indented code block - """ + | a simple + | indented code block + """ .trimMargin(), ) @@ -2045,10 +2140,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | - foo - | - | bar - """ + | - foo + | + | bar + """ .trimMargin(), ) @@ -2074,10 +2169,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |1. foo - | - | - bar - """ + |1. foo + | + | - bar + """ .trimMargin(), ) @@ -2108,11 +2203,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | - | *hi* - | - | - one - """ + | + | *hi* + | + | - one + """ .trimMargin(), ) @@ -2132,14 +2227,14 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | chunk1 - | - | chunk2 - | - | - | - | chunk3 - """ + | chunk1 + | + | chunk2 + | + | + | + | chunk3 + """ .trimMargin(), ) @@ -2176,9 +2271,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - | bar - """ + |Foo + | bar + """ .trimMargin(), ) @@ -2187,7 +2282,7 @@ class MarkdownProcessorDocumentParsingTest { *Foo * bar
*/ - parsed.assertEquals(paragraph("Foo bar")) + parsed.assertEquals(Paragraph(Text("Foo"), SoftLineBreak, Text("bar"))) } @Test @@ -2195,9 +2290,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | foo - |bar - """ + | foo + |bar + """ .trimMargin(), ) @@ -2218,13 +2313,13 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |# Heading - | foo - |Heading - |------ - | foo - |---- - """ + |# Heading + | foo + |Heading + |------ + | foo + |---- + """ .trimMargin(), ) @@ -2239,9 +2334,9 @@ class MarkdownProcessorDocumentParsingTest { **/ parsed.assertEquals( - heading(level = 1, "Heading"), + heading(level = 1, Text("Heading")), indentedCodeBlock("foo"), - heading(level = 2, "Heading"), + heading(level = 2, Text("Heading")), indentedCodeBlock("foo"), thematicBreak(), ) @@ -2252,9 +2347,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | foo - | bar - """ + | foo + | bar + """ .trimMargin(), ) @@ -2272,11 +2367,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | - | - | foo - | - """ + | + | + | foo + | + """ .trimMargin(), ) @@ -2305,11 +2400,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |``` - |< - | > - |``` - """ + |``` + |< + | > + |``` + """ .trimMargin(), ) @@ -2327,11 +2422,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |~~~ - |< - | > - |~~~ - """ + |~~~ + |< + | > + |~~~ + """ .trimMargin(), ) @@ -2349,10 +2444,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |`` - |foo - |`` - """ + |`` + |foo + |`` + """ .trimMargin(), ) @@ -2360,7 +2455,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *
foo
* aaa
baz
*/ parsed.assertEquals( - heading(level = 2, "foo"), + heading(level = 2, Text("foo")), fencedCodeBlock("bar"), - heading(level = 1, "baz"), + heading(level = 1, Text("baz")), ) } @@ -2807,12 +2902,12 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |```ruby - |def foo(x) - | return 3 - |end - |``` - """ + |```ruby + |def foo(x) + | return 3 + |end + |``` + """ .trimMargin(), ) @@ -2836,12 +2931,12 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |~~~~ ruby startline=3 $%@#$ - |def foo(x) - | return 3 - |end - |~~~~~~~ - """ + |~~~~ ruby startline=3 $%@#$ + |def foo(x) + | return 3 + |end + |~~~~~~~ + """ .trimMargin(), ) @@ -2865,9 +2960,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |````; - |```` - """ + |````; + |```` + """ .trimMargin(), ) @@ -2888,9 +2983,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |``` aa ``` - |foo - """ + |``` aa ``` + |foo + """ .trimMargin(), ) @@ -2899,7 +2994,7 @@ class MarkdownProcessorDocumentParsingTest { *aa
* foo
- |- |**Hello**, - | - |_world_. - |- | |
+ |+ |**Hello**, + | + |_world_. + |+ | |
\n\n**Hello**,"),
- paragraph("_world_. "),
+ Paragraph(
+ Emphasis("_", Text("world")),
+ Text("."),
+ SoftLineBreak,
+ HtmlInline(""),
+ ),
htmlBlock(" |
| - | hi - | | - |
| + | hi + | | + |
| - | hi - | | - |
| + | hi + | | + |
- | *hello*
- |
- """
+ |
- |*foo*
- """
+ |
+ |*foo*
+ """
.trimMargin(),
)
@@ -3070,12 +3170,12 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |
- |*Markdown*
- |
- |
- """
+ |
+ |
+ |*Markdown*
+ |
+ |
+ """
.trimMargin(),
)
@@ -3087,7 +3187,7 @@ class MarkdownProcessorDocumentParsingTest {
*/
parsed.assertEquals(
htmlBlock(""),
- paragraph("*Markdown*"),
+ Paragraph(Emphasis("*", Text("Markdown"))),
htmlBlock("
"),
)
}
@@ -3097,10 +3197,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- """
+ |
+ """
.trimMargin(),
)
@@ -3113,10 +3213,10 @@ class MarkdownProcessorDocumentParsingTest {
parsed.assertEquals(
htmlBlock(
"""
- |
- """
+ |
+ """
.trimMargin(),
),
)
@@ -3127,10 +3227,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- """
+ |
+ """
.trimMargin(),
)
@@ -3143,10 +3243,10 @@ class MarkdownProcessorDocumentParsingTest {
parsed.assertEquals(
htmlBlock(
"""
- |
- """
+ |
+ """
.trimMargin(),
),
)
@@ -3157,11 +3257,11 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |*foo*
- |
- |*bar*
- """
+ |
+ |*foo*
+ |
+ |*bar*
+ """
.trimMargin(),
)
@@ -3173,7 +3273,7 @@ class MarkdownProcessorDocumentParsingTest {
*/
parsed.assertEquals(
htmlBlock("
\n*foo*"),
- paragraph("*bar*"),
+ Paragraph(Emphasis("*", Text("bar"))),
)
}
@@ -3182,9 +3282,9 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |foo
- |
+ """
.trimMargin(),
)
@@ -3266,10 +3366,10 @@ class MarkdownProcessorDocumentParsingTest {
parsed.assertEquals(
htmlBlock(
"""
- |
- """
+ |
+ """
.trimMargin(),
),
)
@@ -3280,11 +3380,11 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |``` c
- |int x = 33;
- |```
- """
+ |
+ |``` c
+ |int x = 33;
+ |```
+ """
.trimMargin(),
)
@@ -3298,11 +3398,11 @@ class MarkdownProcessorDocumentParsingTest {
parsed.assertEquals(
htmlBlock(
"""
- |
- |``` c
- |int x = 33;
- |```
- """
+ |
+ |``` c
+ |int x = 33;
+ |```
+ """
.trimMargin(),
),
)
@@ -3313,10 +3413,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |*bar*
- |
- """
+ |
+ |*bar*
+ |
+ """
.trimMargin(),
)
@@ -3329,10 +3429,10 @@ class MarkdownProcessorDocumentParsingTest {
parsed.assertEquals(
htmlBlock(
"""
- |
- |*bar*
- |
- """
+ |
+ |*bar*
+ |
+ """
.trimMargin(),
),
)
@@ -3343,10 +3443,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |*bar*
- |
- """
+ |
+ |*bar*
+ |
+ """
.trimMargin(),
)
@@ -3359,10 +3459,10 @@ class MarkdownProcessorDocumentParsingTest {
parsed.assertEquals(
htmlBlock(
"""
- |
- |*bar*
- |
- """
+ |
+ |*bar*
+ |
+ """
.trimMargin(),
),
)
@@ -3373,10 +3473,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |*bar*
- |
- """
+ |
+ |*bar*
+ |
+ """
.trimMargin(),
)
@@ -3389,10 +3489,10 @@ class MarkdownProcessorDocumentParsingTest {
parsed.assertEquals(
htmlBlock(
"""
- |
- |*bar*
- |
- """
+ |
+ |*bar*
+ |
+ """
.trimMargin(),
),
)
@@ -3403,9 +3503,9 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |*bar*
- """
+ |
+ |*bar*
+ """
.trimMargin(),
)
@@ -3417,9 +3517,9 @@ class MarkdownProcessorDocumentParsingTest {
parsed.assertEquals(
htmlBlock(
"""
- |
- |*bar*
- """
+ |
+ |*bar*
+ """
.trimMargin(),
),
)
@@ -3430,10 +3530,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |*foo*
- |
- """
+ |
+ |*foo*
+ |
+ """
.trimMargin(),
)
@@ -3446,10 +3546,10 @@ class MarkdownProcessorDocumentParsingTest {
parsed.assertEquals(
htmlBlock(
"""
- |
- |*foo*
- |
- """
+ |
+ |*foo*
+ |
+ """
.trimMargin(),
),
)
@@ -3460,12 +3560,12 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |
- |*foo*
- |
- |
- """
+ |
+ |
+ |*foo*
+ |
+ |
+ """
.trimMargin(),
)
@@ -3477,7 +3577,7 @@ class MarkdownProcessorDocumentParsingTest {
*/
parsed.assertEquals(
htmlBlock(""),
- paragraph("*foo*"),
+ Paragraph(Emphasis("*", Text("foo"))),
htmlBlock(""),
)
}
@@ -3490,7 +3590,13 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
* *foo*"))
+ parsed.assertEquals(
+ Paragraph(
+ HtmlInline(""),
+ Emphasis("*", Text("foo")),
+ HtmlInline(""),
+ ),
+ )
}
@Test
@@ -3498,14 +3604,14 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
| + |foo + | |
| - |foo - | |
| + |foo + | |
foo
- |import Text.HTML.TagSoup
- |
- |main :: IO ()
- |main = print $ parseTags tags
- |
+ |import Text.HTML.TagSoup
+ |
+ |main :: IO ()
+ |main = print $ parseTags tags
+ |
- |import Text.HTML.TagSoup
- |
- |main :: IO ()
- |main = print $ parseTags tags
- |
+ |import Text.HTML.TagSoup
+ |
+ |main :: IO ()
+ |main = print $ parseTags tags
+ |
- |
- |
- """
+ |
+ |
+ |
+ """
.trimMargin(),
)
@@ -4019,11 +4125,11 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |Foo
- |
- |
- |
- """
+ |
+ |
+ |
+ """
.trimMargin(),
)
@@ -4202,18 +4316,18 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |
- |
- """
+ |
+ |
+ |
+ """
.trimMargin(),
)
@@ -4242,10 +4356,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[foo]: /url "title"
- |
- |[foo]
- """
+ |[foo]: /url "title"
+ |
+ |[foo]
+ """
.trimMargin(),
)
@@ -4253,7 +4367,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[foo](/url \"title\")"))
+ parsed.assertEquals(Paragraph(Link(destination = "/url", title = "title", Text("foo"))))
}
@Test
@@ -4261,12 +4375,12 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- | [foo]:
- | /url
- | 'the title'
- |
- |[foo]
- """
+ | [foo]:
+ | /url
+ | 'the title'
+ |
+ |[foo]
+ """
.trimMargin(),
)
@@ -4274,7 +4388,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[foo](/url \"the title\")"))
+ parsed.assertEquals(Paragraph(Link(destination = "/url", title = "the title", Text("foo"))))
}
@Test
@@ -4282,10 +4396,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[Foo*bar\]]:my_(url) 'title (with parens)'
- |
- |[Foo*bar\]]
- """
+ |[Foo*bar\]]:my_(url) 'title (with parens)'
+ |
+ |[Foo*bar\]]
+ """
.trimMargin(),
)
@@ -4293,7 +4407,9 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[Foo\\*bar\\]](my_\\(url\\) \"title (with parens)\")"))
+ parsed.assertEquals(
+ Paragraph(Link(destination = "my_(url)", title = "title (with parens)", Text("Foo*bar]"))),
+ )
}
@Test
@@ -4301,12 +4417,12 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[Foo bar]:
- |
- |'title'
- |
- |[Foo bar]
- """
+ |[Foo bar]:
+ |
+ |'title'
+ |
+ |[Foo bar]
+ """
.trimMargin(),
)
@@ -4314,7 +4430,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[Foo bar]( \"title\")"))
+ parsed.assertEquals(Paragraph(Link(destination = "my url", title = "title", Text("Foo bar"))))
}
@Test
@@ -4322,14 +4438,14 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[foo]: /url '
- |title
- |line1
- |line2
- |'
- |
- |[foo]
- """
+ |[foo]: /url '
+ |title
+ |line1
+ |line2
+ |'
+ |
+ |[foo]
+ """
.trimMargin(),
)
@@ -4341,7 +4457,7 @@ class MarkdownProcessorDocumentParsingTest {
* line2
* ">foo
*/
- parsed.assertEquals(paragraph("[foo](/url \" title\nline1\nline2 \")"))
+ parsed.assertEquals(Paragraph(Link(destination = "/url", title = "\ntitle\nline1\nline2\n", Text("foo"))))
}
@Test
@@ -4349,12 +4465,12 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[foo]: /url 'title
- |
- |with blank line'
- |
- |[foo]
- """
+ |[foo]: /url 'title
+ |
+ |with blank line'
+ |
+ |[foo]
+ """
.trimMargin(),
)
@@ -4365,9 +4481,9 @@ class MarkdownProcessorDocumentParsingTest {
* (baz)
- |
- |[foo]
- """
+ |[foo]: (baz)
+ |
+ |[foo]
+ """
.trimMargin(),
)
@@ -4451,8 +4567,8 @@ class MarkdownProcessorDocumentParsingTest {
* \\(baz\\)"),
- paragraph("\\[foo\\]"),
+ Paragraph(Text("[foo]: "), HtmlInline(""), Text("(baz)")),
+ paragraph("[foo]"),
)
}
@@ -4461,10 +4577,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[foo]: /url\bar\*baz "foo\"bar\baz"
- |
- |[foo]
- """
+ |[foo]: /url\bar\*baz "foo\"bar\baz"
+ |
+ |[foo]
+ """
.trimMargin(),
)
@@ -4472,7 +4588,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[foo](/url\\bar*baz \"foo\\\"bar\\baz\")"))
+ parsed.assertEquals(Paragraph(Link(destination = "/url\\bar*baz", title = "foo\"bar\\baz", Text("foo"))))
}
@Test
@@ -4480,10 +4596,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[foo]
- |
- |[foo]: url
- """
+ |[foo]
+ |
+ |[foo]: url
+ """
.trimMargin(),
)
@@ -4491,7 +4607,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[foo](url)"))
+ parsed.assertEquals(Paragraph(Link(destination = "url", title = null, Text("foo"))))
}
@Test
@@ -4499,11 +4615,11 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[foo]
- |
- |[foo]: first
- |[foo]: second
- """
+ |[foo]
+ |
+ |[foo]: first
+ |[foo]: second
+ """
.trimMargin(),
)
@@ -4511,7 +4627,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[foo](first)"))
+ parsed.assertEquals(Paragraph(Link(destination = "first", title = null, Text("foo"))))
}
@Test
@@ -4519,10 +4635,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[FOO]: /url
- |
- |[Foo]
- """
+ |[FOO]: /url
+ |
+ |[Foo]
+ """
.trimMargin(),
)
@@ -4530,7 +4646,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[Foo](/url)"))
+ parsed.assertEquals(Paragraph(Link(destination = "/url", title = null, Text("Foo"))))
}
@Test
@@ -4538,10 +4654,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[ΑΓΩ]: /φου
- |
- |[αγω]
- """
+ |[ΑΓΩ]: /φου
+ |
+ |[αγω]
+ """
.trimMargin(),
)
@@ -4549,7 +4665,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[αγω](/φου)"))
+ parsed.assertEquals(Paragraph(Link(destination = "/φου", title = null, Text("αγω"))))
}
@Test
@@ -4568,11 +4684,11 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[
- |foo
- |]: /url
- |bar
- """
+ |[
+ |foo
+ |]: /url
+ |bar
+ """
.trimMargin(),
)
@@ -4591,7 +4707,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
* \\`"))
+ parsed.assertEquals(Paragraph(Code("`")))
}
@Test
@@ -8271,7 +8443,12 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[https://foo.bar.\\`baz](https://foo.bar.`baz)\\`"))
+ parsed.assertEquals(
+ Paragraph(
+ Link(destination = "https://foo.bar.`baz", title = null, Text("https://foo.bar.`baz")),
+ Text("`"),
+ ),
+ )
}
@Test
@@ -8282,7 +8459,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
* ![](\"foo\" "\\"*\\"/")
"))
+ parsed.assertEquals(
+ Paragraph(
+ Text("*"),
+ HtmlInline(""),
+ ),
+ )
}
@Test
@@ -9819,7 +10574,12 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("\\*\\*"))
+ parsed.assertEquals(
+ Paragraph(
+ Text("**"),
+ HtmlInline(""),
+ ),
+ )
}
@Test
@@ -9830,7 +10590,12 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("\\_\\_"))
+ parsed.assertEquals(
+ Paragraph(
+ Text("__"),
+ HtmlInline(""),
+ ),
+ )
}
@Test
@@ -9841,7 +10606,15 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
* )"))
+ parsed.assertEquals(Paragraph(Link(destination = "/my uri", title = null, Text("link"))))
}
@Test
@@ -9970,9 +10761,9 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[link](foo
- |bar)
- """
+ |[link](foo
+ |bar)
+ """
.trimMargin(),
)
@@ -9981,7 +10772,7 @@ class MarkdownProcessorDocumentParsingTest {
* )
- """
+ |[link]()
+ """
.trimMargin(),
)
@@ -10000,7 +10791,7 @@ class MarkdownProcessorDocumentParsingTest {
* \\)"))
+ parsed.assertEquals(Paragraph(Text("[link]("), HtmlInline(""), Text(")")))
}
@Test
@@ -10011,7 +10802,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[a](b\\)c)"))
+ parsed.assertEquals(Paragraph(Link(destination = "b)c", title = null, Text("a"))))
}
@Test
@@ -10022,7 +10813,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
* \\)"))
+ parsed.assertEquals(paragraph("[link]()"))
}
@Test
@@ -10030,10 +10821,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[a](
- |[a](c)
- """
+ |[a](
+ |[a](c)
+ """
.trimMargin(),
)
@@ -10044,8 +10835,14 @@ class MarkdownProcessorDocumentParsingTest {
* [a](c)
*/
parsed.assertEquals(
- paragraph(
- "\\[a\\]\\(\\ \\[a\\]\\(c\\)",
+ Paragraph(
+ Text(content = "[a](link
*/
- parsed.assertEquals(paragraph("[link](\\(foo\\))"))
+ parsed.assertEquals(Paragraph(Link(destination = "(foo)", title = null, Text("link"))))
}
@Test
@@ -10069,7 +10866,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[link](foo\\(and\\(bar\\)\\))"))
+ parsed.assertEquals(Paragraph(Link(destination = "foo(and(bar))", title = null, Text("link"))))
}
@Test
@@ -10080,7 +10877,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
* "))
+ parsed.assertEquals(Paragraph(Text("[foo "), HtmlInline("")))
}
@Test
@@ -10424,7 +11295,12 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
- |
- |[ref]: /uri
- """
+ |[foo
+ |
+ |[ref]: /uri
+ """
.trimMargin(),
)
@@ -10629,7 +11561,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
* "))
+ parsed.assertEquals(Paragraph(Text(content = "[foo "), HtmlInline("")))
}
@Test
@@ -10637,10 +11569,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |[foo`][ref]`
- |
- |[ref]: /uri
- """
+ |[foo`][ref]`
+ |
+ |[ref]: /uri
+ """
.trimMargin(),
)
@@ -10648,7 +11580,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
- |
- |[ref]: /uri
- """
+ |[foo
+ |
+ |[ref]: /uri
+ """
.trimMargin(),
)
@@ -10668,8 +11600,13 @@ class MarkdownProcessorDocumentParsingTest {
* "))
+ parsed.assertEquals(paragraph(""))
}
- @Ignore
@Test
fun `should parse spec sample 603 correctly {Autolinks}`() {
val parsed = processor.processMarkdownDocument("")
@@ -11815,7 +12988,15 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[https://example.com/\\[\\\\](https://example.com/\\[\\)"))
+ parsed.assertEquals(
+ Paragraph(
+ Link(
+ destination = "https://example.com/\\[\\",
+ title = null,
+ Text("https://example.com/\\[\\"),
+ ),
+ ),
+ )
}
@Test
@@ -11826,7 +13007,15 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("[foo@bar.example.com](mailto:foo@bar.example.com)"))
+ parsed.assertEquals(
+ Paragraph(
+ Link(
+ destination = "mailto:foo@bar.example.com",
+ title = null,
+ Text("foo@bar.example.com"),
+ ),
+ ),
+ )
}
@Test
@@ -11838,8 +13027,12 @@ class MarkdownProcessorDocumentParsingTest {
*
*/
parsed.assertEquals(
- paragraph(
- "[foo+special@Bar.baz-bar0.com](mailto:foo+special@Bar.baz-bar0.com)",
+ Paragraph(
+ Link(
+ destination = "mailto:foo+special@Bar.baz-bar0.com",
+ title = null,
+ Text("foo+special@Bar.baz-bar0.com"),
+ ),
),
)
}
@@ -11852,7 +13045,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
* "))
+ parsed.assertEquals(paragraph(""))
}
@Test
@@ -11863,7 +13056,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
* "))
+ parsed.assertEquals(paragraph(""))
}
@Test
@@ -11896,7 +13089,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
* "))
+ parsed.assertEquals(paragraph(""))
}
@Test
@@ -11929,7 +13122,13 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph(""))
+ parsed.assertEquals(
+ Paragraph(
+ HtmlInline(""),
+ HtmlInline(""),
+ HtmlInline(""),
+ ),
+ )
}
@Test
@@ -11940,7 +13139,12 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
*/
- parsed.assertEquals(paragraph("
- """
+ |
+ """
.trimMargin(),
)
@@ -11959,7 +13163,12 @@ class MarkdownProcessorDocumentParsingTest {
*
*/
- parsed.assertEquals(paragraph(""))
+ parsed.assertEquals(
+ Paragraph(
+ HtmlInline(""),
+ HtmlInline(""),
+ ),
+ )
}
@Test
@@ -11967,9 +13176,9 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- """
+ |
+ """
.trimMargin(),
)
@@ -11979,8 +13188,8 @@ class MarkdownProcessorDocumentParsingTest {
* _boolean zoop:33=zoop:33 />
*/
parsed.assertEquals(
- paragraph(
- "",
+ Paragraph(
+ HtmlInline(""),
),
)
}
@@ -11993,7 +13202,12 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
*
- |
+ | \\",
+ Paragraph(
+ Text("< a><"),
+ SoftLineBreak,
+ Text("foo>"),
+ SoftLineBreak,
+ Text("
*/
- parsed.assertEquals(paragraph(" "))
+ parsed.assertEquals(
+ Paragraph(
+ HtmlInline(""),
+ HtmlInline(" "),
+ ),
+ )
}
@Test
@@ -12086,7 +13311,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
* .assertEquals(vararg expected: MarkdownBlock) {
val differences = findDifferences(expected.toList(), indentSize = 0)
- Assert.assertTrue(
+ assertTrue(
"The following differences were found:\n\n" +
"${differences.joinToString("\n").replace('\t', '→')}\n\n",
differences.isEmpty(),
@@ -85,28 +76,16 @@ private fun MarkdownBlock.findDifferenceWith(
}
}
-private var htmlRenderer = HtmlRenderer.builder().build()
-
-fun BlockWithInlineMarkdown.toHtml() =
- buildString {
- for (node in this@toHtml.inlineContent) {
- // new lines are rendered as spaces in tests
- append(htmlRenderer.render(node.nativeNode).replace("\n", " "))
- }
- }
-
private fun diffParagraph(
actual: Paragraph,
expected: MarkdownBlock,
indent: String,
) = buildList {
- val actualInlineHtml = actual.toHtml()
- val expectedInlineHtml = (expected as Paragraph).toHtml()
- if (actualInlineHtml != expectedInlineHtml) {
+ if (actual != expected) {
add(
"$indent * Paragraph raw content mismatch.\n\n" +
- "$indent Actual: $actualInlineHtml\n" +
- "$indent Expected: $expectedInlineHtml\n",
+ "$indent Actual: $actual\n" +
+ "$indent Expected: $expected\n",
)
}
}
@@ -166,13 +145,11 @@ private fun diffHeading(
expected: MarkdownBlock,
indent: String,
) = buildList {
- val actualInlineHtml = actual.toHtml()
- val expectedInlineHtml = (expected as Heading).toHtml()
- if (actualInlineHtml != expectedInlineHtml) {
+ if (actual != expected) {
add(
"$indent * Heading raw content mismatch.\n\n" +
- "$indent Actual: $actualInlineHtml\n" +
- "$indent Expected: $expectedInlineHtml",
+ "$indent Actual: $actual\n" +
+ "$indent Expected: $expected",
)
}
}
@@ -224,49 +201,12 @@ private fun diffList(
}
}
-private val parser = Parser.builder().build()
-
-private fun Node.children() =
- buildList {
- var child = firstChild
- while (child != null) {
- add(child)
- child = child.next
- }
- }
-
-/** skip root Document and Paragraph nodes */
-private fun inlineMarkdowns(content: String): List {
- val document = parser.parse(content).firstChild ?: return emptyList()
- return if (document.firstChild is org.commonmark.node.Paragraph) {
- document.firstChild
- } else {
- document
- }.children().map { x -> x.toInlineNode() }
-}
-
-private val inlineParser = InlineParserImpl(InlineParserContextImpl(emptyList(), LinkReferenceDefinitions()))
-
-fun paragraph(
- @Language("Markdown") content: String,
-): Paragraph =
- Paragraph(
- org.commonmark.node.Paragraph().let { block ->
- inlineParser.parse(SourceLines.of(content.lines().map { SourceLine.of(it, null) }), block)
- block
- },
- )
+fun paragraph(content: String) = Paragraph(InlineMarkdown.Text(content))
fun heading(
level: Int,
- @Language("Markdown") content: String,
-) = Heading(
- org.commonmark.node.Heading().let { block ->
- inlineParser.parse(SourceLines.of(SourceLine.of(content, null)), block)
- block.level = level
- block
- },
-)
+ vararg inlineContent: InlineMarkdown,
+) = Heading(inlineContent = inlineContent, level = level)
fun indentedCodeBlock(content: String) = IndentedCodeBlock(content)
@@ -290,7 +230,7 @@ fun orderedList(
delimiter: String = ".",
) = OrderedList(items.toList(), isTight, startFrom, delimiter)
-fun listItem(vararg items: MarkdownBlock) = ListItem(items.toList())
+fun listItem(vararg items: MarkdownBlock) = ListItem(*items)
fun htmlBlock(content: String) = HtmlBlock(content)
diff --git a/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/processing/MarkdownProcessorTest.kt b/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/processing/MarkdownProcessorOptimizeEditsTest.kt
similarity index 95%
rename from markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/processing/MarkdownProcessorTest.kt
rename to markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/processing/MarkdownProcessorOptimizeEditsTest.kt
index 3403b7a00..e57717cec 100644
--- a/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/processing/MarkdownProcessorTest.kt
+++ b/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/processing/MarkdownProcessorOptimizeEditsTest.kt
@@ -40,12 +40,12 @@ private val rawMarkdown =
@Suppress(
"LargeClass", // Detekt triggers on files > 600 lines
)
-class MarkdownProcessorTest {
+class MarkdownProcessorOptimizeEditsTest {
private val htmlRenderer = HtmlRenderer.builder().build()
@Test
fun `first blocks stay the same`() {
- val processor = MarkdownProcessor()
+ val processor = MarkdownProcessor(optimizeEdits = true)
val firstRun = processor.processWithQuickEdits(rawMarkdown)
val secondRun =
processor.processWithQuickEdits(
@@ -80,7 +80,7 @@ class MarkdownProcessorTest {
@Test
fun `first block edited`() {
- val processor = MarkdownProcessor()
+ val processor = MarkdownProcessor(optimizeEdits = true)
val firstRun = processor.processWithQuickEdits(rawMarkdown)
val secondRun =
processor.processWithQuickEdits(
@@ -136,7 +136,7 @@ class MarkdownProcessorTest {
@Test
fun `last block edited`() {
- val processor = MarkdownProcessor()
+ val processor = MarkdownProcessor(optimizeEdits = true)
val firstRun = processor.processWithQuickEdits(rawMarkdown)
val secondRun =
processor.processWithQuickEdits(
@@ -195,7 +195,7 @@ class MarkdownProcessorTest {
@Test
fun `middle block edited`() {
- val processor = MarkdownProcessor()
+ val processor = MarkdownProcessor(optimizeEdits = true)
val firstRun = processor.processWithQuickEdits(rawMarkdown)
val secondRun =
processor.processWithQuickEdits(
@@ -256,7 +256,7 @@ class MarkdownProcessorTest {
@Test
fun `blocks merged`() {
- val processor = MarkdownProcessor()
+ val processor = MarkdownProcessor(optimizeEdits = true)
val firstRun = processor.processWithQuickEdits(rawMarkdown)
val secondRun =
processor.processWithQuickEdits(
@@ -313,7 +313,7 @@ class MarkdownProcessorTest {
@Test
fun `blocks split`() {
- val processor = MarkdownProcessor()
+ val processor = MarkdownProcessor(optimizeEdits = true)
val firstRun = processor.processWithQuickEdits(rawMarkdown)
val secondRun =
processor.processWithQuickEdits(
@@ -371,7 +371,7 @@ class MarkdownProcessorTest {
@Test
fun `blocks deleted`() {
- val processor = MarkdownProcessor()
+ val processor = MarkdownProcessor(optimizeEdits = true)
val firstRun = processor.processWithQuickEdits(rawMarkdown)
val secondRun =
processor.processWithQuickEdits(
@@ -423,7 +423,7 @@ class MarkdownProcessorTest {
@Test
fun `blocks added`() {
- val processor = MarkdownProcessor()
+ val processor = MarkdownProcessor(optimizeEdits = true)
val firstRun = processor.processWithQuickEdits(rawMarkdown)
val secondDocument =
"""
@@ -491,7 +491,7 @@ class MarkdownProcessorTest {
@Test
fun `no changes`() {
- val processor = MarkdownProcessor()
+ val processor = MarkdownProcessor(optimizeEdits = true)
val firstRun = processor.processWithQuickEdits(rawMarkdown)
val secondRun = processor.processWithQuickEdits(rawMarkdown)
assertHtmlEquals(
@@ -523,7 +523,7 @@ class MarkdownProcessorTest {
@Test
fun `empty line added`() {
- val processor = MarkdownProcessor()
+ val processor = MarkdownProcessor(optimizeEdits = true)
val firstRun = processor.processWithQuickEdits(rawMarkdown)
val secondRun = processor.processWithQuickEdits("\n" + rawMarkdown)
assertHtmlEquals(
@@ -557,7 +557,7 @@ class MarkdownProcessorTest {
/** Regression https://github.com/JetBrains/jewel/issues/344 */
@Test
fun `content if empty`() {
- val processor = MarkdownProcessor()
+ val processor = MarkdownProcessor(optimizeEdits = true)
processor.processWithQuickEdits(rawMarkdown)
val secondRun = processor.processWithQuickEdits("")
assertHtmlEquals(
@@ -570,7 +570,7 @@ class MarkdownProcessorTest {
@Test
fun `chained changes`() {
- val processor = MarkdownProcessor()
+ val processor = MarkdownProcessor(optimizeEdits = true)
processor.processWithQuickEdits(
"""
# Header 0
diff --git a/markdown/extension/autolink/api/autolink.api b/markdown/extension/autolink/api/autolink.api
index 70461da1d..56b2b87c6 100644
--- a/markdown/extension/autolink/api/autolink.api
+++ b/markdown/extension/autolink/api/autolink.api
@@ -1,8 +1,9 @@
public final class org/jetbrains/jewel/markdown/extension/autolink/AutolinkProcessorExtension : org/jetbrains/jewel/markdown/extensions/MarkdownProcessorExtension {
public static final field $stable I
public static final field INSTANCE Lorg/jetbrains/jewel/markdown/extension/autolink/AutolinkProcessorExtension;
+ public fun getBlockProcessorExtension ()Lorg/jetbrains/jewel/markdown/extensions/MarkdownBlockProcessorExtension;
+ public fun getInlineProcessorExtension ()Lorg/jetbrains/jewel/markdown/extensions/MarkdownInlineProcessorExtension;
public fun getParserExtension ()Lorg/commonmark/parser/Parser$ParserExtension;
- public fun getProcessorExtension ()Lorg/jetbrains/jewel/markdown/extensions/MarkdownBlockProcessorExtension;
public fun getTextRendererExtension ()Lorg/commonmark/renderer/text/TextContentRenderer$TextContentRendererExtension;
}
diff --git a/markdown/extension/autolink/src/main/kotlin/org/jetbrains/jewel/markdown/extension/autolink/AutolinkProcessorExtension.kt b/markdown/extension/autolink/src/main/kotlin/org/jetbrains/jewel/markdown/extension/autolink/AutolinkProcessorExtension.kt
index ad8161dea..8e57aefa9 100644
--- a/markdown/extension/autolink/src/main/kotlin/org/jetbrains/jewel/markdown/extension/autolink/AutolinkProcessorExtension.kt
+++ b/markdown/extension/autolink/src/main/kotlin/org/jetbrains/jewel/markdown/extension/autolink/AutolinkProcessorExtension.kt
@@ -2,19 +2,9 @@ package org.jetbrains.jewel.markdown.extension.autolink
import org.commonmark.ext.autolink.AutolinkExtension
import org.commonmark.parser.Parser.ParserExtension
-import org.commonmark.renderer.text.TextContentRenderer
-import org.jetbrains.jewel.markdown.extensions.MarkdownBlockProcessorExtension
import org.jetbrains.jewel.markdown.extensions.MarkdownProcessorExtension
public object AutolinkProcessorExtension : MarkdownProcessorExtension {
- override val parserExtension: ParserExtension
- get() = AutolinkExtension.create() as ParserExtension
-
- /**
- * Rendering and processing is already handled by [org.jetbrains.jewel.markdown.rendering.DefaultInlineMarkdownRenderer]
- */
- override val textRendererExtension: TextContentRenderer.TextContentRendererExtension?
- get() = null
- override val processorExtension: MarkdownBlockProcessorExtension?
- get() = null
+ override val parserExtension: ParserExtension =
+ AutolinkExtension.create() as ParserExtension
}
diff --git a/markdown/extension/gfm-alerts/api/gfm-alerts.api b/markdown/extension/gfm-alerts/api/gfm-alerts.api
index 5b42b42b0..8f4c0600f 100644
--- a/markdown/extension/gfm-alerts/api/gfm-alerts.api
+++ b/markdown/extension/gfm-alerts/api/gfm-alerts.api
@@ -122,8 +122,9 @@ public final class org/jetbrains/jewel/markdown/extensions/github/alerts/GitHubA
public final class org/jetbrains/jewel/markdown/extensions/github/alerts/GitHubAlertProcessorExtension : org/jetbrains/jewel/markdown/extensions/MarkdownProcessorExtension {
public static final field $stable I
public static final field INSTANCE Lorg/jetbrains/jewel/markdown/extensions/github/alerts/GitHubAlertProcessorExtension;
+ public fun getBlockProcessorExtension ()Lorg/jetbrains/jewel/markdown/extensions/MarkdownBlockProcessorExtension;
+ public fun getInlineProcessorExtension ()Lorg/jetbrains/jewel/markdown/extensions/MarkdownInlineProcessorExtension;
public fun getParserExtension ()Lorg/commonmark/parser/Parser$ParserExtension;
- public fun getProcessorExtension ()Lorg/jetbrains/jewel/markdown/extensions/MarkdownBlockProcessorExtension;
public fun getTextRendererExtension ()Lorg/commonmark/renderer/text/TextContentRenderer$TextContentRendererExtension;
}
@@ -131,6 +132,7 @@ public final class org/jetbrains/jewel/markdown/extensions/github/alerts/GitHubA
public static final field $stable I
public fun (Lorg/jetbrains/jewel/markdown/extensions/github/alerts/AlertStyling;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling;)V
public fun getBlockRenderer ()Lorg/jetbrains/jewel/markdown/extensions/MarkdownBlockRendererExtension;
+ public fun getInlineRenderer ()Lorg/jetbrains/jewel/markdown/extensions/MarkdownInlineRendererExtension;
}
public final class org/jetbrains/jewel/markdown/extensions/github/alerts/ImportantAlertStyling : org/jetbrains/jewel/markdown/extensions/github/alerts/BaseAlertStyling {
diff --git a/markdown/extension/gfm-alerts/src/main/kotlin/org/jetbrains/jewel/markdown/extensions/github/alerts/GitHubAlertProcessorExtension.kt b/markdown/extension/gfm-alerts/src/main/kotlin/org/jetbrains/jewel/markdown/extensions/github/alerts/GitHubAlertProcessorExtension.kt
index c366b7a6e..97acfd6b5 100644
--- a/markdown/extension/gfm-alerts/src/main/kotlin/org/jetbrains/jewel/markdown/extensions/github/alerts/GitHubAlertProcessorExtension.kt
+++ b/markdown/extension/gfm-alerts/src/main/kotlin/org/jetbrains/jewel/markdown/extensions/github/alerts/GitHubAlertProcessorExtension.kt
@@ -33,7 +33,7 @@ public object GitHubAlertProcessorExtension : MarkdownProcessorExtension {
override val textRendererExtension: TextContentRendererExtension =
GitHubAlertCommonMarkExtension
- override val processorExtension: MarkdownBlockProcessorExtension = GitHubAlertProcessorExtension
+ override val blockProcessorExtension: MarkdownBlockProcessorExtension = GitHubAlertProcessorExtension
private object GitHubAlertProcessorExtension : MarkdownBlockProcessorExtension {
override fun canProcess(block: CustomBlock): Boolean = block is AlertBlock
diff --git a/markdown/extension/gfm-alerts/src/test/kotlin/org/jetbrains/jewel/markdown/extensions/github/alerts/GitHubAlertBlockExtensionTest.kt b/markdown/extension/gfm-alerts/src/test/kotlin/org/jetbrains/jewel/markdown/extensions/github/alerts/GitHubAlertBlockExtensionTest.kt
index 2f4f05fad..de4e03aa5 100644
--- a/markdown/extension/gfm-alerts/src/test/kotlin/org/jetbrains/jewel/markdown/extensions/github/alerts/GitHubAlertBlockExtensionTest.kt
+++ b/markdown/extension/gfm-alerts/src/test/kotlin/org/jetbrains/jewel/markdown/extensions/github/alerts/GitHubAlertBlockExtensionTest.kt
@@ -30,9 +30,9 @@ class GitHubAlertBlockExtensionTest {
fun `should parse note alert`() {
val rawMarkdown =
"""
- |> [!NOTE]
- |> Highlights information that users should take into account, even when skimming.
- """
+ |> [!NOTE]
+ |> Highlights information that users should take into account, even when skimming.
+ """
.trimMargin()
val parsed = parser.parse(rawMarkdown)
@@ -65,13 +65,14 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse tip alert`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [!TIP]
+ |> Optional information to help a user be more successful.
"""
- |> [!TIP]
- |> Optional information to help a user be more successful.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -101,13 +102,14 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse important alert`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [!IMPORTANT]
+ |> Crucial information necessary for users to succeed.
"""
- |> [!IMPORTANT]
- |> Crucial information necessary for users to succeed.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -137,13 +139,14 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse warning alert`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [!WARNING]
+ |> Critical content demanding immediate user attention due to potential risks.
"""
- |> [!WARNING]
- |> Critical content demanding immediate user attention due to potential risks.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -173,13 +176,14 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse caution alert`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [!CAUTION]
+ |> Negative potential consequences of an action.
"""
- |> [!CAUTION]
- |> Negative potential consequences of an action.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -209,13 +213,14 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse lowercase note alert`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [!note]
+ |> Highlights information that users should take into account, even when skimming.
"""
- |> [!note]
- |> Highlights information that users should take into account, even when skimming.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -245,13 +250,14 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse lowercase tip alert`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [!tip]
+ |> Optional information to help a user be more successful.
"""
- |> [!tip]
- |> Optional information to help a user be more successful.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -281,13 +287,14 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse lowercase important alert`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [!important]
+ |> Crucial information necessary for users to succeed.
"""
- |> [!important]
- |> Crucial information necessary for users to succeed.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -317,13 +324,14 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse lowercase warning alert`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [!warning]
+ |> Critical content demanding immediate user attention due to potential risks.
"""
- |> [!warning]
- |> Critical content demanding immediate user attention due to potential risks.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -353,13 +361,14 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse lowercase caution alert`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [!caution]
+ |> Negative potential consequences of an action.
"""
- |> [!caution]
- |> Negative potential consequences of an action.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -389,15 +398,16 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should trim trailing and leading empty lines`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [!CAUTION]
+ |>
+ |> Negative potential consequences of an action.
+ |>
"""
- |> [!CAUTION]
- |>
- |> Negative potential consequences of an action.
- |>
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -427,13 +437,14 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse malformed entry as blockquote - space after exclamation mark`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [! CAUTION]
+ |> Negative potential consequences of an action.
"""
- |> [! CAUTION]
- |> Negative potential consequences of an action.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -449,14 +460,15 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse malformed entry as blockquote - type not on first line`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |>
+ |> [! CAUTION]
+ |> Negative potential consequences of an action.
"""
- |>
- |> [! CAUTION]
- |> Negative potential consequences of an action.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -472,13 +484,14 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse malformed entry as blockquote - space before exclamation mark`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [ !CAUTION]
+ |> Negative potential consequences of an action.
"""
- |> [ !CAUTION]
- |> Negative potential consequences of an action.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -494,13 +507,14 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse malformed entry as blockquote - space after type`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [!CAUTION ]
+ |> Negative potential consequences of an action.
"""
- |> [!CAUTION ]
- |> Negative potential consequences of an action.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
@@ -516,12 +530,13 @@ class GitHubAlertBlockExtensionTest {
@Test
fun `should parse malformed entry as blockquote - missing newline`() {
- val rawMarkdown =
+ val parsed =
+ parser.parse(
+ """
+ |> [!CAUTION] Negative potential consequences of an action.
"""
- |> [!CAUTION] Negative potential consequences of an action.
- """
- .trimMargin()
- val parsed = parser.parse(rawMarkdown)
+ .trimMargin(),
+ )
assertTrue("Parse result is not a document", parsed is Document)
diff --git a/markdown/ide-laf-bridge-styling/api/ide-laf-bridge-styling.api b/markdown/ide-laf-bridge-styling/api/ide-laf-bridge-styling.api
index 8c60a2415..f3ab48643 100644
--- a/markdown/ide-laf-bridge-styling/api/ide-laf-bridge-styling.api
+++ b/markdown/ide-laf-bridge-styling/api/ide-laf-bridge-styling.api
@@ -8,12 +8,12 @@ public final class org/jetbrains/jewel/intui/markdown/bridge/BridgeProvideMarkdo
}
public final class org/jetbrains/jewel/intui/markdown/bridge/styling/BridgeMarkdownStylingKt {
- public static final fun create (Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling$Companion;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Z)Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;
+ public static final fun create (Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling$Companion;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Z)Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;
public static final fun create (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Indented;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Fenced;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code;
public static final fun create (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H1;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H2;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H3;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H4;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H5;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H6;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading;
public static final fun create (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Ordered;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Unordered;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List;
public static final fun create (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Paragraph$Companion;Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Paragraph;
- public static synthetic fun create$default (Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling$Companion;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;ZILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;
+ public static synthetic fun create$default (Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling$Companion;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;ZILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;
public static synthetic fun create$default (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Indented;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Fenced;ILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code;
public static synthetic fun create$default (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H1;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H2;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H3;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H4;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H5;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H6;ILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading;
public static synthetic fun create$default (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Ordered;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Unordered;ILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List;
diff --git a/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/BridgeMarkdownBlockRendererExtensions.kt b/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/BridgeMarkdownBlockRendererExtensions.kt
index ee0475428..bf3f8404d 100644
--- a/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/BridgeMarkdownBlockRendererExtensions.kt
+++ b/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/BridgeMarkdownBlockRendererExtensions.kt
@@ -2,6 +2,7 @@ package org.jetbrains.jewel.intui.markdown.bridge
import org.jetbrains.jewel.intui.markdown.bridge.styling.create
import org.jetbrains.jewel.markdown.extensions.MarkdownRendererExtension
+import org.jetbrains.jewel.markdown.rendering.DefaultInlineMarkdownRenderer
import org.jetbrains.jewel.markdown.rendering.DefaultMarkdownBlockRenderer
import org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer
import org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer
@@ -10,5 +11,5 @@ import org.jetbrains.jewel.markdown.rendering.MarkdownStyling
public fun MarkdownBlockRenderer.Companion.create(
styling: MarkdownStyling = MarkdownStyling.create(),
rendererExtensions: List = emptyList(),
- inlineRenderer: InlineMarkdownRenderer = InlineMarkdownRenderer.default(),
+ inlineRenderer: InlineMarkdownRenderer = DefaultInlineMarkdownRenderer(rendererExtensions),
): MarkdownBlockRenderer = DefaultMarkdownBlockRenderer(styling, rendererExtensions, inlineRenderer)
diff --git a/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/styling/BridgeMarkdownStyling.kt b/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/styling/BridgeMarkdownStyling.kt
index b4e6c87e4..b1b99cf9d 100644
--- a/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/styling/BridgeMarkdownStyling.kt
+++ b/markdown/ide-laf-bridge-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/bridge/styling/BridgeMarkdownStyling.kt
@@ -371,19 +371,37 @@ public fun InlinesStyling.Companion.create(
color = JBUI.CurrentTheme.Link.Foreground.ENABLED.toComposeColor(),
textDecoration = TextDecoration.Underline,
).toSpanStyle(),
+ linkDisabled: SpanStyle = link.copy(color = JBUI.CurrentTheme.Link.Foreground.DISABLED.toComposeColor()),
+ linkHovered: SpanStyle = link.copy(color = JBUI.CurrentTheme.Link.Foreground.HOVERED.toComposeColor()),
+ linkFocused: SpanStyle =
+ link.copy(
+ color = JBUI.CurrentTheme.Link.Foreground.ENABLED.toComposeColor(),
+ background = JBUI.CurrentTheme.ActionButton.hoverBackground().toComposeColor(),
+ ),
+ linkPressed: SpanStyle =
+ link.copy(
+ color = JBUI.CurrentTheme.Link.Foreground.PRESSED.toComposeColor(),
+ background = JBUI.CurrentTheme.ActionButton.pressedBackground().toComposeColor(),
+ ),
+ linkVisited: SpanStyle = link.copy(color = JBUI.CurrentTheme.Link.Foreground.VISITED.toComposeColor()),
emphasis: SpanStyle = textStyle.copy(fontStyle = FontStyle.Italic).toSpanStyle(),
strongEmphasis: SpanStyle = textStyle.copy(fontWeight = FontWeight.Bold).toSpanStyle(),
inlineHtml: SpanStyle = textStyle.toSpanStyle(),
- renderInlineHtml: Boolean = false,
+ renderInlineHtml: Boolean = true,
): InlinesStyling =
InlinesStyling(
- textStyle,
- inlineCode,
- link,
- emphasis,
- strongEmphasis,
- inlineHtml,
- renderInlineHtml,
+ textStyle = textStyle,
+ inlineCode = inlineCode,
+ link = link,
+ linkDisabled = linkDisabled,
+ linkHovered = linkHovered,
+ linkFocused = linkFocused,
+ linkPressed = linkPressed,
+ linkVisited = linkVisited,
+ emphasis = emphasis,
+ strongEmphasis = strongEmphasis,
+ inlineHtml = inlineHtml,
+ renderInlineHtml = renderInlineHtml,
)
private val defaultTextStyle
diff --git a/markdown/int-ui-standalone-styling/api/int-ui-standalone-styling.api b/markdown/int-ui-standalone-styling/api/int-ui-standalone-styling.api
index a9383401b..6fdf4dcc1 100644
--- a/markdown/int-ui-standalone-styling/api/int-ui-standalone-styling.api
+++ b/markdown/int-ui-standalone-styling/api/int-ui-standalone-styling.api
@@ -11,12 +11,12 @@ public final class org/jetbrains/jewel/intui/markdown/standalone/IntUiProvideMar
}
public final class org/jetbrains/jewel/intui/markdown/standalone/styling/IntUiMarkdownStylingKt {
- public static final fun dark (Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling$Companion;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Z)Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;
+ public static final fun dark (Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling$Companion;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Z)Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;
public static final fun dark (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Indented;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Fenced;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code;
public static final fun dark (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H1;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H2;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H3;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H4;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H5;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H6;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading;
public static final fun dark (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Ordered;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Unordered;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List;
public static final fun dark (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Paragraph$Companion;Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Paragraph;
- public static synthetic fun dark$default (Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling$Companion;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;ZILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;
+ public static synthetic fun dark$default (Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling$Companion;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;ZILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;
public static synthetic fun dark$default (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Indented;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Fenced;ILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code;
public static synthetic fun dark$default (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H1;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H2;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H3;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H4;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H5;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H6;ILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading;
public static synthetic fun dark$default (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Ordered;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Unordered;ILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List;
@@ -51,12 +51,12 @@ public final class org/jetbrains/jewel/intui/markdown/standalone/styling/IntUiMa
public static synthetic fun dark-pI2OzKA$default (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$BlockQuote$Companion;Landroidx/compose/foundation/layout/PaddingValues;FJLandroidx/compose/ui/graphics/PathEffect;IJILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$BlockQuote;
public static final fun default-1Fc8zlc (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Image$Companion;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/ui/graphics/Shape;JFJ)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Image;
public static synthetic fun default-1Fc8zlc$default (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Image$Companion;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/ui/graphics/Shape;JFJILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Image;
- public static final fun light (Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling$Companion;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Z)Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;
+ public static final fun light (Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling$Companion;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Z)Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;
public static final fun light (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Indented;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Fenced;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code;
public static final fun light (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H1;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H2;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H3;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H4;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H5;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H6;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading;
public static final fun light (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Ordered;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Unordered;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List;
public static final fun light (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Paragraph$Companion;Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Paragraph;
- public static synthetic fun light$default (Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling$Companion;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;ZILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;
+ public static synthetic fun light$default (Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling$Companion;Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;Landroidx/compose/ui/text/SpanStyle;ZILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/InlinesStyling;
public static synthetic fun light$default (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Indented;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code$Fenced;ILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Code;
public static synthetic fun light$default (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H1;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H2;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H3;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H4;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H5;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading$H6;ILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$Heading;
public static synthetic fun light$default (Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Companion;Landroidx/compose/ui/text/TextStyle;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Ordered;Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List$Unordered;ILjava/lang/Object;)Lorg/jetbrains/jewel/markdown/rendering/MarkdownStyling$List;
diff --git a/markdown/int-ui-standalone-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/standalone/IntUiMarkdownBlockRendererExtensions.kt b/markdown/int-ui-standalone-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/standalone/IntUiMarkdownBlockRendererExtensions.kt
index cf6ca9908..4c4484ed3 100644
--- a/markdown/int-ui-standalone-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/standalone/IntUiMarkdownBlockRendererExtensions.kt
+++ b/markdown/int-ui-standalone-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/standalone/IntUiMarkdownBlockRendererExtensions.kt
@@ -3,6 +3,7 @@ package org.jetbrains.jewel.intui.markdown.standalone
import org.jetbrains.jewel.intui.markdown.standalone.styling.dark
import org.jetbrains.jewel.intui.markdown.standalone.styling.light
import org.jetbrains.jewel.markdown.extensions.MarkdownRendererExtension
+import org.jetbrains.jewel.markdown.rendering.DefaultInlineMarkdownRenderer
import org.jetbrains.jewel.markdown.rendering.DefaultMarkdownBlockRenderer
import org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer
import org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer
@@ -11,11 +12,11 @@ import org.jetbrains.jewel.markdown.rendering.MarkdownStyling
public fun MarkdownBlockRenderer.Companion.light(
styling: MarkdownStyling = MarkdownStyling.light(),
rendererExtensions: List = emptyList(),
- inlineRenderer: InlineMarkdownRenderer = InlineMarkdownRenderer.default(),
+ inlineRenderer: InlineMarkdownRenderer = DefaultInlineMarkdownRenderer(rendererExtensions),
): MarkdownBlockRenderer = DefaultMarkdownBlockRenderer(styling, rendererExtensions, inlineRenderer)
public fun MarkdownBlockRenderer.Companion.dark(
styling: MarkdownStyling = MarkdownStyling.dark(),
rendererExtensions: List = emptyList(),
- inlineRenderer: InlineMarkdownRenderer = InlineMarkdownRenderer.default(),
+ inlineRenderer: InlineMarkdownRenderer = DefaultInlineMarkdownRenderer(rendererExtensions),
): MarkdownBlockRenderer = DefaultMarkdownBlockRenderer(styling, rendererExtensions, inlineRenderer)
diff --git a/markdown/int-ui-standalone-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/standalone/styling/IntUiMarkdownStyling.kt b/markdown/int-ui-standalone-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/standalone/styling/IntUiMarkdownStyling.kt
index c2f65096d..366ad61f5 100644
--- a/markdown/int-ui-standalone-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/standalone/styling/IntUiMarkdownStyling.kt
+++ b/markdown/int-ui-standalone-styling/src/main/kotlin/org/jetbrains/jewel/intui/markdown/standalone/styling/IntUiMarkdownStyling.kt
@@ -19,6 +19,8 @@ import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import org.jetbrains.jewel.foundation.theme.JewelTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
import org.jetbrains.jewel.intui.standalone.theme.createDefaultTextStyle
import org.jetbrains.jewel.intui.standalone.theme.createEditorTextStyle
import org.jetbrains.jewel.markdown.rendering.InlinesStyling
@@ -648,20 +650,33 @@ public fun InlinesStyling.Companion.light(
.copy(fontSize = textStyle.fontSize * .85, background = inlineCodeBackgroundColorLight)
.toSpanStyle(),
link: SpanStyle =
- textStyle.copy(color = Color(0xFF0969DA), textDecoration = TextDecoration.Underline).toSpanStyle(),
+ textStyle.copy(
+ color = IntUiLightTheme.colors.blue(2),
+ textDecoration = TextDecoration.Underline,
+ ).toSpanStyle(),
+ linkDisabled: SpanStyle = link.copy(color = IntUiLightTheme.colors.grey(8)),
+ linkHovered: SpanStyle = link,
+ linkFocused: SpanStyle = link.copy(background = Color(0x12000000)),
+ linkPressed: SpanStyle = link.copy(background = Color(0x1D000000)),
+ linkVisited: SpanStyle = link,
emphasis: SpanStyle = textStyle.copy(fontStyle = FontStyle.Italic).toSpanStyle(),
strongEmphasis: SpanStyle = textStyle.copy(fontWeight = FontWeight.Bold).toSpanStyle(),
inlineHtml: SpanStyle = textStyle.toSpanStyle(),
- renderInlineHtml: Boolean = false,
+ renderInlineHtml: Boolean = true,
): InlinesStyling =
InlinesStyling(
- textStyle,
- inlineCode,
- link,
- emphasis,
- strongEmphasis,
- inlineHtml,
- renderInlineHtml,
+ textStyle = textStyle,
+ inlineCode = inlineCode,
+ link = link,
+ linkDisabled = linkDisabled,
+ linkFocused = linkFocused,
+ linkHovered = linkHovered,
+ linkPressed = linkPressed,
+ linkVisited = linkVisited,
+ emphasis = emphasis,
+ strongEmphasis = strongEmphasis,
+ inlineHtml = inlineHtml,
+ renderInlineHtml = renderInlineHtml,
)
public fun InlinesStyling.Companion.dark(
@@ -671,22 +686,33 @@ public fun InlinesStyling.Companion.dark(
.copy(fontSize = textStyle.fontSize * .85, background = inlineCodeBackgroundColorDark)
.toSpanStyle(),
link: SpanStyle =
- textStyle
- .copy(color = Color(0xFF2F81F7), textDecoration = TextDecoration.Underline)
- .toSpanStyle(),
+ textStyle.copy(
+ color = IntUiDarkTheme.colors.blue(9),
+ textDecoration = TextDecoration.Underline,
+ ).toSpanStyle(),
+ linkDisabled: SpanStyle = link.copy(color = IntUiDarkTheme.colors.grey(8)),
+ linkHovered: SpanStyle = link,
+ linkFocused: SpanStyle = link.copy(background = Color(0x16FFFFFF)),
+ linkPressed: SpanStyle = link.copy(background = Color(0x26FFFFFF)),
+ linkVisited: SpanStyle = link,
emphasis: SpanStyle = textStyle.copy(fontStyle = FontStyle.Italic).toSpanStyle(),
strongEmphasis: SpanStyle = textStyle.copy(fontWeight = FontWeight.Bold).toSpanStyle(),
inlineHtml: SpanStyle = textStyle.toSpanStyle(),
- renderInlineHtml: Boolean = false,
+ renderInlineHtml: Boolean = true,
): InlinesStyling =
InlinesStyling(
- textStyle,
- inlineCode,
- link,
- emphasis,
- strongEmphasis,
- inlineHtml,
- renderInlineHtml,
+ textStyle = textStyle,
+ inlineCode = inlineCode,
+ link = link,
+ linkDisabled = linkDisabled,
+ linkFocused = linkFocused,
+ linkHovered = linkHovered,
+ linkPressed = linkPressed,
+ linkVisited = linkVisited,
+ emphasis = emphasis,
+ strongEmphasis = strongEmphasis,
+ inlineHtml = inlineHtml,
+ renderInlineHtml = renderInlineHtml,
)
private val blockBackgroundColorLight = Color(0xFFF6F8FA)
diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/MarkdownView.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/MarkdownView.kt
index fdd282da6..cd7a0b3cb 100644
--- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/MarkdownView.kt
+++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/MarkdownView.kt
@@ -24,11 +24,9 @@ import org.jetbrains.jewel.ui.component.Divider
fun MarkdownDemo() {
Row(Modifier.trackActivation().fillMaxSize().background(JewelTheme.globalColors.panelBackground)) {
var currentMarkdown by remember { mutableStateOf(JewelReadme) }
- var linksAreEnabled by remember { mutableStateOf(true) }
MarkdownEditor(
currentMarkdown = currentMarkdown,
onMarkdownChange = { currentMarkdown = it },
- onLinksEnabledChange = { linksAreEnabled = it },
modifier = Modifier.fillMaxHeight().weight(1f),
)
@@ -37,7 +35,6 @@ fun MarkdownDemo() {
MarkdownPreview(
modifier = Modifier.fillMaxHeight().weight(1f),
rawMarkdown = currentMarkdown,
- linksAreEnabled = linksAreEnabled,
)
}
}
diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/JewelReadme.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/JewelReadme.kt
index ca83ee13f..4dea206e9 100644
--- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/JewelReadme.kt
+++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/JewelReadme.kt
@@ -7,7 +7,7 @@ internal val JewelReadme =
"""
# Jewel: a Compose for Desktop theme
-
+
Jewel aims at recreating the IntelliJ Platform's _New UI_ Swing Look and Feel in Compose for Desktop, providing a
desktop-optimized theme and set of components.
@@ -120,7 +120,7 @@ include the `int-ui` module, which is always released from the main branch.
Releases of Jewel are always cut from a tag on the main branch; the HEAD of each `releases/xxx` branch is then tagged
as `[mainTag]-xxx`, and used to publish the artifacts for that major IJP version.
-> ![IMPORTANT]
+> [!IMPORTANT]
> We only support the latest build of IJP for each major IJP version. If the latest 233 version is 2023.3.3, for
> example, we will only guarantee that Jewel works on that. Versions 2023.3.0–2023.3.2 might or might not work.
@@ -130,7 +130,7 @@ The standalone theme can be used in any Compose for Desktop app. You use it as a
to your heart's content. By default, it matches the official Int UI specs.
For an example on how to set up a standalone app, you can refer to
-the [`standalone` sample](samples/standalone/build.gradle.kts).
+the [`standalone` sample](https://github.com/JetBrains/jewel/blob/main/samples/standalone/build.gradle.kts).
> [!WARNING]
> Note that Jewel **requires** the JetBrains Runtime to work correctly. Some features like font loading depend on it,
@@ -152,7 +152,7 @@ If you want more control over the theming, you can use other `IntUiTheme` overlo
The JetBrains Runtime allows windows to have a custom decoration instead of the regular title bar.
-
+
The standalone sample app shows how to easily get something that looks like a JetBrains IDE; if you want to go _very_
custom, you only need to depend on the `decorated-window` module, which contains all the required primitives, but not
@@ -214,7 +214,7 @@ and the branch on which the corresponding bridge code lives:
| 2023.1 or older | **Not supported** |
For an example on how to set up an IntelliJ Plugin, you can refer to
-the [`ide-plugin` sample](samples/ide-plugin/build.gradle.kts).
+the [`ide-plugin` sample](https://github.com/JetBrains/jewel/blob/main/samples/ide-plugin/build.gradle.kts).
#### Accessing icons
diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownEditor.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownEditor.kt
index 9e5b7059d..08b3cd56b 100644
--- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownEditor.kt
+++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownEditor.kt
@@ -24,7 +24,6 @@ import com.darkrockstudios.libraries.mpfilepicker.JvmFile
import org.jetbrains.jewel.foundation.theme.JewelTheme
import org.jetbrains.jewel.samples.standalone.StandaloneSampleIcons
import org.jetbrains.jewel.ui.Orientation
-import org.jetbrains.jewel.ui.component.Checkbox
import org.jetbrains.jewel.ui.component.Divider
import org.jetbrains.jewel.ui.component.Icon
import org.jetbrains.jewel.ui.component.OutlinedButton
@@ -36,14 +35,12 @@ import org.jetbrains.jewel.ui.component.TextArea
internal fun MarkdownEditor(
currentMarkdown: String,
onMarkdownChange: (String) -> Unit,
- onLinksEnabledChange: (Boolean) -> Unit,
modifier: Modifier = Modifier,
) {
Column(modifier) {
ControlsRow(
modifier = Modifier.fillMaxWidth().background(JewelTheme.globalColors.panelBackground).padding(8.dp),
onMarkdownChange = onMarkdownChange,
- onLinksEnabledChange = onLinksEnabledChange,
)
Divider(orientation = Orientation.Horizontal)
Editor(
@@ -58,7 +55,6 @@ internal fun MarkdownEditor(
private fun ControlsRow(
modifier: Modifier = Modifier,
onMarkdownChange: (String) -> Unit,
- onLinksEnabledChange: (Boolean) -> Unit,
) {
Row(
modifier.horizontalScroll(rememberScrollState()),
@@ -125,20 +121,6 @@ private fun ControlsRow(
}
}
}
-
- var linksAreEnabled by remember { mutableStateOf(true) }
- Row(
- verticalAlignment = Alignment.CenterVertically,
- ) {
- Text("Links enabled")
- Checkbox(
- checked = linksAreEnabled,
- onCheckedChange = {
- linksAreEnabled = it
- onLinksEnabledChange(it)
- },
- )
- }
}
}
diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownPreview.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownPreview.kt
index 072c29f53..6c1bd4996 100644
--- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownPreview.kt
+++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownPreview.kt
@@ -34,7 +34,6 @@ import org.jetbrains.jewel.markdown.extensions.github.alerts.AlertStyling
import org.jetbrains.jewel.markdown.extensions.github.alerts.GitHubAlertProcessorExtension
import org.jetbrains.jewel.markdown.extensions.github.alerts.GitHubAlertRendererExtension
import org.jetbrains.jewel.markdown.processing.MarkdownProcessor
-import org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer
import org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer
import org.jetbrains.jewel.markdown.rendering.MarkdownStyling
import org.jetbrains.jewel.ui.component.VerticalScrollbar
@@ -45,7 +44,6 @@ import java.net.URI
internal fun MarkdownPreview(
modifier: Modifier = Modifier,
rawMarkdown: String,
- linksAreEnabled: Boolean,
) {
val isDark = JewelTheme.isDark
@@ -53,12 +51,12 @@ internal fun MarkdownPreview(
remember(isDark) { if (isDark) MarkdownStyling.dark() else MarkdownStyling.light() }
var markdownBlocks by remember { mutableStateOf(emptyList()) }
- val extensions = listOf(GitHubAlertProcessorExtension, AutolinkProcessorExtension)
+ val extensions = remember { listOf(GitHubAlertProcessorExtension, AutolinkProcessorExtension) }
// We are doing this here for the sake of simplicity.
// In a real-world scenario you would be doing this outside your Composables,
// potentially involving ViewModels, dependency injection, etc.
- val processor = remember { MarkdownProcessor(extensions) }
+ val processor = remember { MarkdownProcessor(extensions, optimizeEdits = true) }
LaunchedEffect(rawMarkdown) {
// TODO you may want to debounce or drop on backpressure, in real usages. You should also not do this
@@ -76,13 +74,11 @@ internal fun MarkdownPreview(
MarkdownBlockRenderer.dark(
styling = markdownStyling,
rendererExtensions = listOf(GitHubAlertRendererExtension(AlertStyling.dark(), markdownStyling)),
- inlineRenderer = InlineMarkdownRenderer.default(extensions),
)
} else {
MarkdownBlockRenderer.light(
styling = markdownStyling,
rendererExtensions = listOf(GitHubAlertRendererExtension(AlertStyling.light(), markdownStyling)),
- inlineRenderer = InlineMarkdownRenderer.default(extensions),
)
}
}
@@ -99,7 +95,6 @@ internal fun MarkdownPreview(
contentPadding = PaddingValues(16.dp),
state = lazyListState,
selectable = true,
- enabled = linksAreEnabled,
onUrlClick = { url -> Desktop.getDesktop().browse(URI.create(url)) },
)
- |bar
- |
- """
+ |Foo
+ |
+ |bar
+ |
+ """
.trimMargin(),
)
@@ -4038,10 +4144,10 @@ class MarkdownProcessorDocumentParsingTest {
paragraph("Foo"),
htmlBlock(
"""
- |
- |bar
- |
- """
+ |
+ |bar
+ |
+ """
.trimMargin(),
),
)
@@ -4052,11 +4158,11 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |bar
- |
- |*foo*
- """
+ |
+ |bar
+ |
+ |*foo*
+ """
.trimMargin(),
)
@@ -4070,11 +4176,11 @@ class MarkdownProcessorDocumentParsingTest {
parsed.assertEquals(
htmlBlock(
"""
- |
- |bar
- |
- |*foo*
- """
+ |
+ |bar
+ |
+ |*foo*
+ """
.trimMargin(),
),
)
@@ -4085,10 +4191,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |Foo
- |
- |baz
- """
+ |Foo
+ |
+ |baz
+ """
.trimMargin(),
)
@@ -4098,7 +4204,15 @@ class MarkdownProcessorDocumentParsingTest {
*
* baz
*/
- parsed.assertEquals(paragraph("Foo baz"))
+ parsed.assertEquals(
+ Paragraph(
+ Text("Foo"),
+ SoftLineBreak,
+ HtmlInline(""),
+ SoftLineBreak,
+ Text("baz"),
+ ),
+ )
}
@Test
@@ -4106,12 +4220,12 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |
- |*Emphasized* text.
- |
- |
- """
+ |
+ |
+ |*Emphasized* text.
+ |
+ |
+ """
.trimMargin(),
)
@@ -4123,7 +4237,7 @@ class MarkdownProcessorDocumentParsingTest {
*/
parsed.assertEquals(
htmlBlock(""),
- paragraph("*Emphasized* text."),
+ Paragraph(Emphasis("*", Text("Emphasized")), Text(" text.")),
htmlBlock("
"),
)
}
@@ -4133,10 +4247,10 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- |
- |*Emphasized* text.
- |
- """
+ |
+ |*Emphasized* text.
+ |
+ """
.trimMargin(),
)
@@ -4149,10 +4263,10 @@ class MarkdownProcessorDocumentParsingTest {
parsed.assertEquals(
htmlBlock(
"""
- |
- |*Emphasized* text.
- |
- """
+ |
+ |*Emphasized* text.
+ |
+ """
.trimMargin(),
),
)
@@ -4163,18 +4277,18 @@ class MarkdownProcessorDocumentParsingTest {
val parsed =
processor.processMarkdownDocument(
"""
- || - |Hi - | | - | - |
| + |Hi + | | + | + |
| - | Hi - | | - | - |
| + | Hi + | | + | + |
[foo]
*/ parsed.assertEquals( - paragraph("\\[foo\\]: /url 'title"), + paragraph("[foo]: /url 'title"), paragraph("with blank line'"), - paragraph("\\[foo\\]"), + paragraph("[foo]"), ) } @@ -4376,11 +4492,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo]: - |/url - | - |[foo] - """ + |[foo]: + |/url + | + |[foo] + """ .trimMargin(), ) @@ -4388,7 +4504,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[foo](/url)")) + parsed.assertEquals(Paragraph(Link(destination = "/url", title = null, Text("foo")))) } @Test @@ -4396,10 +4512,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo]: - | - |[foo] - """ + |[foo]: + | + |[foo] + """ .trimMargin(), ) @@ -4409,8 +4525,8 @@ class MarkdownProcessorDocumentParsingTest { *[foo]
*/ parsed.assertEquals( - paragraph("\\[foo\\]:"), - paragraph("\\[foo\\]"), + paragraph("[foo]:"), + paragraph("[foo]"), ) } @@ -4419,10 +4535,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo]: <> - | - |[foo] - """ + |[foo]: <> + | + |[foo] + """ .trimMargin(), ) @@ -4430,7 +4546,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[foo]()")) + parsed.assertEquals(Paragraph(Link(destination = "", title = null, Text("foo")))) } @Test @@ -4438,10 +4554,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo]:[foo]
*/ parsed.assertEquals( - paragraph("\\[foo\\]:[foo]: /url "title" ok
*/ - parsed.assertEquals(paragraph("\\[foo\\]: /url \"title\" ok")) + parsed.assertEquals(paragraph("[foo]: /url \"title\" ok")) } @Test @@ -4599,9 +4715,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo]: /url - |"title" ok - """ + |[foo]: /url + |"title" ok + """ .trimMargin(), ) @@ -4617,10 +4733,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | [foo]: /url "title" - | - |[foo] - """ + | [foo]: /url "title" + | + |[foo] + """ .trimMargin(), ) @@ -4632,7 +4748,7 @@ class MarkdownProcessorDocumentParsingTest { */ parsed.assertEquals( indentedCodeBlock("[foo]: /url \"title\""), - paragraph("\\[foo\\]"), + paragraph("[foo]"), ) } @@ -4641,12 +4757,12 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |``` - |[foo]: /url - |``` - | - |[foo] - """ + |``` + |[foo]: /url + |``` + | + |[foo] + """ .trimMargin(), ) @@ -4658,7 +4774,7 @@ class MarkdownProcessorDocumentParsingTest { */ parsed.assertEquals( fencedCodeBlock("[foo]: /url"), - paragraph("\\[foo\\]"), + paragraph("[foo]"), ) } @@ -4667,11 +4783,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |Foo - |[bar]: /baz - | - |[bar] - """ + |Foo + |[bar]: /baz + | + |[bar] + """ .trimMargin(), ) @@ -4682,8 +4798,12 @@ class MarkdownProcessorDocumentParsingTest { *[bar]
*/ parsed.assertEquals( - paragraph("Foo \\[bar\\]: /baz"), - paragraph("\\[bar\\]"), + Paragraph( + Text("Foo"), + SoftLineBreak, + Text("[bar]: /baz"), + ), + paragraph("[bar]"), ) } @@ -4692,10 +4812,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |# [Foo] - |[foo]: /url - |> bar - """ + |# [Foo] + |[foo]: /url + |> bar + """ .trimMargin(), ) @@ -4707,7 +4827,7 @@ class MarkdownProcessorDocumentParsingTest { * */ parsed.assertEquals( - heading(level = 1, "[Foo](/url)"), + heading(level = 1, Link(destination = "/url", title = null, Text("Foo"))), blockQuote(paragraph("bar")), ) } @@ -4717,11 +4837,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo]: /url - |bar - |=== - |[foo] - """ + |[foo]: /url + |bar + |=== + |[foo] + """ .trimMargin(), ) @@ -4731,8 +4851,8 @@ class MarkdownProcessorDocumentParsingTest { * */ parsed.assertEquals( - heading(level = 1, "bar"), - paragraph("[foo](/url)"), + heading(level = 1, Text("bar")), + Paragraph(Link(destination = "/url", title = null, Text("foo"))), ) } @@ -4741,10 +4861,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo]: /url - |=== - |[foo] - """ + |[foo]: /url + |=== + |[foo] + """ .trimMargin(), ) @@ -4753,7 +4873,13 @@ class MarkdownProcessorDocumentParsingTest { *=== * foo
*/ - parsed.assertEquals(paragraph("=== [foo](/url)")) + parsed.assertEquals( + Paragraph( + Text("==="), + SoftLineBreak, + Link(destination = "/url", title = null, Text("foo")), + ), + ) } @Test @@ -4761,15 +4887,15 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo]: /foo-url "foo" - |[bar]: /bar-url - | "bar" - |[baz]: /baz-url - | - |[foo], - |[bar], - |[baz] - """ + |[foo]: /foo-url "foo" + |[bar]: /bar-url + | "bar" + |[baz]: /baz-url + | + |[foo], + |[bar], + |[baz] + """ .trimMargin(), ) @@ -4780,7 +4906,15 @@ class MarkdownProcessorDocumentParsingTest { * baz */ parsed.assertEquals( - paragraph("[foo](/foo-url \"foo\"), [bar](/bar-url \"bar\"), [baz](/baz-url)"), + Paragraph( + Link(destination = "/foo-url", title = "foo", Text("foo")), + Text(","), + SoftLineBreak, + Link(destination = "/bar-url", title = "bar", Text("bar")), + Text(","), + SoftLineBreak, + Link(destination = "/baz-url", title = null, Text("baz")), + ), ) } @@ -4789,10 +4923,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo] - | - |> [foo]: /url - """ + |[foo] + | + |> [foo]: /url + """ .trimMargin(), ) @@ -4803,7 +4937,7 @@ class MarkdownProcessorDocumentParsingTest { * */ parsed.assertEquals( - paragraph("[foo](/url)"), + Paragraph(Link(destination = "/url", title = null, Text("foo"))), blockQuote(), ) } @@ -4813,10 +4947,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |aaa - | - |bbb - """ + |aaa + | + |bbb + """ .trimMargin(), ) @@ -4836,12 +4970,12 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |aaa - |bbb - | - |ccc - |ddd - """ + |aaa + |bbb + | + |ccc + |ddd + """ .trimMargin(), ) @@ -4853,8 +4987,8 @@ class MarkdownProcessorDocumentParsingTest { * ddd */ parsed.assertEquals( - paragraph("aaa bbb"), - paragraph("ccc ddd"), + Paragraph(Text("aaa"), SoftLineBreak, Text("bbb")), + Paragraph(Text("ccc"), SoftLineBreak, Text("ddd")), ) } @@ -4863,11 +4997,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |aaa - | - | - |bbb - """ + |aaa + | + | + |bbb + """ .trimMargin(), ) @@ -4887,9 +5021,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | aaa - | bbb - """ + | aaa + | bbb + """ .trimMargin(), ) @@ -4898,7 +5032,7 @@ class MarkdownProcessorDocumentParsingTest { *aaa * bbb
*/ - parsed.assertEquals(paragraph("aaa bbb")) + parsed.assertEquals(Paragraph(Text("aaa"), SoftLineBreak, Text("bbb"))) } @Test @@ -4906,10 +5040,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |aaa - | bbb - | ccc - """ + |aaa + | bbb + | ccc + """ .trimMargin(), ) @@ -4919,7 +5053,15 @@ class MarkdownProcessorDocumentParsingTest { * bbb * ccc */ - parsed.assertEquals(paragraph("aaa bbb ccc")) + parsed.assertEquals( + Paragraph( + Text("aaa"), + SoftLineBreak, + Text("bbb"), + SoftLineBreak, + Text("ccc"), + ), + ) } @Test @@ -4927,9 +5069,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | aaa - |bbb - """ + | aaa + |bbb + """ .trimMargin(), ) @@ -4938,7 +5080,7 @@ class MarkdownProcessorDocumentParsingTest { *aaa * bbb
*/ - parsed.assertEquals(paragraph("aaa bbb")) + parsed.assertEquals(Paragraph(Text("aaa"), SoftLineBreak, Text("bbb"))) } @Test @@ -4946,9 +5088,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - | aaa - |bbb - """ + | aaa + |bbb + """ .trimMargin(), ) @@ -4969,9 +5111,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |aaa - |bbb - """ + |aaa + |bbb + """ .trimMargin(), ) @@ -4980,7 +5122,7 @@ class MarkdownProcessorDocumentParsingTest { *aaa
* bbb
hilo`
foo
foo ` bar
``
``"))
+ parsed.assertEquals(Paragraph(Code("``")))
}
@Test
@@ -8073,7 +8245,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
* ``
`` "))
+ parsed.assertEquals(Paragraph(Code(" `` ")))
}
@Test
@@ -8084,7 +8256,7 @@ class MarkdownProcessorDocumentParsingTest {
* Expected HTML:
* a
b
*
foo bar baz
foo
foo bar baz
foo\bar`
foo`bar
foo `` bar
*foo*
[not a link](/foo)
<a href="">`
<https://foo.bar.baz>`
```foo``
*/ - parsed.assertEquals(paragraph("\\`\\`\\`foo\\`\\`")) + parsed.assertEquals(paragraph("```foo``")) } @Test @@ -8293,7 +8470,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *`foo
*/ - parsed.assertEquals(paragraph("\\`foo")) + parsed.assertEquals(paragraph("`foo")) } @Test @@ -8304,7 +8481,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *`foobar
foo bar
*/ - parsed.assertEquals(paragraph("*foo bar*")) + parsed.assertEquals(Paragraph(Emphasis("*", Text(("foo bar"))))) } @Test @@ -8326,7 +8503,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *a * foo bar*
*/ - parsed.assertEquals(paragraph("a \\* foo bar\\*")) + parsed.assertEquals(paragraph("a * foo bar*")) } @Test @@ -8337,7 +8514,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *a*"foo"*
*/ - parsed.assertEquals(paragraph("a\\*\"foo\"\\*")) + parsed.assertEquals(paragraph("a*\"foo\"*")) } @Test @@ -8348,7 +8525,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: ** a *
*/ - parsed.assertEquals(paragraph("\\* a \\*")) + parsed.assertEquals(paragraph("* a *")) } @Test @@ -8356,11 +8533,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |*$*alpha. - | - |*£*bravo. - | - |*€*charlie. + |*$*alpha. + | + |*£*bravo. + | + |*€*charlie. """.trimMargin(), ) @@ -8370,7 +8547,11 @@ class MarkdownProcessorDocumentParsingTest { **£*bravo.
**€*charlie.
*/ - parsed.assertEquals(paragraph("*$*alpha."), paragraph("*£*bravo."), paragraph("*€*charlie.")) + parsed.assertEquals( + paragraph("*$*alpha."), + paragraph("*£*bravo."), + paragraph("*€*charlie."), + ) } @Test @@ -8381,7 +8562,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foobar
*/ - parsed.assertEquals(paragraph("foo*bar*")) + parsed.assertEquals(Paragraph(Text("foo"), Emphasis("*", Text("bar")))) } @Test @@ -8392,7 +8573,13 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *5678
*/ - parsed.assertEquals(paragraph("5*6*78")) + parsed.assertEquals( + Paragraph( + Text("5"), + Emphasis("*", Text("6")), + Text("78"), + ), + ) } @Test @@ -8403,7 +8590,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("_foo bar_")) + parsed.assertEquals(Paragraph(Emphasis("_", Text("foo bar")))) } @Test @@ -8414,7 +8601,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *_ foo bar_
*/ - parsed.assertEquals(paragraph("\\_ foo bar\\_")) + parsed.assertEquals(paragraph("_ foo bar_")) } @Test @@ -8425,7 +8612,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *a_"foo"_
*/ - parsed.assertEquals(paragraph("a\\_\"foo\"\\_")) + parsed.assertEquals(paragraph("a_\"foo\"_")) } @Test @@ -8436,7 +8623,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo_bar_
*/ - parsed.assertEquals(paragraph("foo\\_bar\\_")) + parsed.assertEquals(paragraph("foo_bar_")) } @Test @@ -8447,7 +8634,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *5_6_78
*/ - parsed.assertEquals(paragraph("5\\_6\\_78")) + parsed.assertEquals(paragraph("5_6_78")) } @Test @@ -8458,7 +8645,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *пристаням_стремятся_
*/ - parsed.assertEquals(paragraph("пристаням\\_стремятся\\_")) + parsed.assertEquals(paragraph("пристаням_стремятся_")) } @Test @@ -8469,7 +8656,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *aa_"bb"_cc
*/ - parsed.assertEquals(paragraph("aa\\_\"bb\"\\_cc")) + parsed.assertEquals(paragraph("aa_\"bb\"_cc")) } @Test @@ -8480,7 +8667,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo-(bar)
*/ - parsed.assertEquals(paragraph("foo-_\\(bar\\)_")) + parsed.assertEquals(Paragraph(Text("foo-"), Emphasis("_", Text("(bar)")))) } @Test @@ -8491,7 +8678,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *_foo*
*/ - parsed.assertEquals(paragraph("\\_foo\\*")) + parsed.assertEquals(paragraph("_foo*")) } @Test @@ -8502,7 +8689,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: **foo bar *
*/ - parsed.assertEquals(paragraph("\\*foo bar \\*")) + parsed.assertEquals(paragraph("*foo bar *")) } @Test @@ -8510,9 +8697,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |*foo bar - |* - """ + |*foo bar + |* + """ .trimMargin(), ) @@ -8521,7 +8708,7 @@ class MarkdownProcessorDocumentParsingTest { **foo bar * *
*/ - parsed.assertEquals(paragraph("\\*foo bar \\*")) + parsed.assertEquals(Paragraph(Text("*foo bar"), SoftLineBreak, Text("*"))) } @Test @@ -8532,7 +8719,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: **(*foo)
*/ - parsed.assertEquals(paragraph("\\*\\(\\*foo\\)")) + parsed.assertEquals(paragraph("*(*foo)")) } @Test @@ -8543,7 +8730,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *(foo)
*/ - parsed.assertEquals(paragraph("*\\(*foo*\\)*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Text("("), + Emphasis("*", Text("foo")), + Text(")"), + ), + ), + ) } @Test @@ -8554,7 +8750,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foobar
*/ - parsed.assertEquals(paragraph("*foo*bar")) + parsed.assertEquals(Paragraph(Emphasis("*", Text("foo")), Text("bar"))) } @Test @@ -8565,7 +8761,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *_foo bar _
*/ - parsed.assertEquals(paragraph("\\_foo bar \\_")) + parsed.assertEquals(paragraph("_foo bar _")) } @Test @@ -8576,7 +8772,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *_(_foo)
*/ - parsed.assertEquals(paragraph("\\_\\(\\_foo\\)")) + parsed.assertEquals(paragraph("_(_foo)")) } @Test @@ -8587,7 +8783,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *(foo)
*/ - parsed.assertEquals(paragraph("_\\(_foo_\\)_")) + parsed.assertEquals( + Paragraph( + Emphasis( + "_", + Text("("), + Emphasis("_", Text("foo")), + Text(")"), + ), + ), + ) } @Test @@ -8598,7 +8803,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *_foo_bar
*/ - parsed.assertEquals(paragraph("\\_foo\\_bar")) + parsed.assertEquals(paragraph("_foo_bar")) } @Test @@ -8609,7 +8814,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *_пристаням_стремятся
*/ - parsed.assertEquals(paragraph("\\_пристаням\\_стремятся")) + parsed.assertEquals(paragraph("_пристаням_стремятся")) } @Test @@ -8620,7 +8825,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo_bar_baz
*/ - parsed.assertEquals(paragraph("_foo\\_bar\\_baz_")) + parsed.assertEquals(Paragraph(Emphasis("_", Text("foo_bar_baz")))) } @Test @@ -8631,7 +8836,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *(bar).
*/ - parsed.assertEquals(paragraph("_\\(bar\\)_.")) + parsed.assertEquals( + Paragraph( + Emphasis("_", Text("(bar)")), + Text("."), + ), + ) } @Test @@ -8642,7 +8852,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("**foo bar**")) + parsed.assertEquals(Paragraph(StrongEmphasis("**", Text("foo bar")))) } @Test @@ -8653,7 +8863,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *** foo bar**
*/ - parsed.assertEquals(paragraph("\\*\\* foo bar\\*\\*")) + parsed.assertEquals(paragraph("** foo bar**")) } @Test @@ -8664,7 +8874,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *a**"foo"**
*/ - parsed.assertEquals(paragraph("a\\*\\*\"foo\"\\*\\*")) + parsed.assertEquals(paragraph("a**\"foo\"**")) } @Test @@ -8675,7 +8885,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foobar
*/ - parsed.assertEquals(paragraph("foo**bar**")) + parsed.assertEquals( + Paragraph( + Text("foo"), + StrongEmphasis("**", Text("bar")), + ), + ) } @Test @@ -8686,7 +8901,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("__foo bar__")) + parsed.assertEquals(Paragraph(StrongEmphasis("__", Text("foo bar")))) } @Test @@ -8697,7 +8912,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *__ foo bar__
*/ - parsed.assertEquals(paragraph("\\_\\_ foo bar\\_\\_")) + parsed.assertEquals(paragraph("__ foo bar__")) } @Test @@ -8705,9 +8920,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |__ - |foo bar__ - """ + |__ + |foo bar__ + """ .trimMargin(), ) @@ -8716,7 +8931,7 @@ class MarkdownProcessorDocumentParsingTest { *__ * foo bar__
*/ - parsed.assertEquals(paragraph("\\_\\_ foo bar\\_\\_")) + parsed.assertEquals(Paragraph(Text("__"), SoftLineBreak, Text("foo bar__"))) } @Test @@ -8727,7 +8942,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *a__"foo"__
*/ - parsed.assertEquals(paragraph("a\\_\\_\"foo\"\\_\\_")) + parsed.assertEquals(paragraph("a__\"foo\"__")) } @Test @@ -8738,7 +8953,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo__bar__
*/ - parsed.assertEquals(paragraph("foo\\_\\_bar\\_\\_")) + parsed.assertEquals(paragraph("foo__bar__")) } @Test @@ -8749,7 +8964,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *5__6__78
*/ - parsed.assertEquals(paragraph("5\\_\\_6\\_\\_78")) + parsed.assertEquals(paragraph("5__6__78")) } @Test @@ -8760,7 +8975,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *пристаням__стремятся__
*/ - parsed.assertEquals(paragraph("пристаням\\_\\_стремятся\\_\\_")) + parsed.assertEquals(paragraph("пристаням__стремятся__")) } @Test @@ -8771,7 +8986,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo, bar, baz
*/ - parsed.assertEquals(paragraph("__foo, __bar__, baz__")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "__", + Text("foo, "), + StrongEmphasis("__", Text("bar")), + Text(", baz"), + ), + ), + ) } @Test @@ -8782,7 +9006,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo-(bar)
*/ - parsed.assertEquals(paragraph("foo-__\\(bar\\)__")) + parsed.assertEquals( + Paragraph( + Text("foo-"), + StrongEmphasis("__", Text("(bar)")), + ), + ) } @Test @@ -8793,7 +9022,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: ***foo bar **
*/ - parsed.assertEquals(paragraph("\\*\\*foo bar \\*\\*")) + parsed.assertEquals(paragraph("**foo bar **")) } @Test @@ -8804,7 +9033,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: ***(**foo)
*/ - parsed.assertEquals(paragraph("\\*\\*\\(\\*\\*foo\\)")) + parsed.assertEquals(paragraph("**(**foo)")) } @Test @@ -8815,7 +9044,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *(foo)
*/ - parsed.assertEquals(paragraph("*\\(**foo**\\)*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Text("("), + StrongEmphasis("**", Text("foo")), + Text(")"), + ), + ), + ) } @Test @@ -8823,9 +9061,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |**Gomphocarpus (*Gomphocarpus physocarpus*, syn. - |*Asclepias physocarpa*)** - """ + |**Gomphocarpus (*Gomphocarpus physocarpus*, syn. + |*Asclepias physocarpa*)** + """ .trimMargin(), ) @@ -8835,8 +9073,16 @@ class MarkdownProcessorDocumentParsingTest { * Asclepias physocarpa) */ parsed.assertEquals( - paragraph( - "**Gomphocarpus \\(*Gomphocarpus physocarpus*, syn. *Asclepias physocarpa*\\)**", + Paragraph( + StrongEmphasis( + "**", + Text("Gomphocarpus ("), + Emphasis("*", Text("Gomphocarpus physocarpus")), + Text(", syn."), + SoftLineBreak, + Emphasis("*", Text("Asclepias physocarpa")), + Text(")"), + ), ), ) } @@ -8849,7 +9095,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo "bar" foo
*/ - parsed.assertEquals(paragraph("**foo \"*bar*\" foo**")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + Text("foo \""), + Emphasis("*", Text("bar")), + Text("\" foo"), + ), + ), + ) } @Test @@ -8860,7 +9115,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foobar
*/ - parsed.assertEquals(paragraph("**foo**bar")) + parsed.assertEquals( + Paragraph( + StrongEmphasis("**", Text("foo")), + Text("bar"), + ), + ) } @Test @@ -8871,7 +9131,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *__foo bar __
*/ - parsed.assertEquals(paragraph("\\_\\_foo bar \\_\\_")) + parsed.assertEquals(paragraph("__foo bar __")) } @Test @@ -8882,7 +9142,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *__(__foo)
*/ - parsed.assertEquals(paragraph("\\_\\_\\(\\_\\_foo\\)")) + parsed.assertEquals(paragraph("__(__foo)")) } @Test @@ -8893,7 +9153,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *(foo)
*/ - parsed.assertEquals(paragraph("_\\(__foo__\\)_")) + parsed.assertEquals( + Paragraph( + Emphasis( + "_", + Text("("), + StrongEmphasis("__", Text("foo")), + Text(")"), + ), + ), + ) } @Test @@ -8904,7 +9173,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *__foo__bar
*/ - parsed.assertEquals(paragraph("\\_\\_foo\\_\\_bar")) + parsed.assertEquals(paragraph("__foo__bar")) } @Test @@ -8915,7 +9184,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *__пристаням__стремятся
*/ - parsed.assertEquals(paragraph("\\_\\_пристаням\\_\\_стремятся")) + parsed.assertEquals(paragraph("__пристаням__стремятся")) } @Test @@ -8926,7 +9195,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo__bar__baz
*/ - parsed.assertEquals(paragraph("__foo\\_\\_bar\\_\\_baz__")) + parsed.assertEquals(Paragraph(StrongEmphasis("__", Text("foo__bar__baz")))) } @Test @@ -8937,7 +9206,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *(bar).
*/ - parsed.assertEquals(paragraph("__\\(bar\\)__.")) + parsed.assertEquals( + Paragraph( + StrongEmphasis("__", Text("(bar)")), + Text("."), + ), + ) } @Test @@ -8948,7 +9222,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("*foo [bar](/url)*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Text("foo "), + Link(destination = "/url", title = null, Text("bar")), + ), + ), + ) } @Test @@ -8956,9 +9238,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |*foo - |bar* - """ + |*foo + |bar* + """ .trimMargin(), ) @@ -8967,7 +9249,16 @@ class MarkdownProcessorDocumentParsingTest { *foo * bar
*/ - parsed.assertEquals(paragraph("*foo bar*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Text("foo"), + SoftLineBreak, + Text("bar"), + ), + ), + ) } @Test @@ -8978,7 +9269,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar baz
*/ - parsed.assertEquals(paragraph("_foo __bar__ baz_")) + parsed.assertEquals( + Paragraph( + Emphasis( + "_", + Text("foo "), + StrongEmphasis("__", Text("bar")), + Text(" baz"), + ), + ), + ) } @Test @@ -8989,7 +9289,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar baz
*/ - parsed.assertEquals(paragraph("_foo _bar_ baz_")) + parsed.assertEquals( + Paragraph( + Emphasis( + "_", + Text("foo "), + Emphasis("_", Text("bar")), + Text(" baz"), + ), + ), + ) } @Test @@ -9000,7 +9309,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("__foo_ bar_")) + parsed.assertEquals( + Paragraph( + Emphasis( + "_", + Emphasis("_", Text("foo")), + Text(" bar"), + ), + ), + ) } @Test @@ -9011,7 +9328,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("*foo *bar**")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Text("foo "), + Emphasis("*", Text("bar")), + ), + ), + ) } @Test @@ -9022,7 +9347,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar baz
*/ - parsed.assertEquals(paragraph("*foo **bar** baz*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Text("foo "), + StrongEmphasis("**", Text("bar")), + Text(" baz"), + ), + ), + ) } @Test @@ -9033,7 +9367,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foobarbaz
*/ - parsed.assertEquals(paragraph("*foo**bar**baz*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Text("foo"), + StrongEmphasis("**", Text("bar")), + Text("baz"), + ), + ), + ) } @Test @@ -9044,7 +9387,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo**bar
*/ - parsed.assertEquals(paragraph("*foo\\*\\*bar*")) + parsed.assertEquals(Paragraph(Emphasis("*", Text("foo**bar")))) } @Test @@ -9055,7 +9398,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("***foo** bar*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + StrongEmphasis("**", Text("foo")), + Text(" bar"), + ), + ), + ) } @Test @@ -9066,7 +9417,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("*foo **bar***")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Text("foo "), + StrongEmphasis("**", Text("bar")), + ), + ), + ) } @Test @@ -9077,7 +9436,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foobar
*/ - parsed.assertEquals(paragraph("*foo**bar***")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Text("foo"), + StrongEmphasis("**", Text("bar")), + ), + ), + ) } @Test @@ -9088,7 +9455,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foobarbaz
*/ - parsed.assertEquals(paragraph("foo***bar***baz")) + parsed.assertEquals( + Paragraph( + Text("foo"), + Emphasis( + "*", + StrongEmphasis("**", Text("bar")), + ), + Text("baz"), + ), + ) } @Test @@ -9099,7 +9475,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foobar***baz
*/ - parsed.assertEquals(paragraph("foo******bar******\\*\\*\\*baz")) + parsed.assertEquals( + Paragraph( + Text("foo"), + StrongEmphasis( + "**", + StrongEmphasis("**", StrongEmphasis("**", Text("bar"))), + ), + Text("***baz"), + ), + ) } @Test @@ -9110,7 +9495,21 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar baz bim bop
*/ - parsed.assertEquals(paragraph("*foo **bar *baz* bim** bop*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Text("foo "), + StrongEmphasis( + "**", + Text("bar "), + Emphasis("*", Text("baz")), + Text(" bim"), + ), + Text(" bop"), + ), + ), + ) } @Test @@ -9121,7 +9520,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("*foo [*bar*](/url)*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Text("foo "), + Link(destination = "/url", title = null, Emphasis("*", Text("bar"))), + ), + ), + ) } @Test @@ -9132,7 +9539,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *** is not an empty emphasis
*/ - parsed.assertEquals(paragraph("\\*\\* is not an empty emphasis")) + parsed.assertEquals(paragraph("** is not an empty emphasis")) } @Test @@ -9143,7 +9550,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: ***** is not an empty strong emphasis
*/ - parsed.assertEquals(paragraph("\\*\\*\\*\\* is not an empty strong emphasis")) + parsed.assertEquals(paragraph("**** is not an empty strong emphasis")) } @Test @@ -9154,7 +9561,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("**foo [bar](/url)**")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + Text("foo "), + Link(destination = "/url", title = null, Text("bar")), + ), + ), + ) } @Test @@ -9162,9 +9577,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |**foo - |bar** - """ + |**foo + |bar** + """ .trimMargin(), ) @@ -9173,7 +9588,16 @@ class MarkdownProcessorDocumentParsingTest { *foo * bar
*/ - parsed.assertEquals(paragraph("**foo bar**")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + Text("foo"), + SoftLineBreak, + Text("bar"), + ), + ), + ) } @Test @@ -9184,7 +9608,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar baz
*/ - parsed.assertEquals(paragraph("__foo _bar_ baz__")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "__", + Text("foo "), + Emphasis("_", Text("bar")), + Text(" baz"), + ), + ), + ) } @Test @@ -9195,7 +9628,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar baz
*/ - parsed.assertEquals(paragraph("__foo __bar__ baz__")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "__", + Text("foo "), + StrongEmphasis("__", Text("bar")), + Text(" baz"), + ), + ), + ) } @Test @@ -9206,7 +9648,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("____foo__ bar__")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "__", + StrongEmphasis("__", Text("foo")), + Text(" bar"), + ), + ), + ) } @Test @@ -9217,7 +9667,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("**foo **bar****")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + Text("foo "), + StrongEmphasis("**", Text("bar")), + ), + ), + ) } @Test @@ -9228,7 +9686,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar baz
*/ - parsed.assertEquals(paragraph("**foo *bar* baz**")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + Text("foo "), + Emphasis("*", Text("bar")), + Text(" baz"), + ), + ), + ) } @Test @@ -9239,7 +9706,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foobarbaz
*/ - parsed.assertEquals(paragraph("**foo*bar*baz**")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + Text("foo"), + Emphasis("*", Text("bar")), + Text("baz"), + ), + ), + ) } @Test @@ -9250,7 +9726,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("***foo* bar**")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + Emphasis("*", Text("foo")), + Text(" bar"), + ), + ), + ) } @Test @@ -9261,7 +9745,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("**foo *bar***")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + Text("foo "), + Emphasis("*", Text("bar")), + ), + ), + ) } @Test @@ -9269,9 +9761,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |**foo *bar **baz** - |bim* bop** - """ + |**foo *bar **baz** + |bim* bop** + """ .trimMargin(), ) @@ -9280,7 +9772,22 @@ class MarkdownProcessorDocumentParsingTest { *foo bar baz * bim bop
*/ - parsed.assertEquals(paragraph("**foo *bar **baz** bim* bop**")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + Text("foo "), + Emphasis( + "*", + Text("bar "), + StrongEmphasis("**", Text("baz")), + SoftLineBreak, + Text("bim"), + ), + Text(" bop"), + ), + ), + ) } @Test @@ -9291,7 +9798,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("**foo [*bar*](/url)**")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + Text("foo "), + Link(destination = "/url", title = null, Emphasis("*", Text("bar"))), + ), + ), + ) } @Test @@ -9302,7 +9817,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *__ is not an empty emphasis
*/ - parsed.assertEquals(paragraph("\\_\\_ is not an empty emphasis")) + parsed.assertEquals(paragraph("__ is not an empty emphasis")) } @Test @@ -9313,7 +9828,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *____ is not an empty strong emphasis
*/ - parsed.assertEquals(paragraph("\\_\\_\\_\\_ is not an empty strong emphasis")) + parsed.assertEquals(paragraph("____ is not an empty strong emphasis")) } @Test @@ -9324,7 +9839,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo ***
*/ - parsed.assertEquals(paragraph("foo \\*\\*\\*")) + parsed.assertEquals(paragraph("foo ***")) } @Test @@ -9335,7 +9850,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo *
*/ - parsed.assertEquals(paragraph("foo *\\**")) + parsed.assertEquals( + Paragraph( + Text("foo "), + Emphasis("*", Text("*")), + ), + ) } @Test @@ -9346,7 +9866,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo _
*/ - parsed.assertEquals(paragraph("foo *\\_*")) + parsed.assertEquals( + Paragraph( + Text("foo "), + Emphasis("*", Text("_")), + ), + ) } @Test @@ -9357,7 +9882,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo *****
*/ - parsed.assertEquals(paragraph("foo \\*\\*\\*\\*\\*")) + parsed.assertEquals(paragraph("foo *****")) } @Test @@ -9368,7 +9893,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo *
*/ - parsed.assertEquals(paragraph("foo **\\***")) + parsed.assertEquals( + Paragraph( + Text("foo "), + StrongEmphasis("**", Text("*")), + ), + ) } @Test @@ -9379,7 +9909,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo _
*/ - parsed.assertEquals(paragraph("foo **\\_**")) + parsed.assertEquals( + Paragraph( + Text("foo "), + StrongEmphasis("**", Text("_")), + ), + ) } @Test @@ -9390,7 +9925,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: **foo
*/ - parsed.assertEquals(paragraph("\\**foo*")) + parsed.assertEquals( + Paragraph( + Text("*"), + Emphasis("*", Text("foo")), + ), + ) } @Test @@ -9401,7 +9941,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo*
*/ - parsed.assertEquals(paragraph("*foo*\\*")) + parsed.assertEquals( + Paragraph( + Emphasis("*", Text("foo")), + Text("*"), + ), + ) } @Test @@ -9412,7 +9957,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: **foo
*/ - parsed.assertEquals(paragraph("\\***foo**")) + parsed.assertEquals( + Paragraph( + Text("*"), + StrongEmphasis("**", Text("foo")), + ), + ) } @Test @@ -9423,7 +9973,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: ****foo
*/ - parsed.assertEquals(paragraph("\\*\\*\\**foo*")) + parsed.assertEquals( + Paragraph( + Text("***"), + Emphasis("*", Text("foo")), + ), + ) } @Test @@ -9434,7 +9989,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo*
*/ - parsed.assertEquals(paragraph("**foo**\\*")) + parsed.assertEquals( + Paragraph( + StrongEmphasis("**", Text("foo")), + Text("*"), + ), + ) } @Test @@ -9445,7 +10005,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo***
*/ - parsed.assertEquals(paragraph("*foo*\\*\\*\\*")) + parsed.assertEquals( + Paragraph( + Emphasis("*", Text("foo")), + Text("***"), + ), + ) } @Test @@ -9456,7 +10021,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo ___
*/ - parsed.assertEquals(paragraph("foo \\_\\_\\_")) + parsed.assertEquals(paragraph("foo ___")) } @Test @@ -9467,7 +10032,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo _
*/ - parsed.assertEquals(paragraph("foo _\\__")) + parsed.assertEquals( + Paragraph( + Text("foo "), + Emphasis("_", Text("_")), + ), + ) } @Test @@ -9478,7 +10048,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo *
*/ - parsed.assertEquals(paragraph("foo _\\*_")) + parsed.assertEquals( + Paragraph( + Text("foo "), + Emphasis("_", Text("*")), + ), + ) } @Test @@ -9489,7 +10064,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo _____
*/ - parsed.assertEquals(paragraph("foo \\_\\_\\_\\_\\_")) + parsed.assertEquals(paragraph("foo _____")) } @Test @@ -9500,7 +10075,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo _
*/ - parsed.assertEquals(paragraph("foo __\\___")) + parsed.assertEquals( + Paragraph( + Text("foo "), + StrongEmphasis("__", Text("_")), + ), + ) } @Test @@ -9511,7 +10091,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo *
*/ - parsed.assertEquals(paragraph("foo __\\*__")) + parsed.assertEquals( + Paragraph( + Text("foo "), + StrongEmphasis("__", Text("*")), + ), + ) } @Test @@ -9522,7 +10107,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *_foo
*/ - parsed.assertEquals(paragraph("\\__foo_")) + parsed.assertEquals( + Paragraph( + Text("_"), + Emphasis("_", Text("foo")), + ), + ) } @Test @@ -9533,7 +10123,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo_
*/ - parsed.assertEquals(paragraph("_foo_\\_")) + parsed.assertEquals( + Paragraph( + Emphasis("_", Text("foo")), + Text("_"), + ), + ) } @Test @@ -9544,7 +10139,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *_foo
*/ - parsed.assertEquals(paragraph("\\___foo__")) + parsed.assertEquals( + Paragraph( + Text("_"), + StrongEmphasis("__", Text("foo")), + ), + ) } @Test @@ -9555,7 +10155,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *___foo
*/ - parsed.assertEquals(paragraph("\\_\\_\\__foo_")) + parsed.assertEquals( + Paragraph( + Text("___"), + Emphasis("_", Text("foo")), + ), + ) } @Test @@ -9566,7 +10171,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo_
*/ - parsed.assertEquals(paragraph("__foo__\\_")) + parsed.assertEquals( + Paragraph( + StrongEmphasis("__", Text("foo")), + Text("_"), + ), + ) } @Test @@ -9577,7 +10187,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo___
*/ - parsed.assertEquals(paragraph("_foo_\\_\\_\\_")) + parsed.assertEquals( + Paragraph( + Emphasis("_", Text("foo")), + Text("___"), + ), + ) } @Test @@ -9588,7 +10203,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo
*/ - parsed.assertEquals(paragraph("**foo**")) + parsed.assertEquals(Paragraph(StrongEmphasis("**", Text("foo")))) } @Test @@ -9599,7 +10214,14 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo
*/ - parsed.assertEquals(paragraph("*_foo_*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Emphasis("_", Text("foo")), + ), + ), + ) } @Test @@ -9610,18 +10232,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo
*/ - parsed.assertEquals(paragraph("__foo__")) - } - - @Test - fun `should parse spec sample 463 correctly {Emphasis and strong emphasis}`() { - val parsed = processor.processMarkdownDocument("_*foo*_") - - /* - * Expected HTML: - *foo
- */ - parsed.assertEquals(paragraph("_*foo*_")) + parsed.assertEquals(Paragraph(StrongEmphasis("__", Text("foo")))) } @Test @@ -9632,7 +10243,18 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("_*foo _bar_*_")) + parsed.assertEquals( + Paragraph( + Emphasis( + "_", + Emphasis( + "*", + Text("foo "), + Emphasis("_", Text("bar")), + ), + ), + ), + ) } @Test @@ -9643,7 +10265,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("__foo _bar___")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "__", + Text("foo "), + Emphasis("_", Text("bar")), + ), + ), + ) } @Test @@ -9654,7 +10284,19 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar a
*/ - parsed.assertEquals(paragraph("_*foo _bar_ a*_")) + parsed.assertEquals( + Paragraph( + Emphasis( + "_", + Emphasis( + "*", + Text("foo "), + Emphasis("_", Text("bar")), + Text(" a"), + ), + ), + ), + ) } @Test @@ -9665,7 +10307,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar a
*/ - parsed.assertEquals(paragraph("__foo _bar_ a__")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "__", + Text("foo "), + Emphasis("_", Text("bar")), + Text(" a"), + ), + ), + ) } @Test @@ -9676,7 +10327,37 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar a
*/ - parsed.assertEquals(paragraph("_*foo *bar* a*_")) + parsed.assertEquals( + Paragraph( + Emphasis( + "_", + Emphasis( + "*", + Text("foo "), + Emphasis("*", Text("bar")), + Text(" a"), + ), + ), + ), + ) + } + + @Test + fun `should parse spec sample 463 correctly {Emphasis and strong emphasis}`() { + val parsed = processor.processMarkdownDocument("_*foo*_") + + /* + * Expected HTML: + *foo
+ */ + parsed.assertEquals( + Paragraph( + Emphasis( + "_", + Emphasis("*", Text("foo")), + ), + ), + ) } @Test @@ -9687,7 +10368,14 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo
*/ - parsed.assertEquals(paragraph("****foo****")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + StrongEmphasis("**", Text("foo")), + ), + ), + ) } @Test @@ -9698,7 +10386,14 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo
*/ - parsed.assertEquals(paragraph("____foo____")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "__", + StrongEmphasis("__", Text("foo")), + ), + ), + ) } @Test @@ -9709,7 +10404,14 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo
*/ - parsed.assertEquals(paragraph("******foo******")) + parsed.assertEquals( + Paragraph( + StrongEmphasis( + "**", + StrongEmphasis("**", StrongEmphasis("**", Text("foo"))), + ), + ), + ) } @Test @@ -9720,7 +10422,14 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo
*/ - parsed.assertEquals(paragraph("***foo***")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + StrongEmphasis("**", Text("foo")), + ), + ), + ) } @Test @@ -9731,7 +10440,14 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo
*/ - parsed.assertEquals(paragraph("_____foo_____")) + parsed.assertEquals( + Paragraph( + Emphasis( + "_", + StrongEmphasis("__", StrongEmphasis("__", Text("foo"))), + ), + ), + ) } @Test @@ -9742,7 +10458,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo _bar baz_
*/ - parsed.assertEquals(paragraph("*foo \\_bar* baz\\_")) + parsed.assertEquals( + Paragraph( + Emphasis("*", Text("foo _bar")), + Text(" baz_"), + ), + ) } @Test @@ -9753,7 +10474,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar *baz bim bam
*/ - parsed.assertEquals(paragraph("*foo __bar \\*baz bim__ bam*")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Text("foo "), + StrongEmphasis("__", Text("bar *baz bim")), + Text(" bam"), + ), + ), + ) } @Test @@ -9764,7 +10494,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: ***foo bar baz
*/ - parsed.assertEquals(paragraph("\\*\\*foo **bar baz**")) + parsed.assertEquals( + Paragraph( + Text("**foo "), + StrongEmphasis("**", Text("bar baz")), + ), + ) } @Test @@ -9775,7 +10510,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: **foo bar baz
*/ - parsed.assertEquals(paragraph("\\*foo *bar baz*")) + parsed.assertEquals( + Paragraph( + Text("*foo "), + Emphasis("*", Text("bar baz")), + ), + ) } @Test @@ -9786,7 +10526,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: **bar*
*/ - parsed.assertEquals(paragraph("\\*[bar\\*](/url)")) + parsed.assertEquals( + Paragraph( + Text("*"), + Link(destination = "/url", title = null, Text("bar*")), + ), + ) } @Test @@ -9797,7 +10542,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *_foo bar_
*/ - parsed.assertEquals(paragraph("\\_foo [bar\\_](/url)")) + parsed.assertEquals( + Paragraph( + Text("_foo "), + Link(destination = "/url", title = null, Text("bar_")), + ), + ) } @Test @@ -9808,7 +10558,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: **
a *
a _
[link](/my uri)
*/ - parsed.assertEquals(paragraph("\\[link\\]\\(/my uri\\)")) + parsed.assertEquals(Paragraph(Text("[link](/my uri)"))) } @Test @@ -9962,7 +10753,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link]([link](foo * bar)
*/ - parsed.assertEquals(paragraph("\\[link\\]\\(foo bar\\)")) + parsed.assertEquals(Paragraph(Text("[link](foo"), SoftLineBreak, Text("bar)"))) } @Test @@ -9989,9 +10780,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[link]([link](
[link](<foo>)
*/ - parsed.assertEquals(paragraph("\\[link\\]\\(\\[link](foo(and(bar))
*/ - parsed.assertEquals(paragraph("\\[link\\]\\(foo\\(and\\(bar\\)\\)")) + parsed.assertEquals(paragraph("[link](foo(and(bar))")) } @Test @@ -10091,7 +10888,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link](foo\\(and\\(bar\\))")) + parsed.assertEquals(Paragraph(Link(destination = "foo(and(bar)", title = null, Text("link")))) } @Test @@ -10102,7 +10899,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link](foo\\(and\\(bar\\))")) + parsed.assertEquals(Paragraph(Link(destination = "foo(and(bar)", title = null, Text("link")))) } @Test @@ -10113,7 +10910,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link](foo\\):)")) + parsed.assertEquals(Paragraph(Link(destination = "foo):", title = null, Text("link")))) } @Test @@ -10121,12 +10918,12 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[link](#fragment) - | - |[link](https://example.com#fragment) - | - |[link](https://example.com?foo=3#frag) - """ + |[link](#fragment) + | + |[link](https://example.com#fragment) + | + |[link](https://example.com?foo=3#frag) + """ .trimMargin(), ) @@ -10137,9 +10934,9 @@ class MarkdownProcessorDocumentParsingTest { * */ parsed.assertEquals( - paragraph("[link](#fragment)"), - paragraph("[link](https://example.com#fragment)"), - paragraph("[link](https://example.com?foo=3#frag)"), + Paragraph(Link(destination = "#fragment", title = null, Text("link"))), + Paragraph(Link(destination = "https://example.com#fragment", title = null, Text("link"))), + Paragraph(Link(destination = "https://example.com?foo=3#frag", title = null, Text("link"))), ) } @@ -10151,7 +10948,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link](foo\\bar)")) + parsed.assertEquals(Paragraph(Link(destination = "foo\\bar", title = null, Text("link")))) } @Test @@ -10162,7 +10959,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link](foo%20bä)")) + parsed.assertEquals(Paragraph(Link(destination = "foo%20bä", title = null, Text("link")))) } @Test @@ -10173,7 +10970,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link](\"title\")")) + parsed.assertEquals(Paragraph(Link(destination = "\"title\"", title = null, Text("link")))) } @Test @@ -10181,10 +10978,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[link](/url "title") - |[link](/url 'title') - |[link](/url (title)) - """ + |[link](/url "title") + |[link](/url 'title') + |[link](/url (title)) + """ .trimMargin(), ) @@ -10195,7 +10992,13 @@ class MarkdownProcessorDocumentParsingTest { * link */ parsed.assertEquals( - paragraph("[link](/url \"title\") [link](/url \"title\") [link](/url \"title\")"), + Paragraph( + Link(destination = "/url", title = "title", Text("link")), + SoftLineBreak, + Link(destination = "/url", title = "title", Text("link")), + SoftLineBreak, + Link(destination = "/url", title = "title", Text("link")), + ), ) } @@ -10207,7 +11010,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link](/url \"title \\\"\\\"\")")) + parsed.assertEquals(Paragraph(Link(destination = "/url", title = "title \"\"", Text("link")))) } @Test @@ -10218,7 +11021,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link]()")) + parsed.assertEquals(Paragraph(Link(destination = "/url \"title\"", title = null, Text("link")))) } @Test @@ -10229,7 +11032,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[link](/url "title "and" title")
*/ - parsed.assertEquals(paragraph("\\[link\\]\\(/url \"title \"and\" title\"\\)")) + parsed.assertEquals(paragraph("[link](/url \"title \"and\" title\")")) } @Test @@ -10240,7 +11043,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link](/url \"title \\\"and\\\" title\")")) + parsed.assertEquals(Paragraph(Link(destination = "/url", title = "title \"and\" title", Text("link")))) } @Test @@ -10248,9 +11051,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[link]( /uri - | "title" ) - """ + |[link]( /uri + | "title" ) + """ .trimMargin(), ) @@ -10258,7 +11061,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link](/uri \"title\")")) + parsed.assertEquals(Paragraph(Link(destination = "/uri", title = "title", Text("link")))) } @Test @@ -10269,7 +11072,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[link] (/uri)
*/ - parsed.assertEquals(paragraph("\\[link\\] \\(/uri\\)")) + parsed.assertEquals(paragraph("[link] (/uri)")) } @Test @@ -10280,7 +11083,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link \\[foo \\[bar\\]\\]](/uri)")) + parsed.assertEquals(Paragraph(Link(destination = "/uri", title = null, Text("link [foo [bar]]")))) } @Test @@ -10291,7 +11094,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[link] bar](/uri)
*/ - parsed.assertEquals(paragraph("\\[link\\] bar\\]\\(/uri\\)")) + parsed.assertEquals(paragraph("[link] bar](/uri)")) } @Test @@ -10302,7 +11105,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[link bar
*/ - parsed.assertEquals(paragraph("\\[link [bar](/uri)")) + parsed.assertEquals( + Paragraph( + Text("[link "), + Link(destination = "/uri", title = null, Text("bar")), + ), + ) } @Test @@ -10313,7 +11121,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link \\[bar](/uri)")) + parsed.assertEquals(Paragraph(Link(destination = "/uri", title = null, Text("link [bar")))) } @Test @@ -10324,7 +11132,22 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link *foo **bar** `#`*](/uri)")) + parsed.assertEquals( + Paragraph( + Link( + destination = "/uri", + title = null, + Text("link "), + Emphasis( + "*", + Text("foo "), + StrongEmphasis("**", Text("bar")), + Text(" "), + Code("#"), + ), + ), + ), + ) } @Test @@ -10335,7 +11158,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *
[foo bar](/uri)
*/ - parsed.assertEquals(paragraph("\\[foo [bar](/uri)\\]\\(/uri\\)")) + parsed.assertEquals( + Paragraph( + Text("[foo "), + Link(destination = "/uri", title = null, Text("bar")), + Text("](/uri)"), + ), + ) } @Test @@ -10357,10 +11194,20 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[foo [bar baz](/uri)](/uri)
*/ - parsed.assertEquals(paragraph("\\[foo *\\[bar [baz](/uri)\\]\\(/uri\\)*\\]\\(/uri\\)")) + parsed.assertEquals( + Paragraph( + Text("[foo "), + Emphasis( + "*", + Text("[bar "), + Link(destination = "/uri", title = null, Text("baz")), + Text("](/uri)"), + ), + Text("](/uri)"), + ), + ) } - @Ignore @Test fun `should parse spec sample 520 correctly {Links}`() { val parsed = processor.processMarkdownDocument("](uri2)](uri3)") @@ -10369,7 +11216,18 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: **foo*
*/ - parsed.assertEquals(paragraph("\\*[foo\\*](/uri)")) + parsed.assertEquals( + Paragraph( + Text("*"), + Link(destination = "/uri", title = null, Text("foo*")), + ), + ) } @Test @@ -10391,7 +11254,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[foo \\*bar](baz*)")) + parsed.assertEquals(Paragraph(Link(destination = "baz*", title = null, Text("foo *bar")))) } @Test @@ -10402,7 +11265,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo [bar baz]
*/ - parsed.assertEquals(paragraph("*foo \\[bar* baz\\]")) + parsed.assertEquals( + Paragraph( + Emphasis( + "*", + Text("foo [bar"), + ), + Text(" baz]"), + ), + ) } @Test @@ -10413,7 +11284,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[foo
[foo](/uri)
[foohttps://example.com/?search=](uri)
*/ parsed.assertEquals( - paragraph( - "\\[foo[https://example.com/?search=\\]\\(uri\\)](https://example.com/?search=]\\(uri\\))", + Paragraph( + Text("[foo"), + Link( + destination = "https://example.com/?search=](uri)", + title = null, + Text("https://example.com/?search=](uri)"), + ), ), ) } @@ -10447,10 +11328,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo][bar] - | - |[bar]: /url "title" - """ + |[foo][bar] + | + |[bar]: /url "title" + """ .trimMargin(), ) @@ -10458,7 +11339,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[foo](/url \"title\")")) + parsed.assertEquals(Paragraph(Link(destination = "/url", title = "title", Text("foo")))) } @Test @@ -10466,10 +11347,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[link [foo [bar]]][ref] - | - |[ref]: /uri - """ + |[link [foo [bar]]][ref] + | + |[ref]: /uri + """ .trimMargin(), ) @@ -10477,7 +11358,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link \\[foo \\[bar\\]\\]](/uri)")) + parsed.assertEquals(Paragraph(Link(destination = "/uri", title = null, Text("link [foo [bar]]")))) } @Test @@ -10485,10 +11366,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[link \[bar][ref] - | - |[ref]: /uri - """ + |[link \[bar][ref] + | + |[ref]: /uri + """ .trimMargin(), ) @@ -10496,7 +11377,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link \\[bar](/uri)")) + parsed.assertEquals(Paragraph(Link(destination = "/uri", title = null, Text("link [bar")))) } @Test @@ -10504,10 +11385,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[link *foo **bar** `#`*][ref] - | - |[ref]: /uri - """ + |[link *foo **bar** `#`*][ref] + | + |[ref]: /uri + """ .trimMargin(), ) @@ -10515,7 +11396,22 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[link *foo **bar** `#`*](/uri)")) + parsed.assertEquals( + Paragraph( + Link( + destination = "/uri", + title = null, + Text("link "), + Emphasis( + "*", + Text("foo "), + StrongEmphasis("**", Text("bar")), + Text(" "), + Code("#"), + ), + ), + ), + ) } @Test @@ -10523,10 +11419,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[][ref] - | - |[ref]: /uri - """ + |[][ref] + | + |[ref]: /uri + """ .trimMargin(), ) @@ -10534,7 +11430,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *
*foo*
*/ - parsed.assertEquals(paragraph("\\*[foo\\*](/uri)")) + parsed.assertEquals( + Paragraph( + Text("*"), + Link(destination = "/uri", title = null, Text("foo*")), + ), + ) } @Test @@ -10599,10 +11526,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo *bar][ref]* - | - |[ref]: /uri - """ + |[foo *bar][ref]* + | + |[ref]: /uri + """ .trimMargin(), ) @@ -10610,7 +11537,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[foo \\*bar](/uri)\\*")) + parsed.assertEquals( + Paragraph( + Link(destination = "/uri", title = null, Text("foo *bar")), + Text("*"), + ), + ) } @Test @@ -10618,10 +11550,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo[foo
[foo][ref]
[foohttps://example.com/?search=][ref]
*/ parsed.assertEquals( - paragraph( - "\\[foo[https://example.com/?search=\\]\\[ref\\]](https://example.com/?search=][ref])", + Paragraph( + Text(content = "[foo"), + Link( + destination = "https://example.com/?search=][ref]", + title = null, + Text("https://example.com/?search=][ref]"), + ), ), ) } @@ -10679,10 +11616,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo][BaR] - | - |[bar]: /url "title" - """ + |[foo][BaR] + | + |[bar]: /url "title" + """ .trimMargin(), ) @@ -10690,7 +11627,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[foo](/url \"title\")")) + parsed.assertEquals(Paragraph(Link(destination = "/url", title = "title", Text("foo")))) } @Test @@ -10698,10 +11635,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[ẞ] - | - |[SS]: /url - """ + |[ẞ] + | + |[SS]: /url + """ .trimMargin(), ) @@ -10709,7 +11646,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[ẞ](/url)")) + parsed.assertEquals(Paragraph(Link(destination = "/url", title = null, Text("ẞ")))) } @Test @@ -10717,11 +11654,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[Foo - | bar]: /url - | - |[Baz][Foo bar] - """ + |[Foo + | bar]: /url + | + |[Baz][Foo bar] + """ .trimMargin(), ) @@ -10729,7 +11666,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[Baz](/url)")) + parsed.assertEquals(Paragraph(Link(destination = "/url", title = null, Text("Baz")))) } @Test @@ -10737,10 +11674,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo] [bar] - | - |[bar]: /url "title" - """ + |[foo] [bar] + | + |[bar]: /url "title" + """ .trimMargin(), ) @@ -10748,7 +11685,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[foo] bar
*/ - parsed.assertEquals(paragraph("\\[foo\\] [bar](/url \"title\")")) + parsed.assertEquals( + Paragraph( + Text("[foo] "), + Link(destination = "/url", title = "title", Text("bar")), + ), + ) } @Test @@ -10756,11 +11698,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo] - |[bar] - | - |[bar]: /url "title" - """ + |[foo] + |[bar] + | + |[bar]: /url "title" + """ .trimMargin(), ) @@ -10769,7 +11711,13 @@ class MarkdownProcessorDocumentParsingTest { *[foo] * bar
*/ - parsed.assertEquals(paragraph("\\[foo\\] [bar](/url \"title\")")) + parsed.assertEquals( + Paragraph( + Text("[foo]"), + SoftLineBreak, + Link(destination = "/url", title = "title", Text("bar")), + ), + ) } @Test @@ -10777,12 +11725,12 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo]: /url1 - | - |[foo]: /url2 - | - |[bar][foo] - """ + |[foo]: /url1 + | + |[foo]: /url2 + | + |[bar][foo] + """ .trimMargin(), ) @@ -10790,7 +11738,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[bar](/url1)")) + parsed.assertEquals(Paragraph(Link(destination = "/url1", title = null, Text("bar")))) } @Test @@ -10798,10 +11746,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[bar][foo\!] - | - |[foo!]: /url - """ + |[bar][foo\!] + | + |[foo!]: /url + """ .trimMargin(), ) @@ -10809,7 +11757,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[bar][foo!]
*/ - parsed.assertEquals(paragraph("\\[bar\\]\\[foo\\!\\]")) + parsed.assertEquals(paragraph("[bar][foo!]")) } @Test @@ -10817,10 +11765,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo][ref[] - | - |[ref[]: /uri - """ + |[foo][ref[] + | + |[ref[]: /uri + """ .trimMargin(), ) @@ -10830,8 +11778,8 @@ class MarkdownProcessorDocumentParsingTest { *[ref[]: /uri
*/ parsed.assertEquals( - paragraph("\\[foo\\]\\[ref\\[\\]"), - paragraph("\\[ref\\[\\]: /uri"), + paragraph("[foo][ref[]"), + paragraph("[ref[]: /uri"), ) } @@ -10840,10 +11788,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo][ref[bar]] - | - |[ref[bar]]: /uri - """ + |[foo][ref[bar]] + | + |[ref[bar]]: /uri + """ .trimMargin(), ) @@ -10853,8 +11801,8 @@ class MarkdownProcessorDocumentParsingTest { *[ref[bar]]: /uri
*/ parsed.assertEquals( - paragraph("\\[foo\\]\\[ref\\[bar\\]\\]"), - paragraph("\\[ref\\[bar\\]\\]: /uri"), + paragraph("[foo][ref[bar]]"), + paragraph("[ref[bar]]: /uri"), ) } @@ -10863,10 +11811,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[[[foo]]] - | - |[[[foo]]]: /url - """ + |[[[foo]]] + | + |[[[foo]]]: /url + """ .trimMargin(), ) @@ -10876,8 +11824,8 @@ class MarkdownProcessorDocumentParsingTest { *[[[foo]]]: /url
*/ parsed.assertEquals( - paragraph("\\[\\[\\[foo\\]\\]\\]"), - paragraph("\\[\\[\\[foo\\]\\]\\]: /url"), + paragraph("[[[foo]]]"), + paragraph("[[[foo]]]: /url"), ) } @@ -10886,10 +11834,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo][ref\[] - | - |[ref\[]: /uri - """ + |[foo][ref\[] + | + |[ref\[]: /uri + """ .trimMargin(), ) @@ -10897,7 +11845,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[foo](/uri)")) + parsed.assertEquals(Paragraph(Link(destination = "/uri", title = null, Text("foo")))) } @Test @@ -10905,10 +11853,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[bar\\]: /uri - | - |[bar\\] - """ + |[bar\\]: /uri + | + |[bar\\] + """ .trimMargin(), ) @@ -10916,7 +11864,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[bar\\\\](/uri)")) + parsed.assertEquals(Paragraph(Link(destination = "/uri", title = null, Text("bar\\")))) } @Test @@ -10924,10 +11872,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[] - | - |[]: /uri - """ + |[] + | + |[]: /uri + """ .trimMargin(), ) @@ -10937,8 +11885,8 @@ class MarkdownProcessorDocumentParsingTest { *[]: /uri
*/ parsed.assertEquals( - paragraph("\\[\\]"), - paragraph("\\[\\]: /uri"), + paragraph("[]"), + paragraph("[]: /uri"), ) } @@ -10964,8 +11912,8 @@ class MarkdownProcessorDocumentParsingTest { * ]: /uri */ parsed.assertEquals( - paragraph("\\[ \\]"), - paragraph("\\[ \\]: /uri"), + Paragraph(Text("["), SoftLineBreak, Text("]")), + Paragraph(Text("["), SoftLineBreak, Text("]: /uri")), ) } @@ -10974,10 +11922,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo][] - | - |[foo]: /url "title" - """ + |[foo][] + | + |[foo]: /url "title" + """ .trimMargin(), ) @@ -10985,7 +11933,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[foo](/url \"title\")")) + parsed.assertEquals(Paragraph(Link(destination = "/url", title = "title", Text("foo")))) } @Test @@ -10993,10 +11941,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[*foo* bar][] - | - |[*foo* bar]: /url "title" - """ + |[*foo* bar][] + | + |[*foo* bar]: /url "title" + """ .trimMargin(), ) @@ -11004,7 +11952,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[*foo* bar](/url \"title\")")) + parsed.assertEquals( + Paragraph( + Link( + destination = "/url", + title = "title", + Emphasis("*", Text("foo")), + Text(" bar"), + ), + ), + ) } @Test @@ -11012,10 +11969,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[Foo][] - | - |[foo]: /url "title" - """ + |[Foo][] + | + |[foo]: /url "title" + """ .trimMargin(), ) @@ -11023,7 +11980,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[Foo](/url \"title\")")) + parsed.assertEquals(Paragraph(Link(destination = "/url", title = "title", Text("Foo")))) } @Test @@ -11031,11 +11988,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo] - |[] - | - |[foo]: /url "title" - """ + |[foo] + |[] + | + |[foo]: /url "title" + """ .trimMargin(), ) @@ -11044,7 +12001,14 @@ class MarkdownProcessorDocumentParsingTest { *foo * []
*/ - parsed.assertEquals(paragraph("[foo](/url \"title\") \\[\\]")) + parsed.assertEquals( + Paragraph( + Link(destination = "/url", title = "title", Text("foo")), + Text(""), // This looks wrong but apparently is correct + SoftLineBreak, + Text("[]"), + ), + ) } @Test @@ -11052,10 +12016,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo] - | - |[foo]: /url "title" - """ + |[foo] + | + |[foo]: /url "title" + """ .trimMargin(), ) @@ -11063,7 +12027,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[foo](/url \"title\")")) + parsed.assertEquals(Paragraph(Link(destination = "/url", title = "title", Text("foo")))) } @Test @@ -11071,10 +12035,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[*foo* bar] - | - |[*foo* bar]: /url "title" - """ + |[*foo* bar] + | + |[*foo* bar]: /url "title" + """ .trimMargin(), ) @@ -11082,7 +12046,16 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[*foo* bar](/url \"title\")")) + parsed.assertEquals( + Paragraph( + Link( + destination = "/url", + title = "title", + Emphasis("*", Text("foo")), + Text(" bar"), + ), + ), + ) } @Test @@ -11090,10 +12063,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[[*foo* bar]] - | - |[*foo* bar]: /url "title" - """ + |[[*foo* bar]] + | + |[*foo* bar]: /url "title" + """ .trimMargin(), ) @@ -11101,7 +12074,18 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[foo bar]
*/ - parsed.assertEquals(paragraph("\\[[*foo* bar](/url \"title\")\\]")) + parsed.assertEquals( + Paragraph( + Text("["), + Link( + destination = "/url", + title = "title", + Emphasis("*", Text("foo")), + Text(" bar"), + ), + Text("]"), + ), + ) } @Test @@ -11109,10 +12093,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[[bar [foo] - | - |[foo]: /url - """ + |[[bar [foo] + | + |[foo]: /url + """ .trimMargin(), ) @@ -11120,7 +12104,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[[bar foo
*/ - parsed.assertEquals(paragraph("\\[\\[bar [foo](/url)")) + parsed.assertEquals( + Paragraph( + Text("[[bar "), + Link(destination = "/url", title = null, Text("foo")), + ), + ) } @Test @@ -11128,10 +12117,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[Foo] - | - |[foo]: /url "title" - """ + |[Foo] + | + |[foo]: /url "title" + """ .trimMargin(), ) @@ -11139,7 +12128,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[Foo](/url \"title\")")) + parsed.assertEquals(Paragraph(Link(destination = "/url", title = "title", Text("Foo")))) } @Test @@ -11147,10 +12136,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo] bar - | - |[foo]: /url - """ + |[foo] bar + | + |[foo]: /url + """ .trimMargin(), ) @@ -11158,7 +12147,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo bar
*/ - parsed.assertEquals(paragraph("[foo](/url) bar")) + parsed.assertEquals( + Paragraph( + Link(destination = "/url", title = null, Text("foo")), + Text(" bar"), + ), + ) } @Test @@ -11166,10 +12160,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |\[foo] - | - |[foo]: /url "title" - """ + |\[foo] + | + |[foo]: /url "title" + """ .trimMargin(), ) @@ -11177,7 +12171,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[foo]
*/ - parsed.assertEquals(paragraph("\\[foo\\]")) + parsed.assertEquals(paragraph("[foo]")) } @Test @@ -11185,10 +12179,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo*]: /url - | - |*[foo*] - """ + |[foo*]: /url + | + |*[foo*] + """ .trimMargin(), ) @@ -11196,7 +12190,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: **foo*
*/ - parsed.assertEquals(paragraph("\\*[foo\\*](/url)")) + parsed.assertEquals( + Paragraph( + Text("*"), + Link(destination = "/url", title = null, Text("foo*")), + ), + ) } @Test @@ -11204,11 +12203,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo][bar] - | - |[foo]: /url1 - |[bar]: /url2 - """ + |[foo][bar] + | + |[foo]: /url1 + |[bar]: /url2 + """ .trimMargin(), ) @@ -11216,7 +12215,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[foo](/url2)")) + parsed.assertEquals(Paragraph(Link(destination = "/url2", title = null, Text("foo")))) } @Test @@ -11224,10 +12223,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo][] - | - |[foo]: /url1 - """ + |[foo][] + | + |[foo]: /url1 + """ .trimMargin(), ) @@ -11235,7 +12234,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[foo](/url1)")) + parsed.assertEquals(Paragraph(Link(destination = "/url1", title = null, Text("foo")))) } @Test @@ -11243,10 +12242,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo]() - | - |[foo]: /url1 - """ + |[foo]() + | + |[foo]: /url1 + """ .trimMargin(), ) @@ -11254,7 +12253,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[foo]()")) + parsed.assertEquals(Paragraph(Link(destination = "", title = null, Text("foo")))) } @Test @@ -11262,10 +12261,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo](not a link) - | - |[foo]: /url1 - """ + |[foo](not a link) + | + |[foo]: /url1 + """ .trimMargin(), ) @@ -11273,7 +12272,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo(not a link)
*/ - parsed.assertEquals(paragraph("[foo](/url1)\\(not a link\\)")) + parsed.assertEquals( + Paragraph( + Link(destination = "/url1", title = null, Text("foo")), + Text("(not a link)"), + ), + ) } @Test @@ -11281,10 +12285,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo][bar][baz] - | - |[baz]: /url - """ + |[foo][bar][baz] + | + |[baz]: /url + """ .trimMargin(), ) @@ -11292,7 +12296,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[foo]bar
*/ - parsed.assertEquals(paragraph("\\[foo\\][bar](/url)")) + parsed.assertEquals( + Paragraph( + Text("[foo]"), + Link(destination = "/url", title = null, Text("bar")), + ), + ) } @Test @@ -11300,11 +12309,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo][bar][baz] - | - |[baz]: /url1 - |[bar]: /url2 - """ + |[foo][bar][baz] + | + |[baz]: /url1 + |[bar]: /url2 + """ .trimMargin(), ) @@ -11312,7 +12321,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[foo](/url2)[baz](/url1)")) + parsed.assertEquals( + Paragraph( + Link(destination = "/url2", title = null, Text("foo")), + Link(destination = "/url1", title = null, Text("baz")), + ), + ) } @Test @@ -11320,11 +12334,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |[foo][bar][baz] - | - |[baz]: /url1 - |[foo]: /url2 - """ + |[foo][bar][baz] + | + |[baz]: /url1 + |[foo]: /url2 + """ .trimMargin(), ) @@ -11332,7 +12346,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *[foo]bar
*/ - parsed.assertEquals(paragraph("\\[foo\\][bar](/url1)")) + parsed.assertEquals( + Paragraph( + Text("[foo]"), + Link(destination = "/url1", title = null, Text("bar")), + ), + ) } @Test @@ -11343,7 +12362,11 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *
My 
* []
[[foo]]: /url "title"
*/ parsed.assertEquals( - paragraph("\\!\\[\\[foo\\]\\]"), - paragraph("\\[\\[foo\\]\\]: /url \"title\""), + paragraph("![[foo]]"), + paragraph("[[foo]]: /url \"title\""), ) } @@ -11651,10 +12764,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |![Foo] - | - |[foo]: /url "title" - """ + |![Foo] + | + |[foo]: /url "title" + """ .trimMargin(), ) @@ -11662,7 +12775,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *![foo]
*/ - parsed.assertEquals(paragraph("\\!\\[foo\\]")) + parsed.assertEquals(paragraph("![foo]")) } @Test @@ -11689,10 +12802,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |\![foo] - | - |[foo]: /url "title" - """ + |\![foo] + | + |[foo]: /url "title" + """ .trimMargin(), ) @@ -11700,7 +12813,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *!foo
*/ - parsed.assertEquals(paragraph("\\![foo](/url \"title\")")) + parsed.assertEquals( + Paragraph( + Text("!"), + Link(destination = "/url", title = "title", Text("foo")), + ), + ) } @Test @@ -11711,7 +12829,11 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[http://foo.bar.baz](http://foo.bar.baz)")) + parsed.assertEquals( + Paragraph( + Link(destination = "http://foo.bar.baz", title = null, Text("http://foo.bar.baz")), + ), + ) } @Test @@ -11723,8 +12845,12 @@ class MarkdownProcessorDocumentParsingTest { *https://foo.bar.baz/test?q=hello&id=22&boolean
*/ parsed.assertEquals( - paragraph( - "[https://foo.bar.baz/test?q=hello&id=22&boolean](https://foo.bar.baz/test?q=hello&id=22&boolean)", + Paragraph( + Link( + destination = "https://foo.bar.baz/test?q=hello&id=22&boolean", + title = null, + Text("https://foo.bar.baz/test?q=hello&id=22&boolean"), + ), ), ) } @@ -11737,7 +12863,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[irc://foo.bar:2233/baz](irc://foo.bar:2233/baz)")) + parsed.assertEquals( + Paragraph( + Link( + destination = "irc://foo.bar:2233/baz", + title = null, + Text("irc://foo.bar:2233/baz"), + ), + ), + ) } @Test @@ -11748,7 +12882,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[MAILTO:FOO@BAR.BAZ](MAILTO:FOO@BAR.BAZ)")) + parsed.assertEquals( + Paragraph( + Link( + destination = "MAILTO:FOO@BAR.BAZ", + title = null, + Text("MAILTO:FOO@BAR.BAZ"), + ), + ), + ) } @Test @@ -11759,7 +12901,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[a+b+c:d](a+b+c:d)")) + parsed.assertEquals( + Paragraph( + Link( + destination = "a+b+c:d", + title = null, + Text("a+b+c:d"), + ), + ), + ) } @Test @@ -11770,7 +12920,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[made-up-scheme://foo,bar](made-up-scheme://foo,bar)")) + parsed.assertEquals( + Paragraph( + Link( + destination = "made-up-scheme://foo,bar", + title = null, + Text("made-up-scheme://foo,bar"), + ), + ), + ) } @Test @@ -11781,7 +12939,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[https://../](https://../)")) + parsed.assertEquals( + Paragraph( + Link( + destination = "https://../", + title = null, + Text("https://../"), + ), + ), + ) } @Test @@ -11792,7 +12958,15 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("[localhost:5001/foo](localhost:5001/foo)")) + parsed.assertEquals( + Paragraph( + Link( + destination = "localhost:5001/foo", + title = null, + Text("localhost:5001/foo"), + ), + ), + ) } @Test @@ -11803,10 +12977,9 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *<https://foo.bar/baz bim>
*/ - parsed.assertEquals(paragraph("\\<foo+@bar.example.com>
*/ - parsed.assertEquals(paragraph("\\<>
*/ - parsed.assertEquals(paragraph("\\<\\>")) + parsed.assertEquals(paragraph("<>")) } @Test @@ -11874,7 +13067,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *< https://foo.bar >
*/ - parsed.assertEquals(paragraph("\\< https://foo.bar \\>")) + parsed.assertEquals(paragraph("< https://foo.bar >")) } @Test @@ -11885,7 +13078,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *<m:abc>
*/ - parsed.assertEquals(paragraph("\\<foo.bar.baz>
*/ - parsed.assertEquals(paragraph("\\Foo
<33> <__>
*/ - parsed.assertEquals(paragraph("\\<33\\> \\<\\_\\_\\>")) + parsed.assertEquals(paragraph("<33> <__>")) } @Test @@ -12015,7 +13229,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *<a h*#ref="hi">
*/ - parsed.assertEquals(paragraph("\\")) + parsed.assertEquals(paragraph("")) } @Test @@ -12026,7 +13240,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *<a href="hi'> <a href=hi'>
*/ - parsed.assertEquals(paragraph("\\ \\")) + parsed.assertEquals(paragraph(" ")) } @Test @@ -12034,11 +13248,11 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |< a>< - |foo><a href='bar'title=title>
*/ - parsed.assertEquals(paragraph("\\")) + parsed.assertEquals(paragraph("")) } @Test @@ -12075,7 +13295,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *</a href="foo">
*/ - parsed.assertEquals(paragraph("\\")) + parsed.assertEquals(paragraph("")) } @Test @@ -12094,9 +13319,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |foo - """ + |foo + """ .trimMargin(), ) @@ -12105,7 +13330,12 @@ class MarkdownProcessorDocumentParsingTest { *foo
*/ - parsed.assertEquals(paragraph("foo ")) + parsed.assertEquals( + Paragraph( + Text("foo "), + HtmlInline(""), + ), + ) } @Test @@ -12113,10 +13343,10 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |foo foo --> - | - |foo foo --> - """ + |foo foo --> + | + |foo foo --> + """ .trimMargin(), ) @@ -12126,8 +13356,16 @@ class MarkdownProcessorDocumentParsingTest { *foo foo -->
*/ parsed.assertEquals( - paragraph("foo foo --\\>"), - paragraph("foo foo --\\>"), + Paragraph( + Text("foo "), + HtmlInline(""), + Text(" foo -->"), + ), + Paragraph( + Text("foo "), + HtmlInline(""), + Text(" foo -->"), + ), ) } @@ -12139,7 +13377,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo
*/ - parsed.assertEquals(paragraph("foo ")) + parsed.assertEquals( + Paragraph( + Text("foo "), + HtmlInline(""), + ), + ) } @Test @@ -12150,7 +13393,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo
*/ - parsed.assertEquals(paragraph("foo ")) + parsed.assertEquals( + Paragraph( + Text("foo "), + HtmlInline(""), + ), + ) } @Test @@ -12161,7 +13409,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo &<]]>
*/ - parsed.assertEquals(paragraph("foo &<]]>")) + parsed.assertEquals( + Paragraph( + Text("foo "), + HtmlInline("&<]]>"), + ), + ) } @Test @@ -12172,7 +13425,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("foo ")) + parsed.assertEquals( + Paragraph( + Text("foo "), + HtmlInline(""), + ), + ) } @Test @@ -12183,7 +13441,12 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: * */ - parsed.assertEquals(paragraph("foo ")) + parsed.assertEquals( + Paragraph( + Text("foo "), + HtmlInline(""), + ), + ) } @Test @@ -12194,7 +13457,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *<a href=""">
*/ - parsed.assertEquals(paragraph("\\")) + parsed.assertEquals(paragraph("")) } @Test @@ -12202,9 +13465,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |foo - |baz - """ + |foo + |baz + """ .trimMargin(), ) @@ -12213,7 +13476,7 @@ class MarkdownProcessorDocumentParsingTest { *foo
* baz
foo
* baz
foo
* baz
foo
* bar
foo
* bar
foo
* bar
foo
* bar
code span
code\ span
foo\
*/ - parsed.assertEquals(heading(level = 3, "foo\\")) + parsed.assertEquals(heading(level = 3, Text("foo\\"))) } @Test @@ -12445,7 +13712,7 @@ class MarkdownProcessorDocumentParsingTest { * Expected HTML: *foo
*/ - parsed.assertEquals(heading(level = 3, "foo")) + parsed.assertEquals(heading(level = 3, Text("foo"))) } @Test @@ -12453,9 +13720,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |foo - |baz - """ + |foo + |baz + """ .trimMargin(), ) @@ -12464,7 +13731,7 @@ class MarkdownProcessorDocumentParsingTest { *foo * baz
*/ - parsed.assertEquals(paragraph("foo baz")) + parsed.assertEquals(Paragraph(Text("foo"), SoftLineBreak, Text("baz"))) } @Test @@ -12472,9 +13739,9 @@ class MarkdownProcessorDocumentParsingTest { val parsed = processor.processMarkdownDocument( """ - |foo - | baz - """ + |foo + | baz + """ .trimMargin(), ) @@ -12483,7 +13750,7 @@ class MarkdownProcessorDocumentParsingTest { *foo * baz
*/ - parsed.assertEquals(paragraph("foo baz")) + parsed.assertEquals(Paragraph(Text("foo"), SoftLineBreak, Text("baz"))) } @Test diff --git a/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/TestUtils.kt b/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/TestUtils.kt index de0be8a10..7a49e2590 100644 --- a/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/TestUtils.kt +++ b/markdown/core/src/test/kotlin/org/jetbrains/jewel/markdown/TestUtils.kt @@ -1,14 +1,5 @@ package org.jetbrains.jewel.markdown -import org.commonmark.internal.InlineParserContextImpl -import org.commonmark.internal.InlineParserImpl -import org.commonmark.internal.LinkReferenceDefinitions -import org.commonmark.node.Node -import org.commonmark.parser.Parser -import org.commonmark.parser.SourceLine -import org.commonmark.parser.SourceLines -import org.commonmark.renderer.html.HtmlRenderer -import org.intellij.lang.annotations.Language import org.jetbrains.jewel.markdown.MarkdownBlock.BlockQuote import org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock import org.jetbrains.jewel.markdown.MarkdownBlock.CodeBlock.FencedCodeBlock @@ -21,11 +12,11 @@ import org.jetbrains.jewel.markdown.MarkdownBlock.ListBlock.UnorderedList import org.jetbrains.jewel.markdown.MarkdownBlock.ListItem import org.jetbrains.jewel.markdown.MarkdownBlock.Paragraph import org.jetbrains.jewel.markdown.MarkdownBlock.ThematicBreak -import org.junit.Assert +import org.junit.Assert.assertTrue fun List
+
Jewel aims at recreating the IntelliJ Platform's _New UI_ Swing Look and Feel in Compose for Desktop, providing a
desktop-optimized theme and set of components.
@@ -120,7 +120,7 @@ include the `int-ui` module, which is always released from the main branch.
Releases of Jewel are always cut from a tag on the main branch; the HEAD of each `releases/xxx` branch is then tagged
as `[mainTag]-xxx`, and used to publish the artifacts for that major IJP version.
-> ![IMPORTANT]
+> [!IMPORTANT]
> We only support the latest build of IJP for each major IJP version. If the latest 233 version is 2023.3.3, for
> example, we will only guarantee that Jewel works on that. Versions 2023.3.0–2023.3.2 might or might not work.
@@ -130,7 +130,7 @@ The standalone theme can be used in any Compose for Desktop app. You use it as a
to your heart's content. By default, it matches the official Int UI specs.
For an example on how to set up a standalone app, you can refer to
-the [`standalone` sample](samples/standalone/build.gradle.kts).
+the [`standalone` sample](https://github.com/JetBrains/jewel/blob/main/samples/standalone/build.gradle.kts).
> [!WARNING]
> Note that Jewel **requires** the JetBrains Runtime to work correctly. Some features like font loading depend on it,
@@ -152,7 +152,7 @@ If you want more control over the theming, you can use other `IntUiTheme` overlo
The JetBrains Runtime allows windows to have a custom decoration instead of the regular title bar.
-
+
The standalone sample app shows how to easily get something that looks like a JetBrains IDE; if you want to go _very_
custom, you only need to depend on the `decorated-window` module, which contains all the required primitives, but not
@@ -214,7 +214,7 @@ and the branch on which the corresponding bridge code lives:
| 2023.1 or older | **Not supported** |
For an example on how to set up an IntelliJ Plugin, you can refer to
-the [`ide-plugin` sample](samples/ide-plugin/build.gradle.kts).
+the [`ide-plugin` sample](https://github.com/JetBrains/jewel/blob/main/samples/ide-plugin/build.gradle.kts).
#### Accessing icons
diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownEditor.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownEditor.kt
index 9e5b7059d..08b3cd56b 100644
--- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownEditor.kt
+++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownEditor.kt
@@ -24,7 +24,6 @@ import com.darkrockstudios.libraries.mpfilepicker.JvmFile
import org.jetbrains.jewel.foundation.theme.JewelTheme
import org.jetbrains.jewel.samples.standalone.StandaloneSampleIcons
import org.jetbrains.jewel.ui.Orientation
-import org.jetbrains.jewel.ui.component.Checkbox
import org.jetbrains.jewel.ui.component.Divider
import org.jetbrains.jewel.ui.component.Icon
import org.jetbrains.jewel.ui.component.OutlinedButton
@@ -36,14 +35,12 @@ import org.jetbrains.jewel.ui.component.TextArea
internal fun MarkdownEditor(
currentMarkdown: String,
onMarkdownChange: (String) -> Unit,
- onLinksEnabledChange: (Boolean) -> Unit,
modifier: Modifier = Modifier,
) {
Column(modifier) {
ControlsRow(
modifier = Modifier.fillMaxWidth().background(JewelTheme.globalColors.panelBackground).padding(8.dp),
onMarkdownChange = onMarkdownChange,
- onLinksEnabledChange = onLinksEnabledChange,
)
Divider(orientation = Orientation.Horizontal)
Editor(
@@ -58,7 +55,6 @@ internal fun MarkdownEditor(
private fun ControlsRow(
modifier: Modifier = Modifier,
onMarkdownChange: (String) -> Unit,
- onLinksEnabledChange: (Boolean) -> Unit,
) {
Row(
modifier.horizontalScroll(rememberScrollState()),
@@ -125,20 +121,6 @@ private fun ControlsRow(
}
}
}
-
- var linksAreEnabled by remember { mutableStateOf(true) }
- Row(
- verticalAlignment = Alignment.CenterVertically,
- ) {
- Text("Links enabled")
- Checkbox(
- checked = linksAreEnabled,
- onCheckedChange = {
- linksAreEnabled = it
- onLinksEnabledChange(it)
- },
- )
- }
}
}
diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownPreview.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownPreview.kt
index 072c29f53..6c1bd4996 100644
--- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownPreview.kt
+++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/markdown/MarkdownPreview.kt
@@ -34,7 +34,6 @@ import org.jetbrains.jewel.markdown.extensions.github.alerts.AlertStyling
import org.jetbrains.jewel.markdown.extensions.github.alerts.GitHubAlertProcessorExtension
import org.jetbrains.jewel.markdown.extensions.github.alerts.GitHubAlertRendererExtension
import org.jetbrains.jewel.markdown.processing.MarkdownProcessor
-import org.jetbrains.jewel.markdown.rendering.InlineMarkdownRenderer
import org.jetbrains.jewel.markdown.rendering.MarkdownBlockRenderer
import org.jetbrains.jewel.markdown.rendering.MarkdownStyling
import org.jetbrains.jewel.ui.component.VerticalScrollbar
@@ -45,7 +44,6 @@ import java.net.URI
internal fun MarkdownPreview(
modifier: Modifier = Modifier,
rawMarkdown: String,
- linksAreEnabled: Boolean,
) {
val isDark = JewelTheme.isDark
@@ -53,12 +51,12 @@ internal fun MarkdownPreview(
remember(isDark) { if (isDark) MarkdownStyling.dark() else MarkdownStyling.light() }
var markdownBlocks by remember { mutableStateOf(emptyList