Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update inlineCodeBlock replace regex #607

Merged
merged 5 commits into from
Dec 7, 2023
Merged

update inlineCodeBlock replace regex #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a92f2a1
update inlineCodeBlock replace regex
akamefi202 Nov 21, 2023
6c4e72a
fix commit
akamefi202 Nov 21, 2023
a45eda6
update comment & test case
akamefi202 Nov 22, 2023
bc0183d
add test containing both code and block
akamefi202 Nov 30, 2023
4e2404c
add test cases
akamefi202 Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions __tests__/ExpensiMark-HTML-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1698,3 +1698,20 @@ describe('when should keep whitespace flag is enabled', () => {
expect(parser.replace(quoteTestStartString, {shouldKeepWhitespace: true})).toBe(quoteTestReplacedString);
});
});

test('Test code fence within inline code', () => {
let testString = 'Hello world `(```test```)` Hello world';
expect(parser.replace(testString)).toBe('Hello world &#x60;(<pre>test</pre>)&#x60; Hello world');

testString = 'Hello world `(```test\ntest```)` Hello world';
expect(parser.replace(testString)).toBe('Hello world &#x60;(<pre>test<br />test</pre>)&#x60; Hello world');

testString = 'Hello world ```(`test`)``` Hello world';
expect(parser.replace(testString)).toBe('Hello world <pre>(&#x60;test&#x60;)</pre> Hello world');

testString = 'Hello world `test`space```block``` Hello world';
expect(parser.replace(testString)).toBe('Hello world <code>test</code>space<pre>block</pre> Hello world');

testString = 'Hello world ```block```space`test` Hello world';
expect(parser.replace(testString)).toBe('Hello world <pre>block</pre>space<code>test</code> Hello world');
});
3 changes: 2 additions & 1 deletion lib/ExpensiMark.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@

// 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.
akamefi202 marked this conversation as resolved.
Show resolved Hide resolved
regex: /(\B|_|)&#x60;(.*?\S.*?)&#x60;(\B|_|)(?!&#x60;|[^<]*<\/pre>)/g,
// but we should not replace backtick symbols if they include <pre> tags between them.
regex: /(\B|_|)&#x60;(?:(?!(?:(?!&#x60;).)*?<pre>))(.*?\S.*?)&#x60;(\B|_|)(?!&#x60;|[^<]*<\/pre>)/g,
replacement: '$1<code>$2</code>$3',
},

Expand Down Expand Up @@ -109,7 +110,7 @@
*/
{
name: 'hereMentions',
regex: /([a-zA-Z0-9.!$%&+/=?^`{|}_-]?)(@here)([.!$%&+/=?^`{|}_-]?)(?=\b)(?!([\w'#%+-]*@(?:[a-z\d-]+\.)+[a-z]{2,}(?:\s|$|@here))|((?:(?!<a).)+)?<\/a>|[^<]*(<\/pre>|<\/code>))/gm,

Check warning on line 113 in lib/ExpensiMark.js

View workflow job for this annotation

GitHub Actions / lint 

This line has a length of 193. Maximum allowed is 190
replacement: (match, g1, g2, g3) => {
if (!Str.isValidMention(match)) {
return match;
Expand Down
Loading