fix(italicsAndBold): Make italicsAndBold lazy (#608)

fix italicsAndBold if literalMidwordUnderscores option is enabled it should end at the nearest closing underscores, not the furthest Closes #544
showdownjs · Nov 10, 2018 · 5c0d67e · 5c0d67e
1 parent afbaec9
commit 5c0d67e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 7 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/underline.js b/src/subParsers/underline.js
@@ -8,11 +8,17 @@ showdown.subParser('underline', function (text, options, globals) {
   text = globals.converter._dispatch('underline.before', text, options, globals);
 
   if (options.literalMidWordUnderscores) {
-    text = text.replace(/\b_?__(\S[\s\S]*)___?\b/g, function (wm, txt) {
+    text = text.replace(/\b___(\S[\s\S]*?)___\b/g, function (wm, txt) {
+      return '<u>' + txt + '</u>';
+    });
+    text = text.replace(/\b__(\S[\s\S]*?)__\b/g, function (wm, txt) {
       return '<u>' + txt + '</u>';
     });
   } else {
-    text = text.replace(/_?__(\S[\s\S]*?)___?/g, function (wm, m) {
+    text = text.replace(/___(\S[\s\S]*?)___/g, function (wm, m) {
+      return (/\S$/.test(m)) ? '<u>' + m + '</u>' : wm;
+    });
+    text = text.replace(/__(\S[\s\S]*?)__/g, function (wm, m) {
       return (/\S$/.test(m)) ? '<u>' + m + '</u>' : wm;
     });
   }

diff --git a/test/features/underline/simple.html b/test/features/underline/simple.html
@@ -2,3 +2,4 @@
 <p><u>an underlined sentence</u></p>
 <p><u>three underscores are fine</u></p>
 <p>_single_ underscores are left alone</p>
+<p><u>multiple</u> underlines in a <u>paragraph</u></p>
diff --git a/test/features/underline/simple.md b/test/features/underline/simple.md
@@ -5,3 +5,5 @@ __an underlined sentence__
 ___three underscores are fine___
 
 _single_ underscores are left alone
+
+__multiple__ underlines in a __paragraph__
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,5 @@ __an underlined sentence__
		___three underscores are fine___

		_single_ underscores are left alone

		__multiple__ underlines in a __paragraph__