bug(parsing): Check quoteChar before leaving 'QUOTE'

ajtejankar · Jan 29, 2016 · a1c2857 · a1c2857
1 parent 9af340d
commit a1c2857
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/parser.js b/lib/parser.js
@@ -7,7 +7,7 @@ rules.set(/['"`]/, (char, state) => {
     state.name = 'QUOTE';
     state.quoteChar = char;
     return true;
-  } else if (state.name === 'QUOTE') {
+  } else if (state.name === 'QUOTE' && char === state.quoteChar) {
     state.name = 'START';
     state.quoteChar = undefined;
     return true;
@@ -31,7 +31,7 @@ rules.set(/\//, (char, state) => {
   } else if (state.name === 'COMMENT_ML_END1') {
     state.name = 'START';
     return true;
-  } else if (state.name === 'QUOTE') {
+  } else if (state.name === 'QUOTE' && char === state.quoteChar) {
     state.name = 'START';
     state.quoteChar = undefined;
     return true;

diff --git a/test/parser.js b/test/parser.js
@@ -119,7 +119,7 @@ describe('parser', () => {
   it('should handle regex literals in actions', () => {
     let input = `
       **/dep/*.!{html.js} {
-        let regex = /random\\/art\\{bram\\}/g;
+        let regex = /'random\\/"art"\\{bram\\}'/g;
         pf($key);
         pf($val);
       }
@@ -140,8 +140,8 @@ describe('parser', () => {
   it('should handle quote literals literals in actions', () => {
     let input = `
       **/dep/*.!{html.js} {
-        let quote1 = 'random { } art';
-        let quote2 = "random { } art"
+        let quote1 = 'random { } "\` art/';
+        let quote2 = "random { } '\` art"
         let quote3 = \`random { } art\`;
         pf($key);
         pf($val);