Sync latest syntax.

Author: cristianoc

CHANGELOG.md

@@ -12,6 +12,15 @@
 
 # 10.1.0-rc.2
 
+#### :bug: Bug Fix
+
+- Fix emitting unary minus for floats in case of negative constants https://github.com/rescript-lang/rescript-compiler/pull/5737
+- Fix issue where a spread `...x` in non-last position would not be reported as syntax error https://github.com/rescript-lang/syntax/pull/673/
+- Fix issue where the formatter would delete `async` in a function with labelled arguments.
+- Fix several printing issues with `async` including an infinite loop https://github.com/rescript-lang/syntax/pull/680
+- Fix issue where certain JSX expressions would be formatted differenctly in compiler 10.1.0-rc.1 https://github.com/rescript-lang/syntax/issues/675
+- Fix issue where printing nested pipe discards await https://github.com/rescript-lang/syntax/issues/687
+
 # 10.1.0-rc.1
 
 #### :boom: Breaking Change
@@ -35,7 +44,6 @@
 - Fix issue where formatter erases tail comments inside JSX tag https://github.com/rescript-lang/syntax/issues/663
 - Fix issue where the JSX prop has type annotation of the first class module https://github.com/rescript-lang/syntax/pull/666
 - Fix issue where an empty record literal {} expected to have a non-record type would type check https://github.com/rescript-lang/rescript-compiler/pull/5729
-- Fix emitting unary minus for floats in case of negative constants https://github.com/rescript-lang/rescript-compiler/pull/5737
 
 #### :eyeglasses: Spec Compliance
 

jscomp/napkin/CHANGELOG.md

@@ -38,6 +38,11 @@
 - Fix printing of comments inside JSX tag https://github.com/rescript-lang/syntax/pull/664
 - Fix issue where formatter erases tail comments inside JSX tag https://github.com/rescript-lang/syntax/issues/663
 - Fix issue where the JSX prop has type annotation of the first class module https://github.com/rescript-lang/syntax/pull/666
+- Fix issue where a spread `...x` in non-last position would not be reported as syntax error https://github.com/rescript-lang/syntax/pull/673/
+- Fix issue where the formatter would delete `async` in a function with labelled arguments.
+- Fix several printing issues with `async` including an infinite loop https://github.com/rescript-lang/syntax/pull/680
+- Fix issue where certain JSX expressions would be formatted differenctly in compiler 10.1.0-rc.1 https://github.com/rescript-lang/syntax/issues/675
+- Fix issue where printing nested pipe discards await https://github.com/rescript-lang/syntax/issues/687
 
 #### :eyeglasses: Spec Compliance
 

lib/4.06.1/unstable/js_compiler.ml

@@ -47928,7 +47928,7 @@ let funExpr expr =
       collectNewTypes (stringLoc :: acc) returnExpr
     | returnExpr -> (List.rev acc, returnExpr)
   in
-  let rec collect attrsBefore acc expr =
+  let rec collect n attrsBefore acc expr =
     match expr with
     | {
      pexp_desc =
@@ -47944,13 +47944,17 @@ let funExpr expr =
      pexp_attributes = [];
     } ->
       let parameter = Parameter {attrs = []; lbl; defaultExpr; pat = pattern} in
-      collect attrsBefore (parameter :: acc) returnExpr
+      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 attrsBefore (param :: acc) returnExpr
-    | {pexp_desc = Pexp_fun _; pexp_attributes = [({txt = "bs"}, _)]} ->
-      (* stop here, the uncurried attribute always indicates the beginning of an arrow function
+      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)
     | {
@@ -47959,17 +47963,24 @@ let funExpr expr =
          (((Labelled _ | Optional _) as lbl), defaultExpr, pattern, returnExpr);
      pexp_attributes = attrs;
     } ->
-      let parameter = Parameter {attrs; lbl; defaultExpr; pat = pattern} in
-      collect attrsBefore (parameter :: acc) returnExpr
+      (* 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")
+      in
+      let parameter =
+        Parameter {attrs = attrs_other; lbl; defaultExpr; pat = pattern}
+      in
+      collect (n + 1) (attrs_async @ attrsBefore) (parameter :: acc) returnExpr
     | expr -> (attrsBefore, List.rev acc, expr)
   in
   match expr with
   | {
       pexp_desc = Pexp_fun (Nolabel, _defaultExpr, _pattern, _returnExpr);
       pexp_attributes = attrs;
     } as expr ->
-    collect attrs [] {expr with pexp_attributes = []}
-  | expr -> collect [] [] expr
+    collect 0 attrs [] {expr with pexp_attributes = []}
+  | expr -> collect 0 [] [] expr
 
 let processBracesAttr expr =
   match expr.pexp_attributes with
@@ -51398,6 +51409,11 @@ let hasCommentsInside tbl loc =
   | None -> false
   | _ -> true
 
+let hasTrailingComments tbl loc =
+  match Hashtbl.find_opt tbl.CommentTable.trailing loc with
+  | None -> false
+  | _ -> true
+
 let printMultilineCommentContent txt =
   (* Turns
    *         |* first line
@@ -54879,14 +54895,29 @@ and printBinaryExpression ~customLayout (expr : Parsetree.expression) cmtTbl =
               | [] -> doc
               | _ -> addParens doc
             in
+            let isAwait =
+              ParsetreeViewer.hasAwaitAttribute expr.pexp_attributes
+            in
             let doc =
-              Doc.concat
-                [
-                  leftPrinted;
-                  printBinaryOperator ~inlineRhs:false operator;
-                  rightPrinted;
-                ]
+              if isAwait then
+                Doc.concat
+                  [
+                    Doc.text "await ";
+                    Doc.lparen;
+                    leftPrinted;
+                    printBinaryOperator ~inlineRhs:false operator;
+                    rightPrinted;
+                    Doc.rparen;
+                  ]
+              else
+                Doc.concat
+                  [
+                    leftPrinted;
+                    printBinaryOperator ~inlineRhs:false operator;
+                    rightPrinted;
+                  ]
             in
+
             let doc =
               if (not isLhs) && Parens.rhsBinaryExprOperand operator expr then
                 Doc.concat [Doc.lparen; doc; Doc.rparen]
@@ -55321,8 +55352,17 @@ and printJsxExpression ~customLayout lident args cmtTbl =
                         Pexp_construct ({txt = Longident.Lident "[]"}, None);
                     }
                   when isSelfClosing ->
-                  Doc.concat [Doc.line; Doc.text "/>"]
-                | _ -> Doc.concat [Doc.softLine; Doc.greaterThan]);
+                  Doc.text "/>"
+                | _ ->
+                  (* if tag A has trailing comments then put > on the next line
+                     <A
+                     // comments
+                     >
+                     </A>
+                  *)
+                  if hasTrailingComments cmtTbl lident.Asttypes.loc then
+                    Doc.concat [Doc.softLine; Doc.greaterThan]
+                  else Doc.greaterThan);
               ]);
          (if isSelfClosing then Doc.nil
          else
@@ -55420,6 +55460,27 @@ and printJsxChildren ~customLayout (childrenExpr : Parsetree.expression) ~sep
 
 and printJsxProps ~customLayout args cmtTbl :
     Doc.t * Parsetree.expression option =
+  (* This function was introduced because we have different formatting behavior for self-closing tags and other tags
+     we always put /> on a new line for self-closing tag when it breaks
+     <A
+      a=""
+     />
+
+     <A
+     a="">
+      <B />
+     </A>
+     we should remove this function once the format is unified
+  *)
+  let isSelfClosing children =
+    match children with
+    | {
+     Parsetree.pexp_desc = Pexp_construct ({txt = Longident.Lident "[]"}, None);
+     pexp_loc = loc;
+    } ->
+      not (hasCommentsInside cmtTbl loc)
+    | _ -> false
+  in
   let rec loop props args =
     match args with
     | [] -> (Doc.nil, None)
@@ -55431,13 +55492,42 @@ and printJsxProps ~customLayout args cmtTbl :
            Pexp_construct ({txt = Longident.Lident "()"}, None);
        } );
     ] ->
+      let doc = if isSelfClosing children then Doc.line else Doc.nil in
+      (doc, Some children)
+    | ((_, expr) as lastProp)
+      :: [
+           (Asttypes.Labelled "children", children);
+           ( Asttypes.Nolabel,
+             {
+               Parsetree.pexp_desc =
+                 Pexp_construct ({txt = Longident.Lident "()"}, None);
+             } );
+         ] ->
+      let loc =
+        match expr.Parsetree.pexp_attributes with
+        | ({Location.txt = "ns.namedArgLoc"; loc}, _) :: _attrs ->
+          {loc with loc_end = expr.pexp_loc.loc_end}
+        | _ -> expr.pexp_loc
+      in
+      let trailingCommentsPresent = hasTrailingComments cmtTbl loc in
+      let propDoc = printJsxProp ~customLayout lastProp cmtTbl in
       let formattedProps =
-        Doc.indent
-          (match props with
-          | [] -> Doc.nil
-          | props ->
-            Doc.concat
-              [Doc.line; Doc.group (Doc.join ~sep:Doc.line (props |> List.rev))])
+        Doc.concat
+          [
+            Doc.indent
+              (Doc.concat
+                 [
+                   Doc.line;
+                   Doc.group
+                     (Doc.join ~sep:Doc.line (propDoc :: props |> List.rev));
+                 ]);
+            (* print > on new line if the last prop has trailing comments *)
+            (match (isSelfClosing children, trailingCommentsPresent) with
+            (* we always put /> on a new line when a self-closing tag breaks *)
+            | true, _ -> Doc.line
+            | false, true -> Doc.softLine
+            | false, false -> Doc.nil);
+          ]
       in
       (formattedProps, Some children)
     | arg :: args ->
@@ -55978,7 +56068,7 @@ and printExprFunParameters ~customLayout ~inCallback ~async ~uncurried
     let txtDoc =
       let var = printIdentLike stringLoc.txt in
       let var = if hasConstraint then addParens var else var in
-      if async then addAsync (Doc.concat [Doc.lparen; var; Doc.rparen]) else var
+      if async then addAsync var else var
     in
     printComments txtDoc cmtTbl stringLoc.loc
   (* let f = () => () *)