From 6f0ba6ca34e6f9dcac504c726edb130e98744b64 Mon Sep 17 00:00:00 2001 From: Mradul Singh Date: Sat, 21 Nov 2026 11:28:55 +0530 Subject: [PATCH 1/2] End the fenced code language at a tab, not only a space ```pyx rendered class="language-pyx"; cmark and commonmark.js end the first word of the info string at any whitespace. --- .../renderer/html/CoreHtmlNodeRenderer.java | 12 ++++++------ .../commonmark/test/FencedCodeBlockParserTest.java | 10 ++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/commonmark/src/main/java/org/commonmark/renderer/html/CoreHtmlNodeRenderer.java b/commonmark/src/main/java/org/commonmark/renderer/html/CoreHtmlNodeRenderer.java index 418bf606..e72b8ba5 100644 --- a/commonmark/src/main/java/org/commonmark/renderer/html/CoreHtmlNodeRenderer.java +++ b/commonmark/src/main/java/org/commonmark/renderer/html/CoreHtmlNodeRenderer.java @@ -8,6 +8,7 @@ import java.util.Set; import org.commonmark.node.*; import org.commonmark.renderer.NodeRenderer; +import org.commonmark.text.Characters; /** * The node renderer that renders all the core nodes (comes last in the order of node renderers). @@ -111,13 +112,12 @@ public void visit(FencedCodeBlock fencedCodeBlock) { Map attributes = new LinkedHashMap<>(); String info = fencedCodeBlock.getInfo(); if (info != null && !info.isEmpty()) { - int space = info.indexOf(" "); - String language; - if (space == -1) { - language = info; - } else { - language = info.substring(0, space); + // The language is the first word of the info string, which ends at a space or tab + int end = 0; + while (end < info.length() && !Characters.isSpaceOrTab(info, end)) { + end++; } + String language = info.substring(0, end); attributes.put("class", "language-" + language); } renderCodeBlock(literal, fencedCodeBlock, attributes); diff --git a/commonmark/src/test/java/org/commonmark/test/FencedCodeBlockParserTest.java b/commonmark/src/test/java/org/commonmark/test/FencedCodeBlockParserTest.java index 02fec0fa..c1fea209 100644 --- a/commonmark/src/test/java/org/commonmark/test/FencedCodeBlockParserTest.java +++ b/commonmark/src/test/java/org/commonmark/test/FencedCodeBlockParserTest.java @@ -57,6 +57,16 @@ public void tildeInfoCanStartWithBacktick() { """); } + @Test + public void languageEndsAtTab() { + assertRendering( + "```py\tx\ncode\n```\n", + """ +
code
+                
+ """); + } + @Test public void backtickInfoDoesntAllowBacktick() { assertRendering( From 3667dff406c1e53d2d29efbfc048399b9816f271 Mon Sep 17 00:00:00 2001 From: Mradul Singh Date: Sun, 22 Nov 2026 20:32:58 +0530 Subject: [PATCH 2/2] Move fenced code language tab test to HtmlRendererTest --- .../org/commonmark/test/FencedCodeBlockParserTest.java | 10 ---------- .../java/org/commonmark/test/HtmlRendererTest.java | 6 ++++++ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/commonmark/src/test/java/org/commonmark/test/FencedCodeBlockParserTest.java b/commonmark/src/test/java/org/commonmark/test/FencedCodeBlockParserTest.java index c1fea209..02fec0fa 100644 --- a/commonmark/src/test/java/org/commonmark/test/FencedCodeBlockParserTest.java +++ b/commonmark/src/test/java/org/commonmark/test/FencedCodeBlockParserTest.java @@ -57,16 +57,6 @@ public void tildeInfoCanStartWithBacktick() { """); } - @Test - public void languageEndsAtTab() { - assertRendering( - "```py\tx\ncode\n```\n", - """ -
code
-                
- """); - } - @Test public void backtickInfoDoesntAllowBacktick() { assertRendering( diff --git a/commonmark/src/test/java/org/commonmark/test/HtmlRendererTest.java b/commonmark/src/test/java/org/commonmark/test/HtmlRendererTest.java index cd0811c2..d68de151 100644 --- a/commonmark/src/test/java/org/commonmark/test/HtmlRendererTest.java +++ b/commonmark/src/test/java/org/commonmark/test/HtmlRendererTest.java @@ -303,6 +303,12 @@ public void orderedListStartZero() { .isEqualTo("
    \n
  1. Test
  2. \n
\n"); } + @Test + public void fencedCodeLanguageEndsAtTab() { + assertThat(defaultRenderer().render(parse("```py\tx\ncode\n```\n"))) + .isEqualTo("
code\n
\n"); + } + @Test public void imageAltTextWithSoftLineBreak() { assertThat(defaultRenderer().render(parse("![foo\nbar](/url)\n")))