em: Allow escaped underscores in em again

This was a regression in 0.0.8. See [this marked.js issue](markedjs/marked#641). Test plan: `make test`
ariabuckles · Feb 1, 2016 · 9504ca5 · 9504ca5
1 parent 4d68a37
commit 9504ca5
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/__tests__/simple-markdown-test.js b/__tests__/simple-markdown-test.js
@@ -223,6 +223,41 @@ describe("simple markdown", function() {
             }]);
         });
 
+        it("should allow escaped underscores in underscore italics", function() {
+            var parsed1 = inlineParse("_ABC\\_DEF_");
+            validateParse(parsed1, [{
+                type: "em",
+                content: [{
+                    type: "text",
+                    content: "ABC",
+                }, {
+                    type: "text",
+                    content: "_",
+                }, {
+                    type: "text",
+                    content: "DEF",
+                }]
+            }]);
+
+            var parsed2 = inlineParse("_**ABC\\_DEF**_");
+            validateParse(parsed2, [{
+                type: "em",
+                content: [{
+                    type: "strong",
+                    content: [{
+                        type: "text",
+                        content: "ABC",
+                    }, {
+                        type: "text",
+                        content: "_",
+                    }, {
+                        type: "text",
+                        content: "DEF",
+                    }]
+                }]
+            }]);
+        });
+
         // TODO(aria): Make this pass:
         it.skip("should parse complex combined bold/italics", function() {
             var parsed = inlineParse("***bold** italics*");

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simple-markdown",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Javascript markdown parsing, made simple",
   "main": "simple-markdown.js",
   "scripts": {

diff --git a/simple-markdown.js b/simple-markdown.js
@@ -1189,7 +1189,7 @@ var defaultRules = {
             new RegExp(
                 // only match _s surrounding words.
                 "^\\b_" +
-                "((?:__|[^_])+?)_" +
+                "((?:__|\\\\[\\s\\S]|[^\\_])+?)_" +
                 "\\b" +
                 // Or match *s:
                 "|" +