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(