- ");
+ html.append(ordered ? "
- first "), "item first"); assertTrue(html.contains("
- second "), "item second"); } @@ -275,8 +275,8 @@ void testNestedOrderedList() { String md = "1. first\n 1. sub-first\n 2. sub-second\n2. second"; String html = MarkdownRenderer.toHtml(md); // outer ol must contain an inner ol - int outerOl = html.indexOf("
- first ") || html.contains("
- first"),
"outer first item");
@@ -304,7 +304,7 @@ void testNestedUnorderedList() {
void testMixedNestedList() {
String md = "1. item\n - nested-ul\n2. item2";
String html = MarkdownRenderer.toHtml(md);
- assertTrue(html.contains("
- "), "outer ol");
+ assertTrue(html.contains("
- , not between two separate
- elements
+ String md = "1. Item one\n\n ```bash\n code here\n ```\n\n2. Item two\n";
+ String html = MarkdownRenderer.toHtml(md);
+ //
must not appear before
- "), "outer ol");
assertTrue(html.contains("
- "), "inner ul");
assertTrue(html.contains("nested-ul"), "nested item text");
}
@@ -354,4 +354,73 @@ void testResolveImagePathsWindowsBackslashesNormalized() {
String result = MarkdownRenderer.resolveImagePaths(html, "C:\\docs\\project");
assertEquals("
![\"\"](\"file://C:/docs/project/img.png\")
", result);
}
+
+ // -------------------------------------------------------------------------
+ // Ordered list numbering after code blocks
+ // -------------------------------------------------------------------------
+
+ @Test
+ void testOrderedListExplicitStartAttribute() {
+ // A list starting at 3 must emit -
+ String html = MarkdownRenderer.toHtml("3. Third\n4. Fourth\n");
+ assertTrue(html.contains("
- "),
+ "Expected
- but got: " + html);
+ }
+
+ @Test
+ void testIndentedCodeBlockDoesNotResetNumbering() {
+ // Code block indented inside a list item — both items must be in ONE
-
+ String md = "1. Item one\n\n ```bash\n code\n ```\n\n2. Item two\n";
+ String html = MarkdownRenderer.toHtml(md);
+ // Only one
- should exist; items continue in the same list
+ int firstOl = html.indexOf("
- ; got: " + html);
+ assertTrue(html.contains("Item one") && html.contains("Item two"),
+ "Both items must be present: " + html);
+ }
+
+ @Test
+ void testIndentedCodeBlockInsideLi() {
+ //
must be inside
+ int liClose = html.indexOf("");
+ int preOpen = html.indexOf(" - , not between two separate
- " : "
- ");
indentStack.add(indent);
typeStack.add(ordered);
} else {
int topIndent = indentStack.get(indentStack.size() - 1);
if (indent > topIndent) {
- html.append(ordered ? "
- " : "
- ");
+ html.append(ordered ? "
- " : "
- ");
indentStack.add(indent);
typeStack.add(ordered);
} else if (indent < topIndent) {
@@ -552,7 +580,7 @@ private static int renderNestedList(String[] lines, int start, StringBuilder htm
if (!typeStack.isEmpty() && typeStack.get(typeStack.size() - 1) != ordered) {
html.append(typeStack.get(typeStack.size() - 1) ? "
- " : "
- ");
+ html.append(ordered ? "
- " : "
- ");
}
}
@@ -573,5 +601,31 @@ private static int leadingSpaces(String line) {
return n;
}
+ private static int orderedListNumber(String line) {
+ java.util.regex.Matcher m =
+ java.util.regex.Pattern.compile("^\\s*(\\d+)\\.\\s+").matcher(line);
+ return m.find() ? Integer.parseInt(m.group(1)) : 1;
+ }
+
+ private static String dedent(String code) {
+ String[] lines = code.split("\n", -1);
+ int min = Integer.MAX_VALUE;
+ for (String l : lines) {
+ if (!l.isBlank()) {
+ int sp = 0;
+ while (sp < l.length() && l.charAt(sp) == ' ') sp++;
+ min = Math.min(min, sp);
+ }
+ }
+ if (min == 0 || min == Integer.MAX_VALUE) return code;
+ StringBuilder sb = new StringBuilder();
+ for (int k = 0; k < lines.length; k++) {
+ String l = lines[k];
+ sb.append(l.length() >= min ? l.substring(min) : l);
+ if (k < lines.length - 1) sb.append('\n');
+ }
+ return sb.toString();
+ }
+
private MarkdownRenderer() {}
}
diff --git a/src/test/java/io/github/nbclaudecodegui/ui/common/MarkdownRendererTest.java b/src/test/java/io/github/nbclaudecodegui/ui/common/MarkdownRendererTest.java
index 0ea16901..84d8772b 100644
--- a/src/test/java/io/github/nbclaudecodegui/ui/common/MarkdownRendererTest.java
+++ b/src/test/java/io/github/nbclaudecodegui/ui/common/MarkdownRendererTest.java
@@ -89,7 +89,7 @@ void testUnorderedList() {
@Test
void testOrderedList() {
String html = MarkdownRenderer.toHtml("1. first\n2. second");
- assertTrue(html.contains("
- "), "ol open");
+ assertTrue(html.contains("
- "), "ol open");
assertTrue(html.contains("
- ");
- int innerOl = html.indexOf("
- ", outerOl + 1);
+ int outerOl = html.indexOf("
- must exist inside outer
- ");
assertTrue(html.contains("
"); + assertTrue(preOpen > 0, "Expectedin: " + html); + assertTrue(preOpen < liClose, + "must appear before the first ; got: " + html); + } + + @Test + void testTopLevelCodeBlockResetsNumbering() { + // Top-level code block between two lists — second list starts at 1 + String md = "1. Item A\n\n```\ntop level\n```\n\n1. New list\n"; + String html = MarkdownRenderer.toHtml(md); + long count = html.chars().filter(c -> c == '1') + .count(); // rough: just assert nofor the second list + assertFalse(html.contains("
"), + "Top-level code block should reset numbering; must not have
but got: " + html); + } + + // ------------------------------------------------------------------------- + // Indented code block — no leading spaces in
+ // ------------------------------------------------------------------------- + + @Test + void testIndentedFencedCodeBlockNoLeadingSpaces() { + String md = "1. Item\n\n ```bash\n mkdir foo\n ```\n\n2. Done\n"; + String html = MarkdownRenderer.toHtml(md); + // Extractcontent and verify no leading spaces + int preStart = html.indexOf("") + "".length(); + int preEnd = html.indexOf(""); + assertTrue(preStart > 0 && preEnd > preStart, "Expectedblock in: " + html); + String preContent = html.substring(preStart, preEnd); + assertFalse(preContent.startsWith(" "), + "Code block content must not start with spaces but got: [" + preContent + "]"); + assertTrue(preContent.contains("mkdir foo"), + "Code block must contain the command: " + preContent); + } }