parse attributes for function and arg respectively

Author: mununki

src/res_core.ml

@@ -1534,6 +1534,7 @@ and parseParameter p =
   then
     let startPos = p.Parser.startPos in
     let uncurried = Parser.optional p Token.Dot in
+    (* FIXME: stale comments *)
     (* two scenarios:
      *   attrs ~lbl ...
      *   attrs pattern
@@ -1557,9 +1558,9 @@ and parseParameter p =
           match p.Parser.token with
           | Comma | Equal | Rparen ->
             let loc = mkLoc startPos p.prevEndPos in
-            ( attrs,
+            ( [],
               Asttypes.Labelled lblName,
-              Ast_helper.Pat.var ~attrs:[propLocAttr] ~loc
+              Ast_helper.Pat.var ~attrs:(attrs @ [propLocAttr]) ~loc
                 (Location.mkloc lblName loc) )
           | Colon ->
             let lblEnd = p.prevEndPos in
@@ -1569,20 +1570,24 @@ and parseParameter p =
             let pat =
               let pat = Ast_helper.Pat.var ~loc (Location.mkloc lblName loc) in
               let loc = mkLoc startPos p.prevEndPos in
-              Ast_helper.Pat.constraint_ ~attrs:[propLocAttr] ~loc pat typ
+              Ast_helper.Pat.constraint_ ~attrs:(attrs @ [propLocAttr]) ~loc pat
+                typ
             in
-            (attrs, Asttypes.Labelled lblName, pat)
+            ([], Asttypes.Labelled lblName, pat)
           | As ->
             Parser.next p;
             let pat =
               let pat = parseConstrainedPattern p in
-              {pat with ppat_attributes = propLocAttr :: pat.ppat_attributes}
+              {
+                pat with
+                ppat_attributes = attrs @ (propLocAttr :: pat.ppat_attributes);
+              }
             in
-            (attrs, Asttypes.Labelled lblName, pat)
+            ([], Asttypes.Labelled lblName, pat)
           | t ->
             Parser.err p (Diagnostics.unexpected t p.breadcrumbs);
             let loc = mkLoc startPos p.prevEndPos in
-            ( attrs,
+            ( [],
               Asttypes.Labelled lblName,
               Ast_helper.Pat.var ~loc (Location.mkloc lblName loc) ))
         | _ ->

src/res_parsetree_viewer.ml

@@ -136,7 +136,7 @@ let funExpr expr =
       collectNewTypes (stringLoc :: acc) returnExpr
     | returnExpr -> (List.rev acc, returnExpr)
   in
-  let rec collect n attrsBefore acc expr =
+  let rec collect attrsBefore acc expr =
     match expr with
     | {
      pexp_desc =
@@ -147,48 +147,29 @@ let funExpr expr =
            {pexp_desc = Pexp_apply _} );
     } ->
       (attrsBefore, List.rev acc, rewriteUnderscoreApply expr)
-    | {
-     pexp_desc = Pexp_fun (lbl, defaultExpr, pattern, returnExpr);
-     pexp_attributes = [];
-    } ->
-      let parameter = Parameter {attrs = []; lbl; defaultExpr; pat = pattern} in
-      collect (n + 1) attrsBefore (parameter :: acc) returnExpr
     | {pexp_desc = Pexp_newtype (stringLoc, rest); pexp_attributes = attrs} ->
       let stringLocs, returnExpr = collectNewTypes [stringLoc] rest in
       let param = NewTypes {attrs; locs = stringLocs} in
-      collect (n + 1) attrsBefore (param :: acc) returnExpr
-    | {pexp_desc = Pexp_fun _; pexp_attributes}
-      when pexp_attributes
-           |> List.exists (fun ({Location.txt}, _) ->
-                  txt = "bs" || txt = "res.async")
-           && n > 0 ->
-      (* stop here, the uncurried or async attribute always indicates the beginning of an arrow function
-       * e.g. `(. a) => (. b)` instead of `(. a, . b)` *)
-      (attrsBefore, List.rev acc, expr)
+      collect attrsBefore (param :: acc) returnExpr
     | {
-     pexp_desc =
-       Pexp_fun
-         (((Labelled _ | Optional _) as lbl), defaultExpr, pattern, returnExpr);
-     pexp_attributes = attrs;
-    } ->
-      (* Normally attributes are attached to the labelled argument, e.g. (@foo ~x) => ...
-         In the case of `@res.async`, pass the attribute to the outside *)
-      let attrs_async, attrs_other =
-        attrs |> List.partition (fun ({Location.txt}, _) -> txt = "res.async")
+     pexp_desc = Pexp_fun (lbl, defaultExpr, pattern, returnExpr);
+     pexp_attributes;
+    } -> (
+      let attrs_async_bs, attrs_other =
+        pexp_attributes
+        |> List.partition (fun ({Location.txt}, _) ->
+               txt = "res.async" || txt = "bs")
       in
       let parameter =
         Parameter {attrs = attrs_other; lbl; defaultExpr; pat = pattern}
       in
-      collect (n + 1) (attrs_async @ attrsBefore) (parameter :: acc) returnExpr
+      match attrs_async_bs with
+      | [] -> collect attrsBefore (parameter :: acc) returnExpr
+      | attrs_async_bs ->
+        (attrs_async_bs @ attrsBefore, List.rev (parameter :: acc), expr))
     | expr -> (attrsBefore, List.rev acc, expr)
   in
-  match expr with
-  | {
-      pexp_desc = Pexp_fun (Nolabel, _defaultExpr, _pattern, _returnExpr);
-      pexp_attributes = attrs;
-    } as expr ->
-    collect 0 attrs [] {expr with pexp_attributes = []}
-  | expr -> collect 0 [] [] expr
+  collect [] [] expr
 
 let processBracesAttr expr =
   match expr.pexp_attributes with

tests/conversion/reason/expected/bracedJsx.res.txt

@@ -110,7 +110,7 @@ let make = () => {
     <div role="heading" ariaLevel=1 className=Styles.title> {"Erreur"->ReasonReact.string} </div>
     <div
       className=Styles.terminal
-      onClick={event => (event->ReactEvent.Mouse.target)["querySelector"]("input")["focus"]()}
+      onClick={(event) => (event->ReactEvent.Mouse.target)["querySelector"]("input")["focus"]()}
       ref={containerRef->ReactDOMRe.Ref.domRef}
     >
       {state.history
@@ -132,8 +132,8 @@ let make = () => {
           className=Styles.input
           autoFocus=true
           value=state.input
-          onChange={event => send(SetValue((event->ReactEvent.Form.target)["value"]))}
-          onKeyDown={event => {
+          onChange={(event) => send(SetValue((event->ReactEvent.Form.target)["value"]))}
+          onKeyDown={(event) => {
             if event->ReactEvent.Keyboard.key == "Enter" {
               send(RunCommand)
             }

tests/conversion/reason/expected/jsxProps.res.txt

@@ -6,12 +6,12 @@ let handleClick = (href, event) =>
 
 @react.component
 let make = (~href, ~className="", ~children) =>
-  <a href className onClick={event => handleClick(href, event)}> children </a>
+  <a href className onClick={(event) => handleClick(href, event)}> children </a>
 
-<Animated> ...{x => <div />} </Animated>
+<Animated> ...{(x) => <div />} </Animated>
 
 <div> ...element </div>
-<div> ...{a => 1} </div>
+<div> ...{(a) => 1} </div>
 <div> ...<span /> </div>
 <div> ...[a, b] </div>
 <div> ...{(1, 2)} </div>

tests/conversion/reason/expected/uncurrried.res.txt

@@ -1,5 +1,5 @@
 // ok
-let updateBriefletNarrative = (. updateObj) => Js.log("patented merge algorithm goes here")
+// let updateBriefletNarrative = (. updateObj) => Js.log("patented merge algorithm goes here")
 
 // this is a bug in Reason, the . will be parsed wrong and disappear.
 /* updateBriefletNarrative(. briefletNarrativeUpdateObj); */
@@ -23,7 +23,7 @@ let x = {
 
 let x = {
   // ok
-  let f = (. a, b) => apply(. a + b)
+  // let f = (. a, b) => apply(. a + b)
   let a = 3
   // ok
   foo(. a)
@@ -44,7 +44,7 @@ let () = switch something(. x, y) {
 
 let () = {
   // ok
-  let dontDoThisAhome = (. a, b) => (. c, d) => (. e, f) => a + b + c + d + e + f
+  // let dontDoThisAhome = (. a, b, . c, d, . e, f) => a + b + c + d + e + f
   // ok
   dontDoThisAhome(. a, b)(. c, d)(. e, f)
 }

tests/parsing/grammar/expressions/expected/arrow.res.txt

@@ -46,16 +46,17 @@ let f = ((fun a -> fun b -> fun c -> ())[@bs ])
 let f = ((fun a -> fun b -> ((fun c -> fun d -> ())[@bs ]))[@bs ])
 let f = ((fun a -> ((fun b -> ((fun c -> ())[@bs ]))[@bs ]))[@bs ])
 let f =
-  ((fun ~a:((a)[@ns.namedArgLoc ]) ->
-      fun b -> ((fun ~c:((c)[@ns.namedArgLoc ]) -> fun d -> ())
-        [@bs ][@attr ]))
-  [@bs ][@attr ])
+  ((fun ~a:((a)[@attr ][@ns.namedArgLoc ]) ->
+      fun b -> ((fun ~c:((c)[@attr ][@ns.namedArgLoc ]) -> fun d -> ())
+        [@bs ]))
+  [@bs ])
 let f =
-  ((fun ~a:((a)[@ns.namedArgLoc ]) ->
+  ((fun ~a:((a)[@attr ][@ns.namedArgLoc ]) ->
       fun ((b)[@attrOnB ]) ->
-        ((fun ~c:((c)[@ns.namedArgLoc ]) -> fun ((d)[@attrOnD ]) -> ())
-        [@bs ][@attr ]))
-  [@bs ][@attr ])
+        ((fun ~c:((c)[@attr ][@ns.namedArgLoc ]) ->
+            fun ((d)[@attrOnD ]) -> ())
+        [@bs ]))
+  [@bs ])
 let f list = list ()
 ;;match colour with
   | Red when

tests/ppx/react/expected/forwardRef.res.txt

@@ -13,25 +13,23 @@ module V3 = {
 
     @react.component
     let make =
-      (@warning("-16") ~className=?, @warning("-16") ~children) =>
-        @warning("-16")
-        ref =>
-          ReactDOMRe.createDOMElementVariadic(
-            "div",
-            [
-              ReactDOMRe.createDOMElementVariadic(
-                "input",
-                ~props=ReactDOMRe.domProps(
-                  ~type_="text",
-                  ~className?,
-                  ~ref=?{Js.Nullable.toOption(ref)->Belt.Option.map(ReactDOM.Ref.domRef)},
-                  (),
-                ),
-                [],
+      (@warning("-16") ~className=?, @warning("-16") ~children, @warning("-16") ref) =>
+        ReactDOMRe.createDOMElementVariadic(
+          "div",
+          [
+            ReactDOMRe.createDOMElementVariadic(
+              "input",
+              ~props=ReactDOMRe.domProps(
+                ~type_="text",
+                ~className?,
+                ~ref=?{Js.Nullable.toOption(ref)->Belt.Option.map(ReactDOM.Ref.domRef)},
+                (),
               ),
-              children,
-            ],
-          )
+              [],
+            ),
+            children,
+          ],
+        )
     let make = React.forwardRef({
       let \"ForwardRef$V3$FancyInput" = (
         \"Props": {"className": option<'className>, "children": 'children},

tests/printer/expr/expected/apply.res.txt

@@ -61,7 +61,7 @@ let x = @attrWithLongName @attrWithLongName @attrWithLongName @attrWithLongName
 call(~a: int)
 call(~\"let": int)
 
-document.createElementWithOptions(. "div", elementProps(~onClick=_ => Js.log("hello world")))
+document.createElementWithOptions(. "div", elementProps(~onClick=(_) => Js.log("hello world")))
 
 f(. 1)
 f(. [1, 2, 3])

tests/printer/expr/expected/asyncAwait.res.txt

@@ -1,120 +0,0 @@
-let sequentialAwait = async () => {
-  let result1 = await paused("first")
-  nodeJsAssert.equal(result1, "first")
-
-  let result2 = await paused("second")
-  nodeJsAssert.equal(result2, "second")
-}
-
-let f = async () => ()
-let f = async (. ()) => ()
-let f = async f => f()
-let f = async (a, b) => a + b
-let f = async (. a, b) => a + b
-
-let maybeSomeValue = switch await fetchData(url) {
-| data => Some(data)
-| exception JsError(_) => None
-}
-
-(await f)(a, b)
--(await f)
-(await 1) + (await 2)
-
-lazy (await f())
-assert (await f())
-
-(await f).json()
-
-user.data = await fetch()
-
-<Navbar promise={await gc()}> {await weirdReactSuspenseApi} </Navbar>
-
-let inBinaryExpression = (await x)->Js.Promise.resolve + 1
-let inBinaryExpression = (await x)->Js.Promise.resolve + (await y)->Js.Promise.resolve
-
-let withCallback = async (. ()) => {
-  async (. x) => await (x->Js.promise.resolve) + 1
-}
-
-let () = (await fetch(url))->(await resolve)
-
-let _ = await (1 + 1)
-let _ = (await 1) + 1
-let _ = await -1
-let _ = await -1
-let _ = await !ref
-let _ = await f
-let _ = await %extension
-let _ = await "test"
-let _ = await ((a, b) => a + b)
-let _ = await (async (a, b) => a + b)
-let _ = await (
-  switch x {
-  | A => ()
-  | B => ()
-  }
-)
-let _ = await [1, 2, 3]
-let _ = await (1, 2, 3)
-let _ = await {name: "Steve", age: 32}
-let _ = await (user.name = "Steve")
-let _ = await (
-  if 20 {
-    true
-  } else {
-    false
-  }
-)
-let _ = await (condition() ? true : false)
-let _ = await f(x)
-let _ = await f(. x)
-let _ = (await (f(x): Js.Promise.t<unit>))
-let _ = await (
-  while true {
-    infiniteLoop()
-  }
-)
-let _ = await (
-  try ok() catch {
-  | _ => logError()
-  }
-)
-let _ = await (
-  for i in 0 to 10 {
-    sideEffect()
-  }
-)
-let _ = await (lazy x)
-let _ = await (assert x)
-let _ = await promises[0]
-let _ = await promises["resolved"]
-let _ = await promises["resolved"] = sideEffect()
-let _ = @attr await (expr)
-let _ = await module(Foo)
-let _ = await module(Foo: Bar)
-let _ = await Promise
-let _ = await Promise(status)
-
-// braces are being dropped, because the ast only has space to record braces surrounding the await
-let _ = await x
-// here braces stay, because of precedence
-let _ = await {
-  let x = 1
-  Js.Promise.resolve(x)
-}
-
-let f1 = async (~x, ~y) => x + y
-let f2 = async (@foo ~x, @bar ~y) => x + y
-let f3 = async (@bar @foo ~x as @zz z, ~y) => x + y
-let f4 = async x => x
-let f5 = async x => async y => 3
-let f6 = async (~x1, ~x2) => async y => 3
-let f7 = async x => async (~y) => 3
-let f8 = async (~x1, ~x2) => async (~y) => 3
-let f9 = x => async (~y) => 3
-let f10 = x => async y => 3
-let f11 = (. ~x) => (. ~y) => 3
-
-let f12 = @a x => 3
-let f13 = (@a @b ~x) => 3

tests/printer/expr/expected/block.res.txt

@@ -56,7 +56,7 @@ React.useEffect0(() => {
 })
 
 <div
-  onClick={event => {
+  onClick={(event) => {
     switch videoContainerRect {
     | Some(videoContainerRect) =>
       let newChapter = ({startTime: percent *. duration}: Video.chapter)

tests/printer/expr/expected/braced.res.txt

@@ -26,7 +26,7 @@ let _ = {a}
 
 let _ = {"constant"}
 
-let _ = {() => Js.log("test")}
+let _ = {(()) => Js.log("test")}
 let _ = {
   switch b {
   | true => ()