Merge pull request jshint#2264 from jacksonmj/newline-quote

[[FIX]] Incorrect 'Unclosed string' when the closing quote is the first character after a newline
azatoth · Apr 10, 2015 · 135cefa · 135cefa
2 parents 564fb18 + b804e65
commit 135cefa
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 24 deletions.
diff --git a/src/lex.js b/src/lex.js
@@ -1147,7 +1147,7 @@ Lexer.prototype = {
     this.skip();
 
     while (this.peek() !== quote) {
-      while (this.peek() === "") { // End Of Line
+      if (this.peek() === "") { // End Of Line
 
         // If an EOL is not preceded by a backslash, show a warning
         // and proceed like it was a legit multi-line string where
@@ -1200,33 +1200,35 @@ Lexer.prototype = {
             quote: quote
           };
         }
-      }
 
-      allowNewLine = false;
-      var char = this.peek();
-      var jump = 1; // A length of a jump, after we're done
-                    // parsing this character.
+      } else { // Any character other than End Of Line
 
-      if (char < " ") {
-        // Warn about a control character in a string.
-        this.trigger("warning", {
-          code: "W113",
-          line: this.line,
-          character: this.char,
-          data: [ "<non-printable>" ]
-        });
-      }
+        allowNewLine = false;
+        var char = this.peek();
+        var jump = 1; // A length of a jump, after we're done
+                      // parsing this character.
 
-      // Special treatment for some escaped characters.
-      if (char === "\\") {
-        var parsed = this.scanEscapeSequence(checks);
-        char = parsed.char;
-        jump = parsed.jump;
-        allowNewLine = parsed.allowNewLine;
-      }
+        if (char < " ") {
+          // Warn about a control character in a string.
+          this.trigger("warning", {
+            code: "W113",
+            line: this.line,
+            character: this.char,
+            data: [ "<non-printable>" ]
+          });
+        }
 
-      value += char;
-      this.skip(jump);
+        // Special treatment for some escaped characters.
+        if (char === "\\") {
+          var parsed = this.scanEscapeSequence(checks);
+          char = parsed.char;
+          jump = parsed.jump;
+          allowNewLine = parsed.allowNewLine;
+        }
+
+        value += char;
+        this.skip(jump);
+      }
     }
 
     this.skip();

diff --git a/tests/unit/fixtures/strings.js b/tests/unit/fixtures/strings.js
@@ -25,3 +25,6 @@ function octal_strictmode() {
   var test = "\033\t";
   test = "\0"; // Regression for false positives on \0
 }
+
+test = "closing quote on next line\
+";
diff --git a/tests/unit/options.js b/tests/unit/options.js
@@ -1297,6 +1297,7 @@ exports.strings = function (test) {
     .addError(14, "Bad escaping of EOL. Use option multistr if needed.")
     .addError(15, "Unclosed string.")
     .addError(25, "Octal literals are not allowed in strict mode.")
+    .addError(29, "Bad escaping of EOL. Use option multistr if needed.")
     .test(src, { es3: true });
 
   test.done();