From 71a5873902568a169d59da6b78ee42e7d97b5dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Estev=C3=A3o=20Soares=20dos=20Santos?= Date: Mon, 25 Jan 2016 03:01:54 +0000 Subject: [PATCH] fix(HTMLParser): fix code tags parsing Closes #231 --- dist/showdown.js | Bin 71622 -> 72405 bytes dist/showdown.js.map | Bin 229327 -> 228797 bytes dist/showdown.min.js | Bin 27848 -> 28235 bytes dist/showdown.min.js.map | Bin 31636 -> 31964 bytes src/converter.js | 1 + src/subParsers/hashPreCodeTags.js | 15 +++++++++++++++ src/subParsers/paragraphs.js | 9 ++++++--- .../pre-code-tags-inside-code-block.html | 7 +++++++ test/cases/pre-code-tags-inside-code-block.md | 8 ++++++++ test/cases/pre-code-tags.html | 16 ++++++++++++++++ test/cases/pre-code-tags.md | 17 +++++++++++++++++ ...de-being-parsed-inside-HTML-code-tags.html | 12 ++++++------ ...de-being-parsed-inside-HTML-code-tags.html | 2 +- ...agraphs-are-ignored-between-code-tags.html | 12 ++++++++++++ ...aragraphs-are-ignored-between-code-tags.md | 12 ++++++++++++ 15 files changed, 101 insertions(+), 10 deletions(-) create mode 100644 src/subParsers/hashPreCodeTags.js create mode 100644 test/cases/pre-code-tags-inside-code-block.html create mode 100644 test/cases/pre-code-tags-inside-code-block.md create mode 100644 test/cases/pre-code-tags.html create mode 100644 test/cases/pre-code-tags.md create mode 100644 test/issues/#230.paragraphs-are-ignored-between-code-tags.html create mode 100644 test/issues/#230.paragraphs-are-ignored-between-code-tags.md diff --git a/dist/showdown.js b/dist/showdown.js index 6d30511fb82a765d452f5cf44ca5cbdedff58999..cbf5522c01565e25068070d3f1bd61dcee7f867d 100644 GIT binary patch delta 388 zcmX@Mp5^LRmJP>Z_%afUGXjcIo%2&tLlV;`FZeD$*)~>o^19`Mo3F=Qj+s1RGW%rK z?V(&qY98*entb6O8+(CUXZ1j1isudJ->xZemGthNgnHLQ!UVMv3)gp*8tT)?AaV=1NVr-(v1n zP?Q=IlN23i7pr9#6H}~Z12PpZqOPN$9;ab%rBD+SQ=(aIpkrKXqYqL6QL7KsZ3j}5 zo|&sYIq|Ia=6yRIOeWv{z_nTaoin3vW}1QqNVQu|V!Eb6HJ1V$06kDzoC@_sib7dx zQE_H|oZHVec)iJ4qqCbBtakAn$MMrKZmf~`VYVoq`D=7k?37$>j%#KWtR zoS%~FmXnySsbH@#Irozsvw{_fmYRJ2li=o8p9~oJ6%>-8dP|B*Q>{0PemS590EGrA AP5=M^ diff --git a/dist/showdown.js.map b/dist/showdown.js.map index a64543d2667c561947b5103bb1fc8743242bec5c..79e29c978f21037b403f85206ea4458bba7c533f 100644 GIT binary patch delta 10327 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 diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 6fe4aeea7a2ef29f6a5c4ee58ce074a26d22fed0..780bf15a975510a43b9403d6bc64bf539ca8d472 100644 GIT binary patch delta 361 zcmX?clkxN&#tocm{27VG839G9&iN^+A&Ke5lN(eeH*>0eQ{Y1rKjKo$0;X2IlDMIKh`Q2B$VNtpOOj}(<@1>D6v8po*Wlj&6R7b QXrQT+10*-!i_H}P0C6TVbN~PV diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index d3e6f24ef613c333047f26463ec57ada73f47345..6482e8cb031e65c04d1b93e8e67431c2858029c5 100644 GIT binary patch delta 2364 zcmbVN%}-=S5D$sTPL>1|Vfk2OB@o$_x6TlTuVcNQp62lw-aKXocGjq2ahWe*KA0IE zLpCHHym@MGMm^{sU_!j={uACzhDZ8dJ~Mp!Eas2vPyEG*1K=DaETx0B z@q~;DOQE5aq)$FbS`xskN%~|Cgp~uxS=#{H(|j&dv@HRmEHMpuw3{y^^rvpT#|NjV z(3*fH45f44-GNd9ppvlm1VB|-8E_gav#x&q@$hMS{m#G*H?S=SR&={?|HdZflj{ln zePQAxCJBnakm4MRDO`yiL4f?Iu@%;ErOI{#tAIq_N&#$OA_*ebRD4iad4$$dxUc5y zWwgoM40&BEitF@ij!Lb%z~_R& z>716z_g{+?n2dZ;f3@%Tlt?k<^6{;r{&WAVFHU8HZ*79yz<KE0K{=GC~Lm?p7 zG<>%7Xl=AB&`Y&@{qbe1V1wA;qFqXx3v|1dnOY=DmlcqA%(h&Bvd!sID4+*w0~5j4 zq5ictHPGg`8KP)Gpn_CMOI!7c_XCd>7cE76mw4ZuqbT6-vT~U`9!p{Wd61NtS^c-n zxAfEcV5F1ggfV?qzkR#S2_3YEl|zqU`(+XqQWgE`AiTii3=tjTOBRvA8x6_dsV_DvN%Y<5WDk3#Z2=tE-2q_Uy! zbXxz=7`Xx)8$qVvtsNN}mtzvFz_yn7yJ+Qdm-j#JgYG>1;2=6Z8` z?~z1!*YH=$`YJ789l2PRrVY6()=Dgz-&`e@+#{131FL;|k4BSBawnKZ3Om90q>AaQ zod9YI=b|doKuAKtbOYaoRGG+?Sz~hp{dH>y7FQ@`c*g^QIpssP4|@$2q0P15NFRf%kA8?AjImv^~~)Zlf8|LEH0J*hUVcCpbLm`ru3u z**cf$`pj>NUW*+4Rb~Q4xh=25l>92du5G5AhiDOCme_HtAr%zET+Bxt4;7-JM%$?L ztj#0LLwXoV#ReCjEeC~}W3k^iDKdxPO#mQHM3NVgD-orKZ}0_2+m zI~9ZLQt8QgQ#xu(4`p-NsPGs>+rBP7miG{KCy}oLtN1M8D*J}OM(T#VSFovH1h-C* zHIiDI2D?Cs?_b$Qm^6^iVdjz6tAyY?C9_q-QO)QW9tc;61RDZ{d;~Z*5ivH*1rG&# z-yX-AMumjukp=Ai2ULKU<>Vdx?NM>8M0VKj&;`YS*ju>t;(QVF4gGHCo5>>{LsdJF zq-};@MNu|%Vv+Q0#`Me1P!HaFoT8g_3*bRP4<5hW6D2)V&O+tMB#-a)7JcN!&Cat@ K?t*@DJop#a`=n_A delta 2286 zcma)7&u<$=6qZp$15tYjZIYrS6jG5^*~mCieo3fkc0As!H|x#Db`n>rDkp8Sws-wI zwzH%%NL+gw&Pa$q0FckXi5n6Zj!2x~ggC$fapS!=n-Yie z_(V2k&LqZ(Ol^x@NL1`IWag z?rMVZ9j+OS?ZIEMlajxAbNwZOEAEC3Ntm->!y7;15Wrk7Lu;iBycuP^orJw)L9-d# z4U(8G-!UkVYX!y%T?6)wx{gc5Q0>%Btq5RIOS7QJ2_9xH?TtU%^o5pZqMa(r zckC(oUFqHgA=`tK;s8rC>_F@eX38tEhqVl4OdvL9B6z+7Yk=d>&p;wx)+@AUVVntT zE>u=aCbS^hx^LlGhvBak=NRBpugpvgKCdi}jFyOpLRtP)bFWoW5NKEwUMx#d|KY(Z zb_}rg02ch?W(QFv*$T2Aq|<=POEZQ+PHh_>mX>8K-%(OqL?Q>rk}Q<( zH|}0v-PDeC#&?M^3nAu1`DG(JvH<+bZ<`ZWLmk46UBJMKr*geHf1^j)vp|Be#@B3W zvMbxoxs}ktmu!o}9?O$5723DfFbi{iQY~A6FuN{bDJ2%ZL0I%-@gW*WqO z+{TBqE;}c4qftO0KR%fr4WHZZk0*EfLj;W{ zmeKY?w6+NQ4zRWr|nETE<*eui^a?DeTu$CX0Nd4%ub-X=l1$ zQXZk(VEf3o$f-3eRE}tG5_s*9vBw$^Smg_8EEmlLh=M_JAAMpj;eX^9wq2YA3{%3x zguKk?(gbSit0;mBlj-jGD==fw;#y5-;t?cDvOw0lGqI|C+MT*pp>)_UiyEMN?$o!5 zsD}Ky``Yad#L9h44RH?538Nn64PZFKux!3tYH03m3%ls6f6&V z@vCY)TWG9YOMcXwdBNM3U-V|Kt2v0U07(w{up080-ee!h$9dL3Cit?h3P8^&j8@TM z;-gY2c1&Q*sDS!vILgPiQuf@4G>*&yve@BD42}g|5|Hl>2`E1}z1fc>yBKv8C}}P< zlv<}`mz94EW%SFULzDMGZxnYJap02JTcl}(IM$Lg;bh-KZdjJ~gNza#Sg?UQXeBN# zwE|Je)37M=oYRpXfT03yjVaV>G;n{vkK0Ld1&BO1ukw-t^($llMZ%aeOx6b3 SeUHIOanwpupFRDJCw~GUvWs>A diff --git a/src/converter.js b/src/converter.js index 57d0a23..1213a6d 100644 --- 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 new file mode 100644 index 0000000..8315d95 --- /dev/null +++ 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}]*>\\s*]*>', '^(?: |\\t){0,3}\\s*', 'gim'); + return text; +}); diff --git a/src/subParsers/paragraphs.js b/src/subParsers/paragraphs.js index 7f19c38..b5673df 100644 --- 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 (/^]*>\s*]*>/.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 new file mode 100644 index 0000000..66544da --- /dev/null +++ b/test/cases/pre-code-tags-inside-code-block.html @@ -0,0 +1,7 @@ +

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-inside-code-block.md b/test/cases/pre-code-tags-inside-code-block.md new file mode 100644 index 0000000..79b57f2 --- /dev/null +++ b/test/cases/pre-code-tags-inside-code-block.md @@ -0,0 +1,8 @@ +code inception + +``` +

+
some html code inside code html tags inside a fenced code block

+
+``` + diff --git a/test/cases/pre-code-tags.html b/test/cases/pre-code-tags.html new file mode 100644 index 0000000..573b388 --- /dev/null +++ b/test/cases/pre-code-tags.html @@ -0,0 +1,16 @@ +
+
+foobar
+
+
+ +

blabla

+ +

+foobar
+
+
+ +

+<div>some html code</div>
+
diff --git a/test/cases/pre-code-tags.md b/test/cases/pre-code-tags.md new file mode 100644 index 0000000..ab1d543 --- /dev/null +++ b/test/cases/pre-code-tags.md @@ -0,0 +1,17 @@ +
+
+foobar
+
+
+ +blabla + +

+foobar
+
+
+ +

+
some html code

+
+ 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 index 4f53c72..dff2c46 100644 --- 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 @@ 

-    foo
+foo
 
-    ```javascript
-    var s = "JavaScript syntax highlighting";
-    alert(s);
-    ```
+```javascript
+var s = "JavaScript syntax highlighting";
+alert(s);
+```
 
-    bar
+bar

this is a long paragraph

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 index 5a148ce..deba3d4 100644 --- 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 @@ print s ``` No language indicated, so no syntax highlighting. -But let's throw in a tag. +But let's throw in a <b>tag</b>. ``` diff --git a/test/issues/#230.paragraphs-are-ignored-between-code-tags.html b/test/issues/#230.paragraphs-are-ignored-between-code-tags.html new file mode 100644 index 0000000..1f2492a --- /dev/null +++ b/test/issues/#230.paragraphs-are-ignored-between-code-tags.html @@ -0,0 +1,12 @@ +
```python
+var s;
+```
+
+ +

this is a long paragraph

+ +

+```javascript
+var s;
+```
+
diff --git a/test/issues/#230.paragraphs-are-ignored-between-code-tags.md b/test/issues/#230.paragraphs-are-ignored-between-code-tags.md new file mode 100644 index 0000000..9362a18 --- /dev/null +++ b/test/issues/#230.paragraphs-are-ignored-between-code-tags.md @@ -0,0 +1,12 @@ +
```python
+var s;
+```
+
+ +this is a long paragraph + +

+```javascript
+var s;
+```
+