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

Jump to bottom

Fix bug with characters after @here mention #603

Merged
merged 4 commits into from
Nov 14, 2023
Merged

Fix bug with characters after @here mention #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d8092d
fix bug with characters after @here mention
Skalakid Nov 14, 2023
2461a6e
move tests to already created one
Skalakid Nov 14, 2023
7784f71
add herex test
Skalakid Nov 14, 2023
4cda2bb
move herex test
Skalakid Nov 14, 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
12 changes: 10 additions & 2 deletions __tests__/ExpensiMark-HTML-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,6 +1262,7 @@ test('Test for @here mention with italic, bold and strikethrough styles', () =>
+ ' @here_123'
+ ' @here_abc'
+ ' @here123'
+ ' @herea'
+ ' @hereabc'
+ ' @here abc'
+ ' @here*'
Expand All @@ -1270,7 +1271,10 @@ test('Test for @here mention with italic, bold and strikethrough styles', () =>
+ ' @here@'
+ ' @here$'
+ ' @here^'
+ ' @here(';
+ ' @here('
+ ' @here.'
+ ' @here!'
+ ' @here?';

const resultString = '<mention-here>@here</mention-here>'
+ ' <em><mention-here>@here</mention-here></em>'
Expand All @@ -1280,6 +1284,7 @@ test('Test for @here mention with italic, bold and strikethrough styles', () =>
+ ' @here_123'
+ ' @here_abc'
+ ' @here123'
+ ' @herea'
+ ' @hereabc'
+ ' <mention-here>@here</mention-here> abc'
+ ' <mention-here>@here</mention-here>*'
Expand All @@ -1288,7 +1293,10 @@ test('Test for @here mention with italic, bold and strikethrough styles', () =>
+ ' <mention-here>@here</mention-here>@'
+ ' <mention-here>@here</mention-here>$'
+ ' <mention-here>@here</mention-here>^'
+ ' <mention-here>@here</mention-here>(';
+ ' <mention-here>@here</mention-here>('
+ ' <mention-here>@here</mention-here>.'
+ ' <mention-here>@here</mention-here>!'
+ ' <mention-here>@here</mention-here>?';
expect(parser.replace(testString)).toBe(resultString);
});

Expand Down
2 changes: 1 addition & 1 deletion lib/ExpensiMark.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default class ExpensiMark {
*/
{
name: 'hereMentions',
regex: /([a-zA-Z0-9.!$%&+/=?^`{|}_-]?)(@here)([a-zA-Z0-9.!$%&+/=?^`{|}_-]?)(?=\b)(?!(@[a-zA-Z0-9-]+?(\.[a-zA-Z]+)+)|((?:(?!<a).)+)?<\/a>|[^<]*(<\/pre>|<\/code>))/gm,
regex: /([a-zA-Z0-9.!$%&+/=?^`{|}_-]?)(@here)([.!$%&+/=?^`{|}_-]?)(?=\b)(?!(@[a-zA-Z0-9-]+?(\.[a-zA-Z]+)+)|((?:(?!<a).)+)?<\/a>|[^<]*(<\/pre>|<\/code>))/gm,
replacement: (match, g1, g2, g3) => {
if (!Str.isValidMention(match)) {
return match;
Expand Down
Loading