Backwards-compatible check for braces attribute.

Author: cristianoc

analysis/tests/src/expected/Xform.res.txt

@@ -41,14 +41,14 @@ Hit: Add braces to function
 {"start": {"line": 26, "character": 0}, "end": {"line": 32, "character": 3}}
 newText:
 <--here
-let foo = x =>
+let foo = x => {
   //      ^xfm
-  @ns.braces
   switch x {
   | None => 33
   | Some(q) => q.T.a + 1
   //     ^xfm
   }
+}
 
 Xform src/Xform.res 34:21
 Hit: Add type annotation
@@ -71,15 +71,19 @@ Hit: Add braces to function
 {"start": {"line": 48, "character": 0}, "end": {"line": 48, "character": 25}}
 newText:
 <--here
-let noBraces = () => @ns.braces name
+let noBraces = () => {
+  name
+}
 
 Xform src/Xform.res 52:34
 Hit: Add braces to function
 {"start": {"line": 51, "character": 0}, "end": {"line": 54, "character": 1}}
 newText:
 <--here
 let nested = () => {
-  let _noBraces = (_x, _y, _z) => @ns.braces "someNewFunc"
+  let _noBraces = (_x, _y, _z) => {
+    "someNewFunc"
+  }
   //                              ^xfm
 }
 
@@ -88,10 +92,10 @@ Hit: Add braces to function
 {"start": {"line": 58, "character": 4}, "end": {"line": 62, "character": 7}}
 newText:
     <--here
-    let foo = (_x, y, _z) =>
-      @ns.braces
+    let foo = (_x, y, _z) => {
       switch y {
       | #some => 3
       | #stuff => 4
       }
+    }
 

analysis/vendor/res_outcome_printer/res_comments_table.ml

@@ -360,7 +360,7 @@ let getLoc node =
     | _ -> expr.pexp_loc)
   | Expression e -> (
     match e.pexp_attributes with
-    | ({txt = "res.braces"; loc}, _) :: _ -> loc
+    | ({txt = "res.braces"| "ns.braces"; loc}, _) :: _ -> loc
     | _ -> e.pexp_loc)
   | ExprRecordRow (li, e) -> {li.loc with loc_end = e.pexp_loc.loc_end}
   | ExtensionConstructor ec -> ec.pext_loc

analysis/vendor/res_outcome_printer/res_parsetree_viewer.ml

@@ -193,7 +193,7 @@ let funExpr expr =
 
 let processBracesAttr expr =
   match expr.pexp_attributes with
-  | (({txt = "res.braces"}, _) as attr) :: attrs ->
+  | (({txt = "res.braces" | "ns.braces"}, _) as attr) :: attrs ->
     (Some attr, {expr with pexp_attributes = attrs})
   | _ -> (None, expr)
 
@@ -203,7 +203,7 @@ let filterParsingAttrs attrs =
       match attr with
       | ( {
             Location.txt =
-              ( "bs" | "res.uapp" | "res.arity" | "res.braces" | "res.iflet"
+              ( "bs" | "res.uapp" | "res.arity" | "res.braces"| "ns.braces" | "res.iflet"
               | "res.namedArgLoc" | "res.optional" | "res.ternary" | "res.async"
               | "res.await" | "res.template" );
           },
@@ -357,7 +357,7 @@ let hasAttributes attrs =
       match attr with
       | ( {
             Location.txt =
-              ( "bs" | "res.uapp" | "res.arity" | "res.braces" | "res.iflet"
+              ( "bs" | "res.uapp" | "res.arity" | "res.braces"| "ns.braces" | "res.iflet"
               | "res.ternary" | "res.async" | "res.await" | "res.template" );
           },
           _ ) ->
@@ -539,7 +539,7 @@ let isPrintableAttribute attr =
   match attr with
   | ( {
         Location.txt =
-          ( "bs" | "res.uapp" | "res.arity" | "res.iflet" | "res.braces" | "JSX"
+          ( "bs" | "res.uapp" | "res.arity" | "res.iflet" | "res.braces"| "ns.braces" | "JSX"
           | "res.async" | "res.await" | "res.template" | "res.ternary" );
       },
       _ ) ->

analysis/vendor/res_outcome_printer/res_printer.ml

@@ -3270,7 +3270,7 @@ and printExpression ~state (e : Parsetree.expression) cmtTbl =
               pexp_attributes =
                 List.filter
                   (function
-                    | {Location.txt = "res.braces"}, _ -> false
+                    | {Location.txt = "res.braces"| "ns.braces"}, _ -> false
                     | _ -> true)
                   e.pexp_attributes;
             }