Skip to content

fix: dont variable-ize escaped sequences #458

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
merged 2 commits into from
Jul 20, 2023
Merged

fix: dont variable-ize escaped sequences #458

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
79c84c6
fix: dont variable-ize escaped sequences
kellyjosephprice Jul 20, 2023
eb73632
chore: oops
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__/codeMirror.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ describe('variable substitution', () => {
'APIKEY NAME'
);
});

it('should NOT tokenize escaped variables', () => {
expect(mount(syntaxHighlighter('\\<<wat>>', 'json', { tokenizeVariables: true })).text()).toBe('<<wat>>');
expect(mount(syntaxHighlighter('<<wat\\>>', 'json', { tokenizeVariables: true })).text()).toBe('<<wat>>');
expect(mount(syntaxHighlighter('\\<<wat\\>>', 'json', { tokenizeVariables: true })).text()).toBe('<<wat>>');
});
});

describe('Supported languages', () => {
Expand Down
9 changes: 7 additions & 2 deletions src/codeMirror/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,14 @@ const extractVariables = (code, opts) => {
let offsetDelta = 0;
const variables = [];

const extracter = ({ length }, capture, offset) => {
const extracter = (match, capture, offset) => {
const unescaped = match.replace(/^\\<</, '<<').replace(/\\>>$/, '>>');
if (unescaped !== match) {
return unescaped;
}

variables.push({ text: capture, offset: offset - offsetDelta });
offsetDelta += length;
offsetDelta += match.length;

return '';
};
Expand Down