Merge pull request #25 from phil-lgr/fix-crlf

add support for windows style carriage return

Author: aputinski

lib/__tests__/__snapshots__/token-stream.spec.js.snap

@@ -480,6 +480,24 @@ Array [
 ]
 `;
 
+exports[`#next tokens space carriage return character 1`] = `
+Object {
+  "next": Object {
+    "column": 2,
+    "cursor": 4,
+    "line": 2,
+  },
+  "start": Object {
+    "column": 0,
+    "cursor": 0,
+    "line": 1,
+  },
+  "type": "space",
+  "value": "
+  ",
+}
+`;
+
 exports[`#next tokens space multiple spaces 1`] = `
 Object {
   "next": Object {

lib/__tests__/token-stream.spec.js

@@ -56,6 +56,10 @@ describe('#next', () => {
         let t = createTokenStream(createInputStream('\n\n\t  hello'))
         expect(t.next()).toMatchSnapshot()
       })
+      it('carriage return character', () => {
+        let t = createTokenStream(createInputStream('\r\n  hello'))
+        expect(t.next()).toMatchSnapshot()
+      })
     })
     describe('comment', () => {
       it('single comment', () => {

lib/token-stream.js

@@ -41,7 +41,7 @@ let is_char = (c) => (cc) => c === cc
  * @param {string} c
  * @returns {boolean}
  */
-let is_whitespace = (c) => '\t\n '.indexOf(c) >= 0
+let is_whitespace = (c) => '\t\r\n '.indexOf(c) >= 0
 
 /**
  * Return true if the character matches a newline

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scss-parser",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A library to parse/stringify SCSS",
   "main": "lib/index.js",
   "license": "SEE LICENSE IN README",