fix inline codeblock with two backticks

Expensify · Aug 17, 2023 · f3fd643 · f3fd643
1 parent 4cc5f72
commit f3fd643
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/__tests__/ExpensiMark-HTML-test.js b/__tests__/ExpensiMark-HTML-test.js
@@ -309,6 +309,11 @@ test('Test inline code blocks inside ExpensiMark', () => {
     expect(parser.replace(testString)).toBe(resultString);
 });
 
+test('Test inline code blocks with two backticks', () => {
+    const testString = '``JavaScript``';
+    expect(parser.replace(testString)).toBe('<code>&#x60;JavaScript&#x60;</code>');
+});
+
 test('Test code fencing with ExpensiMark syntax inside', () => {
     let codeFenceExample = '```\nThis is how you can write ~strikethrough~, *bold*, _italics_, and [links](https://www.expensify.com)\n```';
     expect(parser.replace(codeFenceExample)).toBe('<pre>This&#32;is&#32;how&#32;you&#32;can&#32;write&#32;~strikethrough~,&#32;*bold*,&#32;_italics_,&#32;and&#32;[links](https://www.expensify.com)<br /></pre>');

diff --git a/lib/ExpensiMark.js b/lib/ExpensiMark.js
@@ -47,7 +47,7 @@ export default class ExpensiMark {
 
                 // Use the url escaped version of a backtick (`) symbol. Mobile platforms do not support lookbehinds,
                 // so capture the first and third group and place them in the replacement.
-                regex: /(\B|_|)&#x60;(.*?\S.*?)&#x60;(\B|_|)(?![^<]*<\/pre>)/g,
+                regex: /(\B|_|)&#x60;(.*?\S.*?)&#x60;(\B|_|)(?!&#x60;|[^<]*<\/pre>)/g,
                 replacement: '$1<code>$2</code>$3',
             },