parser/pprint_ast: force parentheses around switch (...)/try (...)

reasonml · Jan 6, 2018 · 03e2564 · 03e2564
1 parent acd5a06
commit 03e2564
Show file tree

Hide file tree

Showing 23 changed files with 118 additions and 123 deletions.
diff --git a/formatTest/typeCheckedTests/expected_output/attributes.re b/formatTest/typeCheckedTests/expected_output/attributes.re
@@ -518,7 +518,7 @@ external debounce :
 let x = "hi";
 
 let res =
-  switch x {
+  switch (x) {
   | _ =>
     [@attr]
     {
@@ -530,7 +530,7 @@ let res =
   };
 
 let res =
-  switch x {
+  switch (x) {
   | _ => [@attr] String.(Array.(concat))
   };
 

diff --git a/formatTest/typeCheckedTests/expected_output/comments.re b/formatTest/typeCheckedTests/expected_output/comments.re
@@ -82,7 +82,7 @@ let result =
   };
 
 let result =
-  switch None {
+  switch (None) {
   | Some({fieldOne: 20}) =>
     /* Where does this comment go? */
     let tmp = 0;

diff --git a/formatTest/typeCheckedTests/expected_output/jsx.re b/formatTest/typeCheckedTests/expected_output/jsx.re
@@ -101,7 +101,7 @@ module Namespace = {
 
 module Optional1 = {
   let createElement = (~required, ~children, ()) =>
-    switch required {
+    switch (required) {
     | Some(a) => {displayName: a}
     | None => {displayName: "nope"}
     };
@@ -110,7 +110,7 @@ module Optional1 = {
 module Optional2 = {
   let createElement =
       (~optional=?, ~children, ()) =>
-    switch optional {
+    switch (optional) {
     | Some(a) => {displayName: a}
     | None => {displayName: "nope"}
     };
@@ -119,7 +119,7 @@ module Optional2 = {
 module DefaultArg = {
   let createElement =
       (~default=Some("foo"), ~children, ()) =>
-    switch default {
+    switch (default) {
     | Some(a) => {displayName: a}
     | None => {displayName: "nope"}
     };

diff --git a/formatTest/typeCheckedTests/expected_output/mlSyntax.re b/formatTest/typeCheckedTests/expected_output/mlSyntax.re
@@ -53,7 +53,7 @@ type a =
   | A(bcd);
 
 let result =
-  switch B {
+  switch (B) {
   | B
   | C
   | D

diff --git a/formatTest/typeCheckedTests/expected_output/mlSyntax.re.4.02.3 b/formatTest/typeCheckedTests/expected_output/mlSyntax.re.4.02.3
@@ -53,7 +53,7 @@ type a =
   | A(bcd);
 
 let result =
-  switch B {
+  switch (B) {
   | B
   | C
   | D

diff --git a/formatTest/typeCheckedTests/expected_output/mutation.re b/formatTest/typeCheckedTests/expected_output/mutation.re
@@ -31,7 +31,7 @@ holdsABool.contents = holdsAnInt.contents == 100;
 
 let numberToSwitchOn = 100;
 
-switch numberToSwitchOn {
+switch (numberToSwitchOn) {
 | (-3)
 | (-2)
 | (-1) => ()

diff --git a/formatTest/typeCheckedTests/expected_output/oo.re b/formatTest/typeCheckedTests/expected_output/oo.re
@@ -7,7 +7,7 @@ class virtual stack ('a) (init) = {
   val mutable v: list('a) = init;
   pub virtual implementMe: int => int;
   pub pop =
-    switch v {
+    switch (v) {
     | [hd, ...tl] =>
       v = tl;
       Some(hd);
@@ -43,7 +43,7 @@ class virtual stackWithAttributes ('a) (init) = {
   val mutable v: list('a) = init;
   pub virtual implementMe: int => int;
   pub pop =
-    switch v {
+    switch (v) {
     | [hd, ...tl] =>
       v = tl;
       Some(hd);

diff --git a/formatTest/typeCheckedTests/expected_output/patternMatching.re b/formatTest/typeCheckedTests/expected_output/patternMatching.re
@@ -189,7 +189,7 @@ switch (Some(1)) {
 };
 
 /* with parens around direct list pattern in constructor pattern */
-switch None {
+switch (None) {
 | Some([]) => ()
 | Some([_]) when true => ()
 | Some([x]) => ()
@@ -199,7 +199,7 @@ switch None {
 };
 
 /* no parens around direct list pattern in constructor pattern (sugar) */
-switch None {
+switch (None) {
 | Some([]) => ()
 | Some([_]) when true => ()
 | Some([x]) => ()
@@ -209,7 +209,7 @@ switch None {
 };
 
 /* with parens around direct array pattern in constructor pattern */
-switch None {
+switch (None) {
 | Some([||]) => "empty"
 | Some([|_|]) when true => "one any"
 | Some([|a|]) => "one"
@@ -218,7 +218,7 @@ switch None {
 };
 
 /* no parens around direct array pattern in constructor pattern (sugar) */
-switch None {
+switch (None) {
 | Some([||]) => "empty"
 | Some([|_|]) when true => "one any"
 | Some([|a|]) => "one"
@@ -227,20 +227,20 @@ switch None {
 };
 
 /* parens around direct record pattern in constructor pattern */
-switch None {
+switch (None) {
 | Some({x}) when true => ()
 | Some({x, y}) => ()
 | _ => ()
 };
 
 /* no parens around direct record pattern in constructor pattern (sugar) */
-switch None {
+switch (None) {
 | Some({x}) when true => ()
 | Some({x, y}) => ()
 | _ => ()
 };
 
-switch None {
+switch (None) {
 | Some([|
     someSuperLongString,
     thisShouldBreakTheLine
@@ -249,7 +249,7 @@ switch None {
 | _ => ()
 };
 
-switch None {
+switch (None) {
 | Some((
     someSuperLongString,
     thisShouldBreakTheLine
@@ -258,7 +258,7 @@ switch None {
 | _ => ()
 };
 
-switch None {
+switch (None) {
 | Some([
     someSuperLongString,
     thisShouldBreakTheLine

diff --git a/formatTest/typeCheckedTests/expected_output/reasonComments.re b/formatTest/typeCheckedTests/expected_output/reasonComments.re
@@ -217,7 +217,7 @@ and y2 = {
 };
 
 let result =
-  switch None {
+  switch (None) {
   | Some({fieldOne: 20, fieldA: a}) =>
     /* Where does this comment go? */
     let tmp = 0;
@@ -242,7 +242,7 @@ let res =
  * Now these end of line comments *should* be retained.
  */
 let result =
-  switch None {
+  switch (None) {
   | Some({
       fieldOne: 20, /* end of line */
       fieldA:

diff --git a/formatTest/typeCheckedTests/input/attributes.re b/formatTest/typeCheckedTests/input/attributes.re
@@ -373,7 +373,7 @@ external debounce : int => ([@bs.meth] (unit => unit)) => ([@bs.meth] (unit => [
 
 let x = "hi";
 
-let res = switch x {
+let res = switch (x) {
 | _ =>
   [@attr]
   {
@@ -384,7 +384,7 @@ let res = switch x {
   }
 };
 
-let res = switch x {
+let res = switch (x) {
 | _ =>
   [@attr]
   {

diff --git a/formatTest/typeCheckedTests/input/patternMatching.re b/formatTest/typeCheckedTests/input/patternMatching.re
@@ -155,7 +155,7 @@ switch (Some(1)) {
 };
 
 /* with parens around direct list pattern in constructor pattern */
-switch None {
+switch (None) {
 | Some([]) => ()
 | Some([_]) when true => ()
 | Some([x]) => ()
@@ -165,7 +165,7 @@ switch None {
 };
 
 /* no parens around direct list pattern in constructor pattern (sugar) */
-switch None {
+switch (None) {
 | Some [] => ()
 | Some [_] when true => ()
 | Some [x] => ()
@@ -175,7 +175,7 @@ switch None {
 };
 
 /* with parens around direct array pattern in constructor pattern */
-switch None {
+switch (None) {
 | Some([| |]) => "empty"
 | Some([| _ |]) when true => "one any"
 | Some([| a |]) => "one"
@@ -184,7 +184,7 @@ switch None {
 };
 
 /* no parens around direct array pattern in constructor pattern (sugar) */
-switch None {
+switch (None) {
 | Some [||] => "empty"
 | Some [|_|] when true => "one any"
 | Some [|a|] => "one"
@@ -193,30 +193,30 @@ switch None {
 };
 
 /* parens around direct record pattern in constructor pattern */
-switch None {
+switch (None) {
 | Some({x}) when true => ()
 | Some({x, y}) => ()
 | _ => ()
 };
 
 /* no parens around direct record pattern in constructor pattern (sugar) */
-switch None {
+switch (None) {
 | Some {x} when true => ()
 | Some {x, y} => ()
 | _ => ()
 };
 
-switch None {
+switch (None) {
 | Some([|someSuperLongString, thisShouldBreakTheLine|]) => ()
 | _ => ()
 };
 
-switch None {
+switch (None) {
 | Some((someSuperLongString, thisShouldBreakTheLine)) => ()
 | _ => ()
 };
 
-switch None {
+switch (None) {
 | Some([someSuperLongString, thisShouldBreakTheLine]) => ()
 | Some([someSuperLongString, ...es6ListSugarLikeSyntaxWhichIsSuperLong]) when true === true => ()
 | Some([someSuperLongString, ...es6ListSugarLikeSyntaxWhichIsSuperLong]) => ()

diff --git a/formatTest/unit_tests/expected_output/basicStructures.re b/formatTest/unit_tests/expected_output/basicStructures.re
@@ -409,27 +409,27 @@ let rec size =
 
 /* Optimize for tail recursion */
 let rec size = (soFar, lst) =>
-  switch lst {
+  switch (lst) {
   | [] => 0
   | [hd, ...tl] => size(soFar + 1, tl)
   };
 
 let nestedMatch = lstLst =>
-  switch lstLst {
+  switch (lstLst) {
   | [hd, ...tl] when false => 10
   | [hd, ...tl] =>
-    switch tl {
+    switch (tl) {
     | [] => 0 + 0
     | [tlHd, ...tlTl] => 0 + 1
     }
   | [] => 0
   };
 
 let nestedMatchWithWhen = lstLst =>
-  switch lstLst {
+  switch (lstLst) {
   | [hd, ...tl] when false => 10
   | [hd, ...tl] when true =>
-    switch tl {
+    switch (tl) {
     | [] when false => 0 + 0
     | [] when true => 0 + 0
     | [tlHd, ...tlTl] => 0 + 1
@@ -764,7 +764,7 @@ let bar = {Foo.foo, Bar.bar};
 
 ({M.x, y}) => 1;
 
-switch foo {
+switch (foo) {
 | {y: 1, M.x} => 2
 };
 

diff --git a/formatTest/unit_tests/expected_output/extensions.re b/formatTest/unit_tests/expected_output/extensions.re
@@ -22,7 +22,7 @@ let x = {
 
 let x = {
   if%extend (true) {1} else {2};
-  switch%extend None {
+  switch%extend (None) {
   | Some(x) => assert false
   | None => ()
   };
@@ -35,7 +35,7 @@ let x = {
 let x = if%extend (true) {1} else {2};
 
 let x =
-  switch%extend None {
+  switch%extend (None) {
   | Some(x) => assert false
   | None => ()
   };

diff --git a/formatTest/unit_tests/expected_output/features403.re b/formatTest/unit_tests/expected_output/features403.re
@@ -27,7 +27,7 @@ type expr('a) =
 
 let rec eval: type a. expr(a) => a =
   e =>
-    switch e {
+    switch (e) {
     | Is0({test}) => eval(test) == 0
     | Val({value}) => value
     | Add({left, right}) =>

diff --git a/formatTest/unit_tests/expected_output/if.re b/formatTest/unit_tests/expected_output/if.re
@@ -163,7 +163,7 @@ let result =
  * Try shouldn't be aliased as ternary!
  */
 let res =
-  try something {
+  try (something) {
   | true => "hi"
   | false => "bye"
   };

diff --git a/formatTest/unit_tests/expected_output/infix.re b/formatTest/unit_tests/expected_output/infix.re
@@ -312,7 +312,7 @@ let includesACommentCloseInIdentifier = ( **\/ );
 let shouldSimplifyAnythingExceptApplicationAndConstruction =
   call("hi")
   ++ (
-    switch x {
+    switch (x) {
     | _ => "hi"
     }
   )

diff --git a/formatTest/unit_tests/expected_output/jsx.re b/formatTest/unit_tests/expected_output/jsx.re
@@ -113,7 +113,7 @@ let tuples =
 let icon =
   <Icon
     name=(
-      switch state.volume {
+      switch (state.volume) {
       | v when v < 0.1 => "sound-off"
       | v when v < 0.11 => "sound-min"
       | v when v < 0.51 => "sound-med"