[[FIX]] (cli - extract) lines can end with "\\r\\n", not "\\n\\r"

Fixes gh-2825
jshint · Mar 26, 2016 · 93818f3 · 93818f3
1 parent 351e8f3
commit 93818f3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/cli.js b/src/cli.js
@@ -280,7 +280,7 @@ function extract(code, when) {
     // in between the last </script> tag and this <script> tag to preserve
     // location information.
     inscript = true;
-    js.push.apply(js, code.slice(index, parser.endIndex).match(/\n\r|\n|\r/g));
+    js.push.apply(js, code.slice(index, parser.endIndex).match(/\r\n|\n|\r/g));
     startOffset = null;
   }
 
@@ -297,7 +297,7 @@ function extract(code, when) {
     if (!inscript)
       return;
 
-    var lines = data.split(/\n\r|\n|\r/);
+    var lines = data.split(/\r\n|\n|\r/);
 
     if (!startOffset) {
       lines.some(function(line) {
@@ -362,7 +362,7 @@ function extractOffsets(code, when) {
     // location information.
     inscript = true;
     var fragment = code.slice(index, parser.endIndex);
-    var n = (fragment.match(/\n\r|\n|\r/g) || []).length;
+    var n = (fragment.match(/\r\n|\n|\r/g) || []).length;
     lineCounter += n;
     startOffset = null;
   }
@@ -380,7 +380,7 @@ function extractOffsets(code, when) {
     if (!inscript)
       return;
 
-    var lines = data.split(/\n\r|\n|\r/);
+    var lines = data.split(/\r\n|\n|\r/);
 
     if (!startOffset) {
       lines.some(function(line) {

diff --git a/tests/cli.js b/tests/cli.js
@@ -1149,6 +1149,20 @@ exports.extract = {
 
     test.equal(cli.extract(html, "auto"), js);
 
+    test.done();
+  },
+
+  "\\r\\n as line terminator (gh-2825)": function (test) {
+    var html = [
+      "<script>",
+      "  var a = 3;",
+      "</script>"
+    ].join("\r\n");
+
+    var js = "\nvar a = 3;\n";
+
+    test.equal(cli.extract(html, "auto"), js);
+
     test.done();
   }
 };