Update break, continue printers to:

- Un-wrap arbitrary number of parentheses - Remove explicit breakout-level `1`
nikulis · Jan 20, 2018 · da6aea4 · da6aea4
1 parent ff2e44e
commit da6aea4
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/src/printer.js b/src/printer.js
@@ -965,12 +965,24 @@ function printNode(path, options, print) {
       ]);
     case "break":
       if (node.level) {
-        return concat(["break ", path.call(print, "level")]);
+        while (node.level.kind == "parenthesis") {
+          node.level = node.level.inner;
+        }
+        if (node.level.kind == "number" && node.level.value != 1) {
+          return concat(["break ", path.call(print, "level")]);
+        }
+        return "break";
       }
       return "break";
     case "continue":
       if (node.level) {
-        return concat(["continue ", path.call(print, "level")]);
+        while (node.level.kind == "parenthesis") {
+          node.level = node.level.inner;
+        }
+        if (node.level.kind == "number" && node.level.value != 1) {
+          return concat(["continue ", path.call(print, "level")]);
+        }
+        return "continue";
       }
       return "continue";
     case "return":

diff --git a/tests/break/__snapshots__/jsfmt.spec.js.snap b/tests/break/__snapshots__/jsfmt.spec.js.snap
@@ -19,6 +19,7 @@ while(true) {
   break (1);
   break 2;
   break (2);
+  break(((3)));
 }~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 <?php
 for ($i = 0;$i < 10;$i++) {
@@ -33,9 +34,10 @@ for ($i = 0;$i < 10;$i++) {
 
 while (true) {
   break;
-  break 1;
-  break (1);
+  break;
+  break;
   break 2;
-  break (2);
+  break 2;
+  break 3;
 }
 `;
diff --git a/tests/break/break.php b/tests/break/break.php
@@ -16,4 +16,5 @@
   break (1);
   break 2;
   break (2);
+  break(((3)));
 }
diff --git a/tests/continue/__snapshots__/jsfmt.spec.js.snap b/tests/continue/__snapshots__/jsfmt.spec.js.snap
@@ -19,6 +19,7 @@ while(true) {
   continue (1);
   continue 2;
   continue (2);
+  continue(((3)));
 }~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 <?php
 for ($i = 0;$i < 10;$i++) {
@@ -33,9 +34,10 @@ for ($i = 0;$i < 10;$i++) {
 
 while (true) {
   continue;
-  continue 1;
-  continue (1);
+  continue;
+  continue;
   continue 2;
-  continue (2);
+  continue 2;
+  continue 3;
 }
 `;
diff --git a/tests/continue/continue.php b/tests/continue/continue.php
@@ -16,4 +16,5 @@
   continue (1);
   continue 2;
   continue (2);
+  continue(((3)));
 }