fix(HTMLParser): fix code tags parsing

tivie · tivie · commit 71a587390256 · 2016-01-25T03:01:54.000Z
Closes #231
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/converter.js b/src/converter.js
@@ -276,6 +276,7 @@ showdown.Converter = function (converterOptions) {
     });
 
     // run the sub parsers
+    text = showdown.subParser('hashPreCodeTags')(text, options, globals);
     text = showdown.subParser('githubCodeBlocks')(text, options, globals);
     text = showdown.subParser('hashHTMLBlocks')(text, options, globals);
     text = showdown.subParser('hashHTMLSpans')(text, options, globals);
diff --git a/src/subParsers/hashPreCodeTags.js b/src/subParsers/hashPreCodeTags.js
@@ -0,0 +1,15 @@
+/**
+ * Hash span elements that should not be parsed as markdown
+ */
+showdown.subParser('hashPreCodeTags', function (text, config, globals) {
+  'use strict';
+
+  var repFunc = function (wholeMatch, match, left, right) {
+    // encode html entities
+    var codeblock = left + showdown.subParser('encodeCode')(match) + right;
+    return '\n\n~G' + (globals.ghCodeBlocks.push({text: wholeMatch, codeblock: codeblock}) - 1) + 'G\n\n';
+  };
+
+  text = showdown.helper.replaceRecursiveRegExp(text, repFunc, '^(?: |\\t){0,3}<pre\\b[^>]*>\\s*<code\\b[^>]*>', '^(?: |\\t){0,3}</code>\\s*</pre>', 'gim');
+  return text;
+});
diff --git a/src/subParsers/paragraphs.js b/src/subParsers/paragraphs.js
@@ -31,7 +31,6 @@ showdown.subParser('paragraphs', function (text, options, globals) {
   for (i = 0; i < end; i++) {
     var blockText = '',
         grafsOutIt = grafsOut[i],
-        child = false,
         codeFlag = false;
     // if this is a marker for an html block...
     while (grafsOutIt.search(/~(K|G)(\d+)\1/) >= 0) {
@@ -42,7 +41,12 @@ showdown.subParser('paragraphs', function (text, options, globals) {
         blockText = globals.gHtmlBlocks[num];
       } else {
         // we need to check if ghBlock is a false positive
-        blockText = (codeFlag) ? globals.ghCodeBlocks[num].text : globals.ghCodeBlocks[num].codeblock;
+        if (codeFlag) {
+          // use encoded version of all text
+          blockText = showdown.subParser('encodeCode')(globals.ghCodeBlocks[num].text);
+        } else {
+          blockText = globals.ghCodeBlocks[num].codeblock;
+        }
       }
       blockText = blockText.replace(/\$/g, '$$$$'); // Escape any dollar signs
 
@@ -51,7 +55,6 @@ showdown.subParser('paragraphs', function (text, options, globals) {
       if (/^<pre\b[^>]*>\s*<code\b[^>]*>/.test(grafsOutIt)) {
         codeFlag = true;
       }
-      child = true;
     }
     grafsOut[i] = grafsOutIt;
   }
diff --git a/test/cases/pre-code-tags-inside-code-block.html b/test/cases/pre-code-tags-inside-code-block.html
@@ -0,0 +1,7 @@
+<p>code inception</p>
+
+<pre><code>&lt;pre&gt;&lt;code&gt;
+&lt;div&gt;some html code inside code html tags inside a fenced code block&lt;/div&gt;
+&lt;/code&gt;&lt;/pre&gt;
+</code></pre>
+
diff --git a/test/cases/pre-code-tags-inside-code-block.md b/test/cases/pre-code-tags-inside-code-block.md
@@ -0,0 +1,8 @@
+code inception
+
+```
+<pre><code>
+<div>some html code inside code html tags inside a fenced code block</div>
+</code></pre>
+```
+
diff --git a/test/cases/pre-code-tags.html b/test/cases/pre-code-tags.html
@@ -0,0 +1,16 @@
+<pre>
+<code>
+foobar
+</code>
+</pre>
+
+<p>blabla</p>
+
+<pre nhaca="zulu"><code bla="bla">
+foobar
+</code>
+</pre>
+
+<pre><code>
+&lt;div&gt;some html code&lt;/div&gt;
+</code></pre>
diff --git a/test/cases/pre-code-tags.md b/test/cases/pre-code-tags.md
@@ -0,0 +1,17 @@
+<pre>
+<code>
+foobar
+</code>
+</pre>
+
+blabla
+
+<pre nhaca="zulu"><code bla="bla">
+foobar
+</code>
+</pre>
+
+<pre><code>
+<div>some html code</div>
+</code></pre>
+
diff --git a/test/issues/#229.2.code-being-parsed-inside-HTML-code-tags.html b/test/issues/#229.2.code-being-parsed-inside-HTML-code-tags.html
@@ -1,12 +1,12 @@
 <pre lang="no-highlight"><code>
-    foo
+foo
 
-    ```javascript
-    var s = "JavaScript syntax highlighting";
-    alert(s);
-    ```
+```javascript
+var s = "JavaScript syntax highlighting";
+alert(s);
+```
 
-    bar
+bar
 </code></pre>
 
 <p>this is a long paragraph</p>
diff --git a/test/issues/#229.code-being-parsed-inside-HTML-code-tags.html b/test/issues/#229.code-being-parsed-inside-HTML-code-tags.html
@@ -11,6 +11,6 @@
 
 ```
 No language indicated, so no syntax highlighting.
-But let's throw in a <b>tag</b>.
+But let's throw in a &lt;b&gt;tag&lt;/b&gt;.
 ```
 </code></pre>
diff --git a/test/issues/#230.paragraphs-are-ignored-between-code-tags.html b/test/issues/#230.paragraphs-are-ignored-between-code-tags.html
@@ -0,0 +1,12 @@
+<pre lang="no-highlight"><code>```python
+var s;
+```
+</code></pre>
+
+<p>this is a long paragraph</p>
+
+<pre lang="no-highlight"><code>
+```javascript
+var s;
+```
+</code></pre>
diff --git a/test/issues/#230.paragraphs-are-ignored-between-code-tags.md b/test/issues/#230.paragraphs-are-ignored-between-code-tags.md
@@ -0,0 +1,12 @@
+<pre lang="no-highlight"><code>```python
+var s;
+```
+</code></pre>
+
+this is a long paragraph
+
+<pre lang="no-highlight"><code>
+```javascript
+var s;
+```
+</code></pre>
