fix: escape emphasis characters twice (fix #42) (#43)

nhn · Feb 5, 2020 · a94980b · a94980b
1 parent b8a1ac7
commit a94980b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/libs/to-mark/src/renderer.js b/libs/to-mark/src/renderer.js
@@ -12,7 +12,7 @@ var FIND_LEAD_SPACE_RX = /^\u0020/,
     //find space more than one
     FIND_SPACE_MORE_THAN_ONE_RX = /[\u0020]+/g,
     //find characters that need escape
-    FIND_CHAR_TO_ESCAPE_RX = /[~>()*{}\[\]_`+-.!#|]/g,
+    FIND_CHAR_TO_ESCAPE_RX = /[>(){}\[\]+-.!#|]/g,
     // find characters to be escaped in links or images
     FIND_CHAR_TO_ESCAPE_IN_LINK_RX = /[\[\]]/g,
     // find markdown image syntax

diff --git a/libs/to-mark/test/renderer.basic.spec.js b/libs/to-mark/test/renderer.basic.spec.js
@@ -53,7 +53,7 @@ describe('basicRenderer', function() {
             expect(getMarkdownText('1. &lt;text&gt;')).toEqual('1\\. \\<text\\>');
         });
 
-        it('should escape all markdown paired characters.', function() {
+        it('should escape all markdown paired characters', function() {
             expect(getMarkdownText('foo*bar')).toBe('foo\\*bar');
             expect(getMarkdownText('foo*bar*baz')).toBe('foo\\*bar\\*baz');
             expect(getMarkdownText('foo**bar**baz')).toBe('foo\\*\\*bar\\*\\*baz');
@@ -65,8 +65,16 @@ describe('basicRenderer', function() {
             expect(getMarkdownText('foo~bar')).toBe('foo\\~bar');
             expect(getMarkdownText('foo~~bar~~baz')).toBe('foo\\~\\~bar\\~\\~baz');
 
+            expect(getMarkdownText('1. foo~bar*baz*_qux_')).toBe('1\\. foo\\~bar\\*baz\\*\\_qux\\_');
+            expect(getMarkdownText('> foo~bar*baz*_qux_')).toBe('\\> foo\\~bar\\*baz\\*\\_qux\\_');
+        });
+
+        it('should escape all backticks', function() {
             expect(getMarkdownText('foo`bar')).toBe('foo\\`bar');
             expect(getMarkdownText('foo`bar`')).toBe('foo\\`bar\\`');
+
+            expect(getMarkdownText('1. foo`bar`')).toBe('1\\. foo\\`bar\\`');
+            expect(getMarkdownText('> foo`bar`')).toBe('\\> foo\\`bar\\`');
         });
     });
 

diff --git a/libs/to-mark/test/renderer.spec.js b/libs/to-mark/test/renderer.spec.js
@@ -193,18 +193,14 @@ describe('renderer', function() {
     it('escapeText() can process html text node for markdown text', function() {
         var renderer = Renderer.factory();
 
-        expect(renderer.escapeText('im *text*')).toEqual('im \\*text\\*');
         expect(renderer.escapeText('im (text)')).toEqual('im \\(text\\)');
         expect(renderer.escapeText('im [text]')).toEqual('im \\[text\\]');
         expect(renderer.escapeText('im {text}')).toEqual('im \\{text\\}');
-        expect(renderer.escapeText('im _text_')).toEqual('im \\_text\\_');
         expect(renderer.escapeText('im ## text')).toEqual('im \\#\\# text');
-        expect(renderer.escapeText('im ` text')).toEqual('im \\` text');
         expect(renderer.escapeText('im + text -')).toEqual('im \\+ text \\-');
         expect(renderer.escapeText('im . text !')).toEqual('im \\. text \\!');
         expect(renderer.escapeText('> im text')).toEqual('\\> im text');
         expect(renderer.escapeText('im | text')).toEqual('im \\| text');
-        expect(renderer.escapeText('im ` text')).toEqual('im \\` text');
     });
 
     it('escapeTextHtml() can process html text node for markdown text', function() {