Merge pull request mozilla#23 from rehandalal/fix-string-parsing

Fix issue with escaped quotes at the end of string
dmose · Mar 27, 2019 · 3d09092 · 3d09092
2 parents 3c1cd5e + 4ba03ed
commit 3d09092
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/Lexer.js b/lib/Lexer.js
@@ -8,8 +8,8 @@ var numericRegex = /^-?(?:(?:[0-9]*\.[0-9]+)|[0-9]+)$/,
   escEscRegex = /\\\\/,
   preOpRegexElems = [
     // Strings
-    "'(?:(?:\\\\')?[^'])*'",
-    '"(?:(?:\\\\")?[^"])*"',
+    "'(?:(?:\\\\')|[^'])*'",
+    '"(?:(?:\\\\")|[^"])*"',
     // Whitespace
     "\\s+",
     // Booleans

diff --git a/test/Lexer.js b/test/Lexer.js
@@ -34,12 +34,24 @@ describe("Lexer", function() {
       elems.should.have.length(1);
       elems[0].should.equal(str);
     });
+    it("should support escaping double-quotes at end of double-quote strings", function() {
+      var str = '"\\""',
+        elems = inst.getElements(str);
+      elems.should.have.length(1);
+      elems[0].should.equal(str);
+    });
     it("should support escaping single-quotes", function() {
       var str = "'f\\'oo'",
         elems = inst.getElements(str);
       elems.should.have.length(1);
       elems[0].should.equal(str);
     });
+    it("should support escaping single-quotes at end of single-quote strings", function() {
+      var str = "'\\''",
+        elems = inst.getElements(str);
+      elems.should.have.length(1);
+      elems[0].should.equal(str);
+    });
     it("should count an identifier as one element", function() {
       var str = "alpha12345",
         elems = inst.getElements(str);