Merge branch 'master' into js-exn-fix

Author: aspeddro

Diff for: CHANGELOG.md

@@ -12,6 +12,17 @@
 
 # 12.0.0-alpha.2 (Unreleased)
 
+#### :nail_care: Polish
+
+- Improve formatting in the generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6932
+  - `}\ncatch{` -> `} catch {`
+  - `for(let i = 0 ,i_finish = r.length; i < i_finish; ++i){` -> `for (let i = 0, i_finish = r.length; i < i_finish; ++i) {`
+  - `while(true) {` -> `while (true) {`
+  - Fixed tabulation for `switch case` bodies
+  - Fixed tabulation for `throw new Error` bodies
+  - Removed empty line at the end of `switch` statement
+  - Removed empty `default` case from `switch` statement in the generated code
+
 # 12.0.0-alpha.1
 
 #### :rocket: New Feature

Diff for: jscomp/core/js_dump.ml

@@ -248,7 +248,6 @@ let debugger_nl f =
 
 let break_nl f =
   P.string f L.break;
-  P.space f;
   semi f;
   P.newline f
 
@@ -430,17 +429,18 @@ and pp_one_case_clause :
       'a. _ -> P.t -> (P.t -> 'a -> unit) -> 'a * J.case_clause -> _ =
  fun cxt f pp_cond
      (switch_case, ({ switch_body; should_break; comment } : J.case_clause)) ->
+  P.newline f;
   let cxt =
     P.group f 1 (fun _ ->
-        P.group f 1 (fun _ ->
+        P.group f 0 (fun _ ->
             P.string f L.case;
             P.space f;
             pp_comment_option f comment;
             pp_cond f switch_case;
             (* could be integer or string *)
             P.space f;
             P.string f L.colon);
-        P.group f 1 (fun _ ->
+        P.group f 0 (fun _ ->
             let cxt =
               match switch_body with
               | [] -> cxt
@@ -454,7 +454,6 @@ and pp_one_case_clause :
               semi f);
             cxt))
   in
-  P.newline f;
   cxt
 
 and loop_case_clauses :
@@ -858,11 +857,11 @@ and expression_desc cxt ~(level : int) f x : cxt =
           cxt)
   | New (e, el) ->
       P.cond_paren_group f (level > 15) (fun _ ->
-          P.group f 1 (fun _ ->
+          P.group f 0 (fun _ ->
               P.string f L.new_;
               P.space f;
               let cxt = expression ~level:16 cxt f e in
-              P.paren_group f 1 (fun _ ->
+              P.paren_group f 0 (fun _ ->
                   match el with Some el -> arguments cxt f el | None -> cxt)))
   | Cond (e, e1, e2) ->
       let action () =
@@ -1045,13 +1044,15 @@ and statement_desc top cxt f (s : J.statement_desc) : cxt =
         match e.expression_desc with
         | Number (Int { i = 1l }) ->
             P.string f L.while_;
+            P.space f;
             P.string f L.lparen;
             P.string f L.true_;
             P.string f L.rparen;
             P.space f;
             cxt
         | _ ->
             P.string f L.while_;
+            P.space f;
             let cxt =
               P.paren_group f 1 (fun _ -> expression ~level:0 cxt f e)
             in
@@ -1068,7 +1069,8 @@ and statement_desc top cxt f (s : J.statement_desc) : cxt =
               P.group f 0 (fun _ ->
                   (* The only place that [semi] may have semantics here *)
                   P.string f L.for_;
-                  P.paren_group f 1 (fun _ ->
+                  P.space f;
+                  let ctx  = P.paren_group f 1 (fun _ ->
                       let cxt, new_id =
                         match
                           (for_ident_expression, finish.expression_desc)
@@ -1081,8 +1083,8 @@ and statement_desc top cxt f (s : J.statement_desc) : cxt =
                             let cxt =
                               expression ~level:1 cxt f ident_expression
                             in
-                            P.space f;
                             comma f;
+                            P.space f;
                             let id =
                               Ext_ident.create (Ident.name id ^ "_finish")
                             in
@@ -1128,7 +1130,9 @@ and statement_desc top cxt f (s : J.statement_desc) : cxt =
                       semi f;
                       P.space f;
                       pp_direction f direction;
-                      Ext_pp_scope.ident cxt f id))
+                      Ext_pp_scope.ident cxt f id) in
+                      P.space f;
+                      ctx)
             in
             brace_block cxt f s)
       in
@@ -1177,6 +1181,7 @@ and statement_desc top cxt f (s : J.statement_desc) : cxt =
           match def with
           | None -> cxt
           | Some def ->
+              P.newline f;
               P.group f 1 (fun _ ->
                   P.string f L.default;
                   P.string f L.colon;
@@ -1195,6 +1200,7 @@ and statement_desc top cxt f (s : J.statement_desc) : cxt =
           match def with
           | None -> cxt
           | Some def ->
+              P.newline f;
               P.group f 1 (fun _ ->
                   P.string f L.default;
                   P.string f L.colon;
@@ -1224,10 +1230,9 @@ and statement_desc top cxt f (s : J.statement_desc) : cxt =
             match ctch with
             | None -> cxt
             | Some (i, b) ->
-                P.newline f;
-                P.string f "catch (";
+                P.string f " catch (";
                 let cxt = Ext_pp_scope.ident cxt f i in
-                P.string f ")";
+                P.string f ") ";
                 brace_block cxt f b
           in
           match fin with

Diff for: jscomp/core/lam_compile.ml

@@ -584,7 +584,10 @@ and compile_general_cases :
             | Complete -> None
             | NonComplete -> None
             | Default lam ->
-                Some (Js_output.output_as_block (compile_lambda cxt lam))
+                let statements = Js_output.output_as_block (compile_lambda cxt lam) in
+                match statements with
+                | [] -> None
+                | _ -> Some statements
           in
           let body =
             group_apply ~merge_cases cases (fun last (switch_case, lam) ->

Diff for: jscomp/gentype_tests/typescript-react-example/src/NestedVariants.res.js

@@ -23,12 +23,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 /***
-  This module is [`Belt.HashSet`]() specialized with key type to be a primitive type.
+This module is [`Belt.HashSet`]() specialized with key type to be a primitive type.
 
-  It is more efficient in general, the  API is the same with [`Belt.HashSet`]() except its key type is fixed,
-  and identity is not needed(using the built-in one)
+It is more efficient in general, the  API is the same with [`Belt.HashSet`]() except its key type is fixed,
+and identity is not needed(using the built-in one)
 
-  **See** [`Belt.HashSet`]()
+**See** [`Belt.HashSet`]()
 */
 
 type key = int

Diff for: jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.res.js

@@ -23,12 +23,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 /***
-  This module is [`Belt.HashSet`]() specialized with key type to be a primitive type.
+This module is [`Belt.HashSet`]() specialized with key type to be a primitive type.
 
-  It is more efficient in general, the  API is the same with [`Belt.HashSet`]() except its key type is fixed,
-  and identity is not needed(using the built-in one)
+It is more efficient in general, the  API is the same with [`Belt.HashSet`]() except its key type is fixed,
+and identity is not needed(using the built-in one)
 
-  **See** [`Belt.HashSet`]()
+**See** [`Belt.HashSet`]()
 */
 
 type key = string

Diff for: jscomp/others/belt_HashSetInt.resi

@@ -23,11 +23,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 /***
-  This module is [`Belt.Set`]() specialized with value type to be a primitive type.
-  It is more efficient in general, the  API is the same with [`Belt_Set`]() except its value type is fixed,
-  and identity is not needed(using the built-in one)
+This module is [`Belt.Set`]() specialized with value type to be a primitive type.
+It is more efficient in general, the  API is the same with [`Belt_Set`]() except its value type is fixed,
+and identity is not needed(using the built-in one)
 
-  **See** [`Belt.Set`]()
+**See** [`Belt.Set`]()
 */
 
 /** The type of the set elements. */
@@ -77,7 +77,7 @@ of sets.
 */
 let cmp: (t, t) => int
 
-/** 
+/**
 `eq(s1, s2)` tests whether the sets `s1` and `s2` are equal, that is, contain
 equal elements.
 */
@@ -105,7 +105,7 @@ let every: (t, value => bool) => bool
 
 let someU: (t, (. value) => bool) => bool
 
-/** 
+/**
 `some(p, s)` checks if at least one element of the set satisfies the predicate
 `p`. Oder unspecified.
 */

Diff for: jscomp/others/belt_HashSetString.resi

@@ -23,11 +23,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 /***
-  This module is [`Belt.Set`]() specialized with value type to be a primitive type.
-  It is more efficient in general, the  API is the same with [`Belt_Set`]() except its value type is fixed,
-  and identity is not needed(using the built-in one)
+This module is [`Belt.Set`]() specialized with value type to be a primitive type.
+It is more efficient in general, the  API is the same with [`Belt_Set`]() except its value type is fixed,
+and identity is not needed(using the built-in one)
 
-  **See** [`Belt.Set`]()
+**See** [`Belt.Set`]()
 */
 
 /** The type of the set elements. */
@@ -77,7 +77,7 @@ of sets.
 */
 let cmp: (t, t) => int
 
-/** 
+/**
 `eq(s1, s2)` tests whether the sets `s1` and `s2` are equal, that is, contain
 equal elements.
 */
@@ -105,7 +105,7 @@ let every: (t, value => bool) => bool
 
 let someU: (t, (. value) => bool) => bool
 
-/** 
+/**
 `some(p, s)` checks if at least one element of the set satisfies the predicate
 `p`. Oder unspecified.
 */

Diff for: jscomp/others/belt_SetInt.resi

@@ -23,11 +23,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 /***
-  This module is [`Belt.Set`]() specialized with value type to be a primitive type.
-  It is more efficient in general, the  API is the same with [`Belt_Set`]() except its value type is fixed,
-  and identity is not needed(using the built-in one)
+This module is [`Belt.Set`]() specialized with value type to be a primitive type.
+It is more efficient in general, the  API is the same with [`Belt_Set`]() except its value type is fixed,
+and identity is not needed(using the built-in one)
 
-  **See** [`Belt.Set`]()
+**See** [`Belt.Set`]()
 */
 
 #ifdef TYPE_STRING
@@ -84,7 +84,7 @@ of sets.
 */
 let cmp: (t, t) => int
 
-/** 
+/**
 `eq(s1, s2)` tests whether the sets `s1` and `s2` are equal, that is, contain
 equal elements.
 */
@@ -112,7 +112,7 @@ let every: (t, value => bool) => bool
 
 let someU: (t, (. value) => bool) => bool
 
-/** 
+/**
 `some(p, s)` checks if at least one element of the set satisfies the predicate
 `p`. Oder unspecified.
 */

Diff for: jscomp/others/belt_SetString.resi

@@ -23,12 +23,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 /***
-  This module is [`Belt.HashSet`]() specialized with key type to be a primitive type.
+This module is [`Belt.HashSet`]() specialized with key type to be a primitive type.
 
-  It is more efficient in general, the  API is the same with [`Belt.HashSet`]() except its key type is fixed,
-  and identity is not needed(using the built-in one)
+It is more efficient in general, the  API is the same with [`Belt.HashSet`]() except its key type is fixed,
+and identity is not needed(using the built-in one)
 
-  **See** [`Belt.HashSet`]()
+**See** [`Belt.HashSet`]()
 */
 
 #ifdef TYPE_STRING