Sync latest syntax. (#5775)

Author: cristianoc

CHANGELOG.md

@@ -19,6 +19,7 @@
 #### :bug: Bug Fix
 
 - Fix issue where the last line of `rescript format --help` usage was being swallowed https://github.com/rescript-lang/rescript-compiler/pull/5760
+- Specialize the printing of the rhs of a record field assignment for optional values `{x: ? e}` https://github.com/rescript-lang/syntax/issues/714
 
 # 10.1.0-rc.3
 

jscomp/napkin/CHANGELOG.md

@@ -60,6 +60,7 @@
 
 - Change the internal representation of props for the lowercase components to record. https://github.com/rescript-lang/syntax/pull/665
 - Change the payload of Pconst_char for type safety. https://github.com/rescript-lang/rescript-compiler/pull/5759
+- Specialize the printing of the rhs of a record field assignment for optional values `{x: ? e}` https://github.com/rescript-lang/syntax/issues/714
 
 ## ReScript 10.0
 

lib/4.06.1/unstable/js_compiler.ml

@@ -52172,6 +52172,8 @@ val arrowReturnTypExpr : Parsetree.core_type -> bool
 
 val patternRecordRowRhs : Parsetree.pattern -> bool
 
+val exprRecordRowRhs : Parsetree.expression -> kind
+
 end = struct
 #1 "res_parens.ml"
 module ParsetreeViewer = Res_parsetree_viewer
@@ -52191,6 +52193,16 @@ let expr expr =
     | {pexp_desc = Pexp_constraint _} -> Parenthesized
     | _ -> Nothing)
 
+let exprRecordRowRhs e =
+  let kind = expr e in
+  match kind with
+  | Nothing when Res_parsetree_viewer.hasOptionalAttribute e.pexp_attributes
+    -> (
+    match e.pexp_desc with
+    | Pexp_ifthenelse _ | Pexp_fun _ -> Parenthesized
+    | _ -> kind)
+  | _ -> kind
+
 let callExpr expr =
   let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
   match optBraces with
@@ -58265,7 +58277,7 @@ and printExpressionRecordRow ~customLayout (lbl, expr) cmtTbl punningAllowed =
             Doc.text ": ";
             printOptionalLabel expr.pexp_attributes;
             (let doc = printExpressionWithComments ~customLayout expr cmtTbl in
-             match Parens.expr expr with
+             match Parens.exprRecordRowRhs expr with
              | Parens.Parenthesized -> addParens doc
              | Braced braces -> printBraces doc expr braces
              | Nothing -> doc);

lib/4.06.1/unstable/js_playground_compiler.ml

@@ -52172,6 +52172,8 @@ val arrowReturnTypExpr : Parsetree.core_type -> bool
 
 val patternRecordRowRhs : Parsetree.pattern -> bool
 
+val exprRecordRowRhs : Parsetree.expression -> kind
+
 end = struct
 #1 "res_parens.ml"
 module ParsetreeViewer = Res_parsetree_viewer
@@ -52191,6 +52193,16 @@ let expr expr =
     | {pexp_desc = Pexp_constraint _} -> Parenthesized
     | _ -> Nothing)
 
+let exprRecordRowRhs e =
+  let kind = expr e in
+  match kind with
+  | Nothing when Res_parsetree_viewer.hasOptionalAttribute e.pexp_attributes
+    -> (
+    match e.pexp_desc with
+    | Pexp_ifthenelse _ | Pexp_fun _ -> Parenthesized
+    | _ -> kind)
+  | _ -> kind
+
 let callExpr expr =
   let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
   match optBraces with
@@ -58265,7 +58277,7 @@ and printExpressionRecordRow ~customLayout (lbl, expr) cmtTbl punningAllowed =
             Doc.text ": ";
             printOptionalLabel expr.pexp_attributes;
             (let doc = printExpressionWithComments ~customLayout expr cmtTbl in
-             match Parens.expr expr with
+             match Parens.exprRecordRowRhs expr with
              | Parens.Parenthesized -> addParens doc
              | Braced braces -> printBraces doc expr braces
              | Nothing -> doc);

lib/4.06.1/whole_compiler.ml

@@ -228144,6 +228144,8 @@ val arrowReturnTypExpr : Parsetree.core_type -> bool
 
 val patternRecordRowRhs : Parsetree.pattern -> bool
 
+val exprRecordRowRhs : Parsetree.expression -> kind
+
 end = struct
 #1 "res_parens.ml"
 module ParsetreeViewer = Res_parsetree_viewer
@@ -228163,6 +228165,16 @@ let expr expr =
     | {pexp_desc = Pexp_constraint _} -> Parenthesized
     | _ -> Nothing)
 
+let exprRecordRowRhs e =
+  let kind = expr e in
+  match kind with
+  | Nothing when Res_parsetree_viewer.hasOptionalAttribute e.pexp_attributes
+    -> (
+    match e.pexp_desc with
+    | Pexp_ifthenelse _ | Pexp_fun _ -> Parenthesized
+    | _ -> kind)
+  | _ -> kind
+
 let callExpr expr =
   let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
   match optBraces with
@@ -234237,7 +234249,7 @@ and printExpressionRecordRow ~customLayout (lbl, expr) cmtTbl punningAllowed =
             Doc.text ": ";
             printOptionalLabel expr.pexp_attributes;
             (let doc = printExpressionWithComments ~customLayout expr cmtTbl in
-             match Parens.expr expr with
+             match Parens.exprRecordRowRhs expr with
              | Parens.Parenthesized -> addParens doc
              | Braced braces -> printBraces doc expr braces
              | Nothing -> doc);