Skip to content

fix: dont match linebreaks #214

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

Merged
kellyjosephprice merged 2 commits into from
Jul 20, 2023
Merged

fix: dont match linebreaks #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40e8f5a
fix: dont match linebreaks
kellyjosephprice Jul 20, 2023
38672ae
Update __tests__/index.test.jsx
kellyjosephprice Jul 20, 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
6 changes: 6 additions & 0 deletions __tests__/index.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,10 @@ describe('VARIABLE_REGEXP', () => {
it('should match against colons with non-english characters', () => {
expect('<<glossary:ラベル>>').toMatch(new RegExp(VARIABLE_REGEXP));
});

it('should NOT match against newlines', () => {
expect('<<what the\nfuck>>').not.toMatch(new RegExp(VARIABLE_REGEXP));
expect('<<what the\rfuck>>').not.toMatch(new RegExp(VARIABLE_REGEXP));
expect('<<what the\r\nfuck>>').not.toMatch(new RegExp(VARIABLE_REGEXP));
});
});
2 changes: 1 addition & 1 deletion index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,6 @@ module.exports.Variable = Variable;
// - \<<apiKey\>> - escaped variables
// - <<apiKey>> - regular variables
// - <<glossary:glossary items>> - glossary
module.exports.VARIABLE_REGEXP = /(?:\\)?<<([-_\p{L}:.\s\d]+)(?:\\)?>>/iu.source;
module.exports.VARIABLE_REGEXP = /(?:\\)?<<((?:(?![\r\n])[-_\p{L}:.\s\d])+)(?:\\)?>>/iu.source;
module.exports.VariablesContext = VariablesContext;
module.exports.SelectedAppContext = SelectedAppContext;