Fix formatting of props spread for multiline JSX expression (#6006)

* fix formatting of jsx spread props

* format

* update CHANGELOG

---------

Co-authored-by: Zhang, Zheyu <[email protected]>

Author: ah-yu

CHANGELOG.md

@@ -63,6 +63,7 @@ These are only breaking changes for unformatted code.
 - Fix issue with using alias and default value together https://github.com/rescript-lang/rescript-compiler/pull/5989
 - GenType: fix issue with V3 compatibility mode (see https://github.com/rescript-lang/rescript-compiler/issues/5990) https://github.com/rescript-lang/rescript-compiler/pull/5991
 - Fix issue in `Js.Promise2` where `then` and `catch` were returning `undefined` https://github.com/rescript-lang/rescript-compiler/pull/5997
+- Fix formatting of props spread for multiline JSX expression https://github.com/rescript-lang/rescript-compiler/pull/6006
 
 #### :nail_care: Polish
 

res_syntax/src/res_printer.ml

@@ -4264,7 +4264,7 @@ and printJsxProp ~state arg cmtTbl =
     | Optional _lbl -> Doc.concat [Doc.question; printIdentLike ident])
   | Asttypes.Labelled "_spreadProps", expr ->
     let doc = printExpressionWithComments ~state expr cmtTbl in
-    Doc.concat [Doc.lbrace; Doc.dotdotdot; Doc.softLine; doc; Doc.rbrace]
+    Doc.concat [Doc.lbrace; Doc.dotdotdot; doc; Doc.rbrace]
   | lbl, expr ->
     let argLoc, expr =
       match expr.pexp_attributes with

res_syntax/tests/printer/expr/expected/jsx.res.txt

@@ -410,3 +410,10 @@ let v =
   </A>
 
 let x = <A x="y" {...str} />
+
+// https://github.com/rescript-lang/rescript-compiler/issues/6002
+let x = props =>
+  <A
+    {...props}
+    className="inline-block px-6 py-2.5 bg-blue-600 text-white font-medium text-xs leading-tight"
+  />

res_syntax/tests/printer/expr/jsx.res

@@ -402,4 +402,11 @@ let v =
     </B>
   </A>
 
-let x = <A x="y" {...str} />
+let x = <A x="y" {...str} />
+
+// https://github.com/rescript-lang/rescript-compiler/issues/6002
+let x = props =>
+  <A
+    {...props}
+    className="inline-block px-6 py-2.5 bg-blue-600 text-white font-medium text-xs leading-tight"
+  />