Fix indent for returned/thrown/wrapped in parentheses objects in gene…

…rated js code (#6746) * Remove redundant spaces for objects in paranthes * Update test's generated files * Fix indent for return and throw * Update test's generated files * Update changelog
rescript-lang · Apr 28, 2024 · 4738476 · 4738476
1 parent 17804a4
commit 4738476
Show file tree

Hide file tree

Showing 491 changed files with 33,074 additions and 33,076 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - Remove redundant space for empty return in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6745
 - Remove redundant space for export in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6560
 - Remove empty export blocks in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6744
+- Fix indent for returned/thrown/wrapped in parentheses objects in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6746
 
 # 11.1.0
 

diff --git a/jscomp/core/js_dump.ml b/jscomp/core/js_dump.ml
@@ -92,9 +92,6 @@ module Curry_gen = struct
     P.string f (Printf.sprintf "%d" len)
 end
 
-let return_indent = String.length L.return / Ext_pp.indent_length
-let throw_indent = String.length L.throw / Ext_pp.indent_length
-
 type cxt = Ext_pp_scope.t
 
 let semi f = P.string f L.semi
@@ -919,7 +916,7 @@ and expression_desc cxt ~(level : int) f x : cxt =
            var f = { x : 2 , y : 2}
          ]}
       *)
-      P.cond_paren_group f (level > 1) 1 (fun _ ->
+      P.cond_paren_group f (level > 1) 0 (fun _ ->
           if lst = [] then (
             P.string f "{}";
             cxt)
@@ -1211,7 +1208,7 @@ and statement_desc top cxt f (s : J.statement_desc) : cxt =
       | _ ->
           return_sp f;
           (* P.string f "return ";(\* ASI -- when there is a comment*\) *)
-          P.group f return_indent (fun _ ->
+          P.group f 0 (fun _ ->
               let cxt = expression ~level:0 cxt f e in
               semi f;
               cxt)
@@ -1261,7 +1258,7 @@ and statement_desc top cxt f (s : J.statement_desc) : cxt =
       in
       P.string f L.throw;
       P.space f;
-      P.group f throw_indent (fun _ ->
+      P.group f 0 (fun _ ->
           let cxt = expression ~level:0 cxt f e in
           semi f;
           cxt)

diff --git a/jscomp/test/406_primitive_test.js b/jscomp/test/406_primitive_test.js
diff --git a/jscomp/test/AsInUncurriedExternals.js b/jscomp/test/AsInUncurriedExternals.js
diff --git a/jscomp/test/DerivingAccessorsCurried.js b/jscomp/test/DerivingAccessorsCurried.js
diff --git a/jscomp/test/DerivingAccessorsUncurried.js b/jscomp/test/DerivingAccessorsUncurried.js
diff --git a/jscomp/test/EmptyRecord.js b/jscomp/test/EmptyRecord.js
diff --git a/jscomp/test/Import.js b/jscomp/test/Import.js
diff --git a/jscomp/test/UncurriedAlways.js b/jscomp/test/UncurriedAlways.js
diff --git a/jscomp/test/UncurriedExternals.js b/jscomp/test/UncurriedExternals.js
diff --git a/jscomp/test/UntaggedVariants.js b/jscomp/test/UntaggedVariants.js
diff --git a/jscomp/test/a_filename_test.js b/jscomp/test/a_filename_test.js