StarMirror/showdown
1
0
Fork 0
mirror of https://github.com/showdownjs/showdown.git synced 2024-03-22 13:30:55 +08:00
Code Issues Projects Releases Wiki Activity

refactor(italicsAndBold): refactoring of italicsAndBold regexes for speed

Browse Source
This commit is contained in:
Estevao Soares dos Santos 2017-01-29 22:29:21 +00:00
parent 062e465902
commit e4c43ea433
7 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/showdown.js vendored
View File

Binary file not shown.

BIN
dist/showdown.js.map vendored
View File

Binary file not shown.

BIN
dist/showdown.min.js vendored
View File

Binary file not shown.

BIN
dist/showdown.min.js.map vendored
View File

Binary file not shown.

16
src/subParsers/italicsAndBold.js
View File

@ -3,19 +3,25 @@ showdown.subParser('italicsAndBold', function (text, options, globals) {
text = globals.converter._dispatch('italicsAndBold.before', text, options, globals); text = globals.converter._dispatch('italicsAndBold.before', text, options, globals);
// it's faster to have 2 separate regexes for each case than have just one
// because of backtracing, in some cases, it could lead to an exponential effect
// called "catastrophic backtrace". Ominous!
if (options.literalMidWordUnderscores) { if (options.literalMidWordUnderscores) {
//underscores //underscores
// Since we are consuming a \s character, we need to add it // Since we are consuming a \s character, we need to add it
text = text.replace(/(^|\s|>|\b)__(?=\S)([\s\S]+?)__(?=\b|<|\s|$)/gm, '$1<strong>$2</strong>'); text = text.replace(/\b__(\S[\s\S]*?)__\b/gm, '<strong>$1</strong>');
text = text.replace(/(^|\s|>|\b)_(?=\S)([\s\S]+?)_(?=\b|<|\s|$)/gm, '$1<em>$2</em>'); text = text.replace(/\b_(\S[\s\S]*?)_\b/gm, '<em>$1</em>');
//asterisks //asterisks
text = text.replace(/(\*\*)(?=\S)([^\r]*?\S[*]*)\1/g, '<strong>$2</strong>'); text = text.replace(/\*\*(?=\S)([^\r]*?\S[*]*)\*\*/g, '<strong>$1</strong>');
text = text.replace(/(\*)(?=\S)([^\r]*?\S)\1/g, '<em>$2</em>'); text = text.replace(/(\*)(?=\S)([^\r]*?\S)\1/g, '<em>$2</em>');
} else { } else {
// <strong> must go first: // <strong> must go first:
text = text.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g, '<strong>$2</strong>'); text = text.replace(/__(\S[\s\S]*?)__/g, '<strong>$1</strong>');
text = text.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g, '<em>$2</em>'); text = text.replace(/\*\*(\S[\s\S]*?)\*\*/g, '<strong>$1</strong>');
// now <em>
text = text.replace(/_(\S[\s\S]*?)_/g, '<em>$1</em>');
text = text.replace(/\*(\S[\s\S]*?)\*/g, '<em>$1</em>');
} }
text = globals.converter._dispatch('italicsAndBold.after', text, options, globals); text = globals.converter._dispatch('italicsAndBold.after', text, options, globals);

2
test/cases/emphasis.html
View File

@ -32,3 +32,5 @@
<p>escaped word*with*asterixs</p> <p>escaped word*with*asterixs</p>
<p>escaped word**with**asterixs</p> <p>escaped word**with**asterixs</p>
<p>escaped word<strong>*with*</strong>bold asterixs</p> <p>escaped word<strong>*with*</strong>bold asterixs</p>
<p>foo<strong>bar</strong>baz</p>
<p>foo<strong>bar</strong>baz</p>

4
test/cases/emphasis.md
View File

@ -64,3 +64,7 @@ escaped word\*with*asterixs
escaped word\*\*with\*\*asterixs escaped word\*\*with\*\*asterixs
escaped word**\*with\***bold asterixs escaped word**\*with\***bold asterixs
foo**bar**baz
foo__bar__baz