fix: dont variable-ize escaped sequences (#458)

* fix: dont variable-ize escaped sequences * chore: oops
readmeio · Jul 20, 2023 · f8e8de7 · f8e8de7
1 parent f720e06
commit f8e8de7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/__tests__/codeMirror.test.js b/__tests__/codeMirror.test.js
@@ -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', () => {

diff --git a/src/codeMirror/index.jsx b/src/codeMirror/index.jsx
@@ -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 '';
   };