Fix isPreviousLineEmpry on Windows (#1263)

src/util.js

@@ -119,6 +119,9 @@ function skipNewline(text, index, opts) {
 
   const atIndex = text.charAt(index);
   if (backwards) {
+    if (text.charAt(index - 1) === "\r" && atIndex === "\n") {
+      return index - 2;
+    }
     if (
       atIndex === "\n" ||
       atIndex === "\r" ||
@@ -127,9 +130,6 @@ function skipNewline(text, index, opts) {
     ) {
       return index - 1;
     }
-    if (text.charAt(index - 1) === "\r" && atIndex === "\n") {
-      return index - 2;
-    }
   } else {
     if (atIndex === "\r" && text.charAt(index + 1) === "\n") {
       return index + 2;

tests/switch/__snapshots__/jsfmt.spec.js.snap

@@ -54,6 +54,23 @@ switch (a) {
     if (1) {};
     c;
 }
+
+switch (a) {
+  case x:
+  case y:
+    call();
+
+  case z:
+    call();
+}
+
+switch (a) {
+  case x: case y:
+    call();
+
+  case z:
+    call();
+}
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 switch (foo) {
   case "bar":
@@ -106,6 +123,24 @@ switch (a) {
     c;
 }
 
+switch (a) {
+  case x:
+  case y:
+    call();
+
+  case z:
+    call();
+}
+
+switch (a) {
+  case x:
+  case y:
+    call();
+
+  case z:
+    call();
+}
+
 `;
 
 exports[`empty_switch.js 1`] = `

tests/switch/empty_lines.js

@@ -51,3 +51,20 @@ switch (a) {
     if (1) {};
     c;
 }
+
+switch (a) {
+  case x:
+  case y:
+    call();
+
+  case z:
+    call();
+}
+
+switch (a) {
+  case x: case y:
+    call();
+
+  case z:
+    call();
+}