fix(gfm-codeblock): add support for spaces before language declaration

One or more spaces before the language declaration of a code block is supported by Github. E.g. ``` html <div>HTML!</div> ``` ``` html <div>HTML!</div> ``` ```html <div>HTML!</div> ``` Closes #569
showdownjs · Oct 16, 2018 · 24bf7b1 · 24bf7b1
1 parent c716758
commit 24bf7b1
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 5 deletions.
diff --git a/dist/showdown.js b/dist/showdown.js
diff --git a/dist/showdown.js.map b/dist/showdown.js.map
diff --git a/dist/showdown.min.js b/dist/showdown.min.js
diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map
diff --git a/src/subParsers/githubCodeBlocks.js b/src/subParsers/githubCodeBlocks.js
@@ -20,7 +20,7 @@ showdown.subParser('githubCodeBlocks', function (text, options, globals) {
 
   text += '¨0';
 
-  text = text.replace(/(?:^|\n)(```+|~~~+)([^\s`~]*)\n([\s\S]*?)\n\1/g, function (wholeMatch, delim, language, codeblock) {
+  text = text.replace(/(?:^|\n)(```+|~~~+)(?: *)([^\s`~]*)\n([\s\S]*?)\n\1/g, function (wholeMatch, delim, language, codeblock) {
     var end = (options.omitExtraWLInCodeBlocks) ? '' : '\n';
 
     // First parse the github code block

diff --git a/test/cases/github-style-codeblock.html b/test/cases/github-style-codeblock.html
@@ -6,6 +6,11 @@
 <p>And some HTML</p>
 <pre><code class="html language-html">&lt;div&gt;HTML!&lt;/div&gt;
 </code></pre>
+<p>And some CSS with spaces before the language declaration</p>
+<pre><code class="css language-css">body {
+font-size: 1.5em;
+}
+</code></pre>
 <p>Use more than 3 backticks</p>
 <pre><code>some code
 </code></pre>

diff --git a/test/cases/github-style-codeblock.md b/test/cases/github-style-codeblock.md
@@ -13,6 +13,14 @@ And some HTML
 <div>HTML!</div>
 ```
 
+And some CSS with spaces before the language declaration
+
+```    css
+body {
+    font-size: 1.5em;
+}
+```
+
 Use more than 3 backticks
 
 `````