Implement a migration to new braces syntax and add migrate tests

crates/compiler/fmt/src/expr.rs

@@ -979,7 +979,7 @@ fn format_str_segment(seg: &StrSegment, buf: &mut Buf) {
     }
 }
 
-fn push_op(buf: &mut Buf, op: BinOp) {
+pub fn push_op(buf: &mut Buf, op: BinOp) {
     match op {
         called_via::BinOp::Caret => buf.push('^'),
         called_via::BinOp::Star => buf.push('*'),

crates/compiler/fmt/src/lib.rs

@@ -7,6 +7,7 @@ pub mod collection;
 pub mod def;
 pub mod expr;
 pub mod header;
+pub mod migrate;
 pub mod node;
 pub mod pattern;
 pub mod spaces;

crates/compiler/test_syntax/src/test_helpers.rs

@@ -7,6 +7,7 @@ use roc_can::scope::Scope;
 use roc_can_solo::env::SoloEnv;
 use roc_can_solo::scope::SoloScope;
 use roc_error_macros::set_panic_not_exit;
+use roc_fmt::migrate::{MigrateError, Suffix};
 use roc_fmt::{annotation::Formattable, header::fmt_header, MigrationFlags};
 use roc_module::ident::QualifiedModuleName;
 use roc_module::symbol::{IdentIds, Interns, ModuleIds, PackageModuleIds, Symbol};
@@ -30,7 +31,7 @@ use roc_types::{
     types::{AliasVar, Type},
 };
 
-use roc_fmt::Buf;
+use roc_fmt::{migrate, Buf};
 
 /// Source code to parse. Usually in the form of a test case.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -253,6 +254,77 @@ impl<'a> Output<'a> {
             }
         }
     }
+
+    pub fn migrate(&self) -> Result<InputOwned, MigrateError> {
+        match self {
+            Output::Header(header) => {
+                let arena = Bump::new();
+                let mut buf = Buf::new_in(
+                    &arena,
+                    MigrationFlags {
+                        snakify: false,
+                        parens_and_commas: false,
+                    },
+                );
+                migrate::fmt_header(&mut buf, header)?;
+                buf.fmt_end_of_file();
+                Ok(InputOwned::Header(buf.as_str().to_string()))
+            }
+            Output::ModuleDefs(defs) => {
+                let arena = Bump::new();
+                let mut buf = Buf::new_in(
+                    &arena,
+                    MigrationFlags {
+                        snakify: false,
+                        parens_and_commas: false,
+                    },
+                );
+                migrate::fmt_defs(&mut buf, defs)?;
+                buf.fmt_end_of_file();
+                Ok(InputOwned::ModuleDefs(buf.as_str().to_string()))
+            }
+            Output::Expr(expr) => {
+                let arena = Bump::new();
+                let mut buf = Buf::new_in(
+                    &arena,
+                    MigrationFlags {
+                        snakify: false,
+                        parens_and_commas: false,
+                    },
+                );
+                migrate::fmt_expr_top_level(&mut buf, 0, &expr.value)?;
+                buf.fmt_end_of_file();
+                Ok(InputOwned::Expr(buf.as_str().to_string()))
+            }
+            Output::Full(full_ast) => {
+                let arena = Bump::new();
+                let mut buf = Buf::new_in(
+                    &arena,
+                    MigrationFlags {
+                        snakify: false,
+                        parens_and_commas: false,
+                    },
+                );
+                migrate::fmt_header(&mut buf, &full_ast.header)?;
+                migrate::fmt_defs(&mut buf, &full_ast.defs)?;
+                buf.fmt_end_of_file();
+                Ok(InputOwned::Full(buf.as_str().to_string()))
+            }
+            Output::Pattern(pat) => {
+                let arena = Bump::new();
+                let mut buf = Buf::new_in(
+                    &arena,
+                    MigrationFlags {
+                        snakify: false,
+                        parens_and_commas: false,
+                    },
+                );
+                migrate::fmt_pattern(&mut buf, 0, &pat.value, Suffix::None)?;
+                buf.fmt_end_of_file();
+                Ok(InputOwned::Pattern(buf.as_str().to_string()))
+            }
+        }
+    }
 }
 
 impl<'a> Malformed for Output<'a> {

crates/compiler/test_syntax/tests/snapshots/malformed/bad_opaque_ref.expr.migrated.roc

@@ -0,0 +1 @@
+I()

crates/compiler/test_syntax/tests/snapshots/malformed/if_in_record_field_opt_pat.expr.migrated.roc

@@ -0,0 +1,10 @@
+O({p: if
+    a
+    {
+
+        A
+    } else {
+        &m
+    }}, #
+) : e
+i

crates/compiler/test_syntax/tests/snapshots/malformed/implements_after_comment_with_newline.expr.migrated.roc

@@ -0,0 +1 @@
+{

crates/compiler/test_syntax/tests/snapshots/malformed/looks_like_implements.expr.migrated.roc

@@ -0,0 +1,2 @@
+N((implements),h,(0),) : B
+T

crates/compiler/test_syntax/tests/snapshots/malformed/negative_number_in_pattern.expr.migrated.roc

@@ -0,0 +1,2 @@
+N(-0,T,) : A
+zT

crates/compiler/test_syntax/tests/snapshots/malformed/opaque_in_ann_apply_arg.expr.migrated.roc

@@ -0,0 +1,4 @@
+B(@A,) : w
+#
+@A = e
+i

crates/compiler/test_syntax/tests/snapshots/malformed/parens_comment_in_ty_annotation.expr.migrated.roc

@@ -0,0 +1,3 @@
+Zx((e #
+),f,) : i
+s

crates/compiler/test_syntax/tests/snapshots/malformed/parens_in_type_def_apply.expr.migrated.roc

@@ -0,0 +1,2 @@
+U((b(a,)),) : b
+a

crates/compiler/test_syntax/tests/snapshots/malformed/pattern_opt_field_bonanza.expr.migrated.roc

@@ -0,0 +1,4 @@
+M({s: s({J&
+    },)},{s: s({J&
+    },)},) : p
+y

crates/compiler/test_syntax/tests/snapshots/malformed/quotes_in_parens_in_pat.expr.migrated.roc

@@ -0,0 +1,4 @@
+Q((
+"""
+"""("",)),) : a
+q

crates/compiler/test_syntax/tests/snapshots/malformed/repr_7346.expr.migrated.roc

@@ -0,0 +1,6 @@
+il3(|k| # w#z
+{
+    CCC(@C,( # i
+    t!(K,)),) : i
+    C
+},)

crates/compiler/test_syntax/tests/snapshots/pass/ability_demand_signature_is_multiline.expr.migrated.roc

@@ -0,0 +1 @@
+{

crates/compiler/test_syntax/tests/snapshots/pass/ability_multi_line.expr.migrated.roc

@@ -0,0 +1 @@
+{

crates/compiler/test_syntax/tests/snapshots/pass/ability_single_line.expr.migrated.roc

@@ -0,0 +1 @@
+{

crates/compiler/test_syntax/tests/snapshots/pass/ability_two_in_a_row.expr.migrated.roc

@@ -0,0 +1 @@
+{

crates/compiler/test_syntax/tests/snapshots/pass/accidentally_indented_else.expr.migrated.roc

@@ -0,0 +1,9 @@
+if
+h
+{
+
+    A
+} else {
+    &e
+}
+s #

crates/compiler/test_syntax/tests/snapshots/pass/add_var_with_spaces.expr.migrated.roc

@@ -0,0 +1 @@
+x + 2

crates/compiler/test_syntax/tests/snapshots/pass/add_with_spaces.expr.migrated.roc

@@ -0,0 +1 @@
+1 + 2

crates/compiler/test_syntax/tests/snapshots/pass/alias_ann_in_parens.expr.migrated.roc

@@ -0,0 +1,3 @@
+M() :
+r
+h

crates/compiler/test_syntax/tests/snapshots/pass/alias_comment_after_head.expr.migrated.roc

@@ -0,0 +1,3 @@
+A( #
+p,) : e
+A

crates/compiler/test_syntax/tests/snapshots/pass/alias_parens_comment.expr.migrated.roc

@@ -0,0 +1,3 @@
+K() : #
+s
+K

crates/compiler/test_syntax/tests/snapshots/pass/alias_parens_comment_indent.expr.migrated.roc

@@ -0,0 +1,4 @@
+O() : O(z,
+#
+)
+b #

crates/compiler/test_syntax/tests/snapshots/pass/ann_apply_record_with_newlines.expr.migrated.roc

@@ -0,0 +1,4 @@
+8: O(
+{
+},)
+Q

crates/compiler/test_syntax/tests/snapshots/pass/ann_closed_union.expr.migrated.roc

@@ -0,0 +1,4 @@
+foo: [True,Perhaps(Thing,),]
+foo = True
+
+42

crates/compiler/test_syntax/tests/snapshots/pass/ann_effectful_fn.expr.migrated.roc

@@ -0,0 +1,5 @@
+launchTheNukes: {}, => Result(Bool,LaunchNukeErr,)
+launchTheNukes = |{}|
+crash("todo",)
+
+launchTheNukes

crates/compiler/test_syntax/tests/snapshots/pass/ann_extra_indented_implements.expr.migrated.roc

@@ -0,0 +1,5 @@
+2:
+r where e
+ implements
+P
+u

crates/compiler/test_syntax/tests/snapshots/pass/ann_open_union.expr.migrated.roc

@@ -0,0 +1,4 @@
+foo: [True,Perhaps(Thing,),..*]
+foo = True
+
+42

crates/compiler/test_syntax/tests/snapshots/pass/ann_parens_comments.expr.migrated.roc

@@ -0,0 +1,6 @@
+r:
+r
+#
+#
+
+h

crates/compiler/test_syntax/tests/snapshots/pass/ann_parens_where_implements_func.expr.migrated.roc

@@ -0,0 +1,5 @@
+x: a
+ where
+e
+ implements K, -> Z
+s

crates/compiler/test_syntax/tests/snapshots/pass/ann_pattern_comment_before_body.expr.migrated.roc

@@ -0,0 +1,4 @@
+H() : p
+#
+s = p
+d #

crates/compiler/test_syntax/tests/snapshots/pass/ann_record_pat_with_comment.expr.migrated.roc

@@ -0,0 +1,3 @@
+{l: s, #
+}: s
+o

crates/compiler/test_syntax/tests/snapshots/pass/ann_tag_union_newline_comment.expr.migrated.roc

@@ -0,0 +1,4 @@
+k:
+[T,..m
+] #
+D

crates/compiler/test_syntax/tests/snapshots/pass/ann_where_e_newline_implements.expr.migrated.roc

@@ -0,0 +1,4 @@
+J() : [
+] where e
+ implements T
+i

crates/compiler/test_syntax/tests/snapshots/pass/annotate_tuple_func.expr.migrated.roc

@@ -0,0 +1,3 @@
+1: (f,
+    ww, -> p,..e)
+Mh

crates/compiler/test_syntax/tests/snapshots/pass/annotated_empty_record_destructure.expr.migrated.roc

@@ -0,0 +1,3 @@
+E(): B
+{} = B
+B

crates/compiler/test_syntax/tests/snapshots/pass/annotated_record_destructure.expr.migrated.roc

@@ -0,0 +1,4 @@
+{x,y,}: Foo
+{x,y,} = {x: "foo"y: 3.14}
+
+x

crates/compiler/test_syntax/tests/snapshots/pass/annotated_tag_destructure.expr.migrated.roc

@@ -0,0 +1,4 @@
+UserId(x,): [UserId(I64,),]
+UserId(x,) = UserId(42,)
+
+x

crates/compiler/test_syntax/tests/snapshots/pass/annotated_tuple_destructure.expr.migrated.roc

@@ -0,0 +1,4 @@
+(x,y,): Foo
+(x,y,) = ("foo",3.14,)
+
+x

crates/compiler/test_syntax/tests/snapshots/pass/annotation_apply_newlines.expr.migrated.roc

@@ -0,0 +1,4 @@
+A(
+p,) :
+e
+A

crates/compiler/test_syntax/tests/snapshots/pass/annotation_comment_before_as.expr.migrated.roc

@@ -0,0 +1,3 @@
+e: A #
+as H()
+n

crates/compiler/test_syntax/tests/snapshots/pass/annotation_comment_before_colon.expr.migrated.roc

@@ -0,0 +1,4 @@
+A(
+e, # g
+) : A
+AA

crates/compiler/test_syntax/tests/snapshots/pass/annotation_double_as.expr.migrated.roc

@@ -0,0 +1,2 @@
+s: eas A()as A()
+s

crates/compiler/test_syntax/tests/snapshots/pass/annotation_tag_parens_comment.expr.migrated.roc

@@ -0,0 +1,3 @@
+g: [T(T, #
+    ),]
+D

crates/compiler/test_syntax/tests/snapshots/pass/annotation_tuple_comment.expr.migrated.roc

@@ -0,0 +1,3 @@
+3: (..n #
+), -> n
+0

crates/compiler/test_syntax/tests/snapshots/pass/annotation_tuple_newline.expr.migrated.roc

@@ -0,0 +1,3 @@
+d: (J,..g
+)
+2

crates/compiler/test_syntax/tests/snapshots/pass/annotation_tuple_parens_newlines.expr.migrated.roc

@@ -0,0 +1,4 @@
+p: (..
+i
+)
+{}

crates/compiler/test_syntax/tests/snapshots/pass/annotation_tuples_ext_galore.expr.migrated.roc

@@ -0,0 +1,2 @@
+1: ((),..n)
+l

crates/compiler/test_syntax/tests/snapshots/pass/applies_in_binop.expr.migrated.roc

@@ -0,0 +1,3 @@
+Str.getUnsafe(haystack,haystackIndex,)
+==
+Str.getUnsafe(needle,needleIndex,)

crates/compiler/test_syntax/tests/snapshots/pass/apply_bang_bang_closure.expr.migrated.roc

@@ -0,0 +1,3 @@
+!!
+|w| 2(
+n,)

crates/compiler/test_syntax/tests/snapshots/pass/apply_binop_switch.expr.migrated.roc

@@ -0,0 +1,2 @@
+i < 2
+-6

crates/compiler/test_syntax/tests/snapshots/pass/apply_closure_pizza.expr.migrated.roc

@@ -0,0 +1,2 @@
+foo
+|> Dict.keepIf(|(k,_v,)| List.contains(keysToDelete,k,) |> Bool.not,)

crates/compiler/test_syntax/tests/snapshots/pass/apply_parenthetical_tag_args.expr.migrated.roc

@@ -0,0 +1 @@
+Whee((12),(34),)

crates/compiler/test_syntax/tests/snapshots/pass/apply_record_ann.expr.migrated.roc

@@ -0,0 +1,3 @@
+a: N({h
+},)
+g

crates/compiler/test_syntax/tests/snapshots/pass/apply_record_parens_newline_field.expr.migrated.roc

@@ -0,0 +1,2 @@
+0({lxtl: (se #
+    )},)

crates/compiler/test_syntax/tests/snapshots/pass/apply_tag.expr.migrated.roc

@@ -0,0 +1 @@
+Whee(12,34,)

crates/compiler/test_syntax/tests/snapshots/pass/apply_tag_pnc.expr.migrated.roc

@@ -0,0 +1 @@
+Whee(12,34,)

crates/compiler/test_syntax/tests/snapshots/pass/apply_tag_single_arg_pnc.pattern.migrated.roc

@@ -0,0 +1 @@
+Ok(a,)

crates/compiler/test_syntax/tests/snapshots/pass/apply_tag_single_arg_whitespace.pattern.migrated.roc

@@ -0,0 +1 @@
+Ok(a,)

crates/compiler/test_syntax/tests/snapshots/pass/apply_three_args.expr.migrated.roc

@@ -0,0 +1 @@
+a(b,c,d,)

crates/compiler/test_syntax/tests/snapshots/pass/apply_tuple_ext_parens_ty.expr.migrated.roc

@@ -0,0 +1,2 @@
+i: M((),c,)
+t

crates/compiler/test_syntax/tests/snapshots/pass/apply_two_args.expr.migrated.roc

@@ -0,0 +1 @@
+whee(12,34,)

crates/compiler/test_syntax/tests/snapshots/pass/apply_two_args_pnc.expr.migrated.roc

@@ -0,0 +1 @@
+whee(12,34,)

crates/compiler/test_syntax/tests/snapshots/pass/apply_unary_negation.expr.migrated.roc

@@ -0,0 +1 @@
+-whee(12,foo,)

crates/compiler/test_syntax/tests/snapshots/pass/apply_unary_not.expr.migrated.roc

@@ -0,0 +1 @@
+!whee(12,foo,)

crates/compiler/test_syntax/tests/snapshots/pass/arg_pattern_as.expr.migrated.roc

@@ -0,0 +1,2 @@
+|{x,y,} as point@Location(inner,) as outer|
+crash("",)

crates/compiler/test_syntax/tests/snapshots/pass/as_in_func_type_args.expr.migrated.roc

@@ -0,0 +1,3 @@
+e: J
+as H(), -> A
+r

crates/compiler/test_syntax/tests/snapshots/pass/assign_parens_item_newline_comment.expr.migrated.roc

@@ -0,0 +1,5 @@
+a = (
+i
+#
+)
+r

crates/compiler/test_syntax/tests/snapshots/pass/backslash_closure_last_expr.expr.migrated.roc

@@ -0,0 +1,2 @@
+b
+|e| s

crates/compiler/test_syntax/tests/snapshots/pass/bang_newline_double_accessor.expr.migrated.roc

@@ -0,0 +1,4 @@
+0
+!
+.d
+.d

crates/compiler/test_syntax/tests/snapshots/pass/bangs_and_tuple_accessors.expr.migrated.roc

@@ -0,0 +1,3 @@
+J
+!
+.1(!.0,)

crates/compiler/test_syntax/tests/snapshots/pass/basic_apply.expr.migrated.roc

@@ -0,0 +1 @@
+whee(1,)

crates/compiler/test_syntax/tests/snapshots/pass/basic_docs.expr.migrated.roc

@@ -0,0 +1,9 @@
+## first line of docs
+##     second line
+##  third line
+## fourth line
+##
+## sixth line after doc new line
+x = 5
+
+42

crates/compiler/test_syntax/tests/snapshots/pass/basic_field.expr.migrated.roc

@@ -0,0 +1 @@
+rec.field

crates/compiler/test_syntax/tests/snapshots/pass/basic_tag.expr.migrated.roc

@@ -0,0 +1 @@
+Whee

crates/compiler/test_syntax/tests/snapshots/pass/basic_tuple.expr.migrated.roc

@@ -0,0 +1 @@
+(1,2,3,)

crates/compiler/test_syntax/tests/snapshots/pass/basic_var.expr.migrated.roc

@@ -0,0 +1 @@
+whee

crates/compiler/test_syntax/tests/snapshots/pass/binop_apply_complex.expr.migrated.roc

@@ -0,0 +1 @@
+N < l((r * N),)

crates/compiler/test_syntax/tests/snapshots/pass/binop_assign_defs_nested.expr.migrated.roc

@@ -0,0 +1,5 @@
+5 - (({
+    e = ((
+    r))
+    1
+}))

crates/compiler/test_syntax/tests/snapshots/pass/binop_closure_apply.expr.migrated.roc

@@ -0,0 +1,3 @@
+d +
+(|w| x)(
+x,)

crates/compiler/test_syntax/tests/snapshots/pass/binops_comment_indent_change.expr.migrated.roc

@@ -0,0 +1,4 @@
+r ^
+-f(
+#
+-P,)

crates/compiler/test_syntax/tests/snapshots/pass/block_string_ann.expr.migrated.roc

@@ -0,0 +1,2 @@
+"${g}": q
+f

crates/compiler/test_syntax/tests/snapshots/pass/body_block_string_apply_string.expr.migrated.roc

@@ -0,0 +1,5 @@
+t =
+"""
+" 
+"""("",)
+S

crates/compiler/test_syntax/tests/snapshots/pass/body_with_unneeded_parens.expr.migrated.roc

@@ -0,0 +1,3 @@
+a = (
+6)
+a

crates/compiler/test_syntax/tests/snapshots/pass/call_bang.expr.migrated.roc

@@ -0,0 +1 @@
+launchTheNukes!(123,)

crates/compiler/test_syntax/tests/snapshots/pass/call_bang_no_space.expr.migrated.roc

@@ -0,0 +1 @@
+fxFn!(arg,)

crates/compiler/test_syntax/tests/snapshots/pass/can_ignored_field_in_import.expr.migrated.roc

@@ -0,0 +1,3 @@
+importP{_: h
+}
+t!

crates/compiler/test_syntax/tests/snapshots/pass/capture_body_parens_comment.expr.migrated.roc

@@ -0,0 +1,2 @@
+|L| E
+#

crates/compiler/test_syntax/tests/snapshots/pass/closure_arg_parens_then_comment.expr.migrated.roc

@@ -0,0 +1 @@
+|8| T #

crates/compiler/test_syntax/tests/snapshots/pass/closure_complex_pattern_indent_issue.expr.migrated.roc

@@ -0,0 +1,4 @@
+|I({p? Y(
+    Y,)?,},[
+],)|
+K # (

crates/compiler/test_syntax/tests/snapshots/pass/closure_in_apply_in_binop.expr.migrated.roc

@@ -0,0 +1,2 @@
+m0(|w| w?(e,),)
+/ s

crates/compiler/test_syntax/tests/snapshots/pass/closure_in_binop_with_spaces.expr.migrated.roc

@@ -0,0 +1,2 @@
+i > |s| s
+-a

crates/compiler/test_syntax/tests/snapshots/pass/closure_newline_empty_record_newline.expr.migrated.roc

@@ -0,0 +1,4 @@
+|L|
+{
+}
+Θ

crates/compiler/test_syntax/tests/snapshots/pass/closure_parens_double_newlines.expr.migrated.roc

@@ -0,0 +1,3 @@
+|L(z,
+
+)| 42

crates/compiler/test_syntax/tests/snapshots/pass/closure_pat_reccord_comment.expr.migrated.roc

@@ -0,0 +1,2 @@
+|{i, #
+    e,}| a