Ignore empty statement in switch newline detection (#1220)

Fixes #1200
prettier · Apr 13, 2017 · ee7cfa9 · ee7cfa9
1 parent 3a7559b
commit ee7cfa9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/src/printer.js b/src/printer.js
@@ -1189,12 +1189,17 @@ function genericPrintNoParens(path, options, print, args) {
         const cons = path.call(consequentPath => {
           return join(
             hardline,
-            consequentPath.map((p, i) => {
-              const shouldAddLine =
-                i !== n.consequent.length - 1 &&
-                util.isNextLineEmpty(options.originalText, p.getValue());
-              return concat([print(p), shouldAddLine ? hardline : ""]);
-            })
+            consequentPath
+              .map((p, i) => {
+                if (n.consequent[i].type === "EmptyStatement") {
+                  return null;
+                }
+                const shouldAddLine =
+                  i !== n.consequent.length - 1 &&
+                  util.isNextLineEmpty(options.originalText, p.getValue());
+                return concat([print(p), shouldAddLine ? hardline : ""]);
+              })
+              .filter(e => e !== null)
           );
         }, "consequent");
         parts.push(

diff --git a/tests/switch/__snapshots__/jsfmt.spec.js.snap b/tests/switch/__snapshots__/jsfmt.spec.js.snap
@@ -48,6 +48,12 @@ switch (x) {
 
     break;
 }
+
+switch (a) {
+  case b:
+    if (1) {};
+    c;
+}
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 switch (foo) {
   case "bar":
@@ -93,6 +99,13 @@ switch (x) {
     break;
 }
 
+switch (a) {
+  case b:
+    if (1) {
+    }
+    c;
+}
+
 `;
 
 exports[`empty_switch.js 1`] = `

diff --git a/tests/switch/empty_lines.js b/tests/switch/empty_lines.js
@@ -45,3 +45,9 @@ switch (x) {
 
     break;
 }
+
+switch (a) {
+  case b:
+    if (1) {};
+    c;
+}