Merge pull request #407 from mananjadhav/fix/md-hyperlink-regex

Fix MD Hyperlink Regex for nested cases
Expensify · Aug 18, 2021 · a88a45c · a88a45c
2 parents 2cda5ef + 11018de
commit a88a45c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/__tests__/ExpensiMark-HTML-test.js b/__tests__/ExpensiMark-HTML-test.js
@@ -338,7 +338,15 @@ test('Test markdown and url links with inconsistent starting and closing parens'
         + '[Yo (click here to see a cool cat)](https://c8.alamy.com/compes/ha11pc/cookie-cat-con-sombrero-de-cowboy-y-sun-glass-ha11pc.jpg) '
         + '[Yo click here to see a cool cat)](https://c8.alamy.com/compes/ha11pc/cookie-cat-con-sombrero-de-cowboy-y-sun-glass-ha11pc.jpg) '
         + '[Yo (click here to see a cool cat](https://c8.alamy.com/compes/ha11pc/cookie-cat-con-sombrero-de-cowboy-y-sun-glass-ha11pc.jpg) '
-        + '[Yo click * $ & here to see a cool cat](https://c8.alamy.com/compes/ha11pc/cookie-cat-con-sombrero-de-cowboy-y-sun-glass-ha11pc.jpg) ';
+        + '[Yo click * $ & here to see a cool cat](https://c8.alamy.com/compes/ha11pc/cookie-cat-con-sombrero-de-cowboy-y-sun-glass-ha11pc.jpg) '
+        + '[Text text] more text ([link here](www.google.com))'
+        + '[Text text] more text ([link [square brackets within] here](www.google.com))'
+        + '[Text text] more text ([link (parenthesis within) here](www.google.com))'
+        + '[Text text] more text [link here](www.google.com)'
+        + '[Text text] more text ([link here  ](www.google.com))'
+        + '[Text text] more text (([link here](www.google.com)))'
+        + '[Text text] more text [([link here](www.google.com))]'
+        + '[Text text] more text ([link here](www.google.com))[Text text] more text ([link here](www.google.com))';
 
 
     const resultString = '<a href="http://google.com/(something)?after=parens" target="_blank">google</a> '
@@ -353,7 +361,15 @@ test('Test markdown and url links with inconsistent starting and closing parens'
         + '<a href="https://c8.alamy.com/compes/ha11pc/cookie-cat-con-sombrero-de-cowboy-y-sun-glass-ha11pc.jpg" target="_blank">Yo (click here to see a cool cat)</a> '
         + '<a href="https://c8.alamy.com/compes/ha11pc/cookie-cat-con-sombrero-de-cowboy-y-sun-glass-ha11pc.jpg" target="_blank">Yo click here to see a cool cat)</a> '
         + '<a href="https://c8.alamy.com/compes/ha11pc/cookie-cat-con-sombrero-de-cowboy-y-sun-glass-ha11pc.jpg" target="_blank">Yo (click here to see a cool cat</a> '
-        + '<a href="https://c8.alamy.com/compes/ha11pc/cookie-cat-con-sombrero-de-cowboy-y-sun-glass-ha11pc.jpg" target="_blank">Yo click * $ &amp; here to see a cool cat</a> ';
+        + '<a href="https://c8.alamy.com/compes/ha11pc/cookie-cat-con-sombrero-de-cowboy-y-sun-glass-ha11pc.jpg" target="_blank">Yo click * $ &amp; here to see a cool cat</a> '
+        + '[Text text] more text (<a href="http://www.google.com" target="_blank">link here</a>)'
+        + '[Text text] more text (<a href="http://www.google.com" target="_blank">link [square brackets within] here</a>)'
+        + '[Text text] more text (<a href="http://www.google.com" target="_blank">link (parenthesis within) here</a>)'
+        + '[Text text] more text <a href="http://www.google.com" target="_blank">link here</a>'
+        + '[Text text] more text (<a href="http://www.google.com" target="_blank">link here  </a>)'
+        + '[Text text] more text ((<a href="http://www.google.com" target="_blank">link here</a>))'
+        + '[Text text] more text [(<a href="http://www.google.com" target="_blank">link here</a>)]'
+        + '[Text text] more text (<a href="http://www.google.com" target="_blank">link here</a>)[Text text] more text (<a href="http://www.google.com" target="_blank">link here</a>)'
 
 
     expect(parser.replace(testString)).toBe(resultString);

diff --git a/lib/ExpensiMark.js b/lib/ExpensiMark.js
@@ -72,10 +72,9 @@ export default class ExpensiMark {
              */
             {
                 name: 'link',
-
                 process: (textToProcess, replacement) => {
                     const regex = new RegExp(
-                        `\\[(.+?)\\]\\(${URL_REGEX}\\)(?![^<]*(<\\/pre>|<\\/code>))`,
+                        `\\[([^\\][]*(?:\\[[^\\][]*][^\\][]*)*)]\\(${URL_REGEX}\\)(?![^<]*(<\\/pre>|<\\/code>))`,
                         'gi'
                     );
                     return this.modifyTextForUrlLinks(regex, textToProcess, replacement);