fix(strikethrough): fix striketrough being wrongly parsed inside code…

…Spans
showdownjs · Jan 29, 2017 · 169cbe8 · 169cbe8
1 parent 4243a31
commit 169cbe8
Show file tree

Hide file tree

Showing 7 changed files with 14 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/encodeCode.js b/src/subParsers/encodeCode.js
@@ -16,7 +16,7 @@ showdown.subParser('encodeCode', function (text, options, globals) {
     .replace(/</g, '&lt;')
     .replace(/>/g, '&gt;')
   // Now, escape characters that are magic in Markdown:
-    .replace(/([*_{}\[\]\\=-])/g, showdown.helper.escapeCharactersCallback);
+    .replace(/([*_{}\[\]\\=~-])/g, showdown.helper.escapeCharactersCallback);
 
   text = globals.converter._dispatch('encodeCode.after', text, options, globals);
   return text;

diff --git a/test/features/#164.3.strikethrough.html b/test/features/#164.3.strikethrough.html
@@ -1,3 +1,6 @@
 <p>a <del>strikethrough</del> word</p>
 <p>this should~~not be parsed</p>
 <p><del>strike-through text</del></p>
+<p><code>~~strikethough inside code span~~</code></p>
+<p>escaped ~~strikethrough~~</p>
+<p>escaped ~~strikethrough~~</p>
diff --git a/test/features/#164.3.strikethrough.md b/test/features/#164.3.strikethrough.md
@@ -3,3 +3,9 @@ a ~~strikethrough~~ word
 this should~~not be parsed
 
 ~~strike-through text~~
+
+`~~strikethough inside code span~~`
+
+escaped \~~strikethrough~~
+
+escaped \~~strikethrough\~~