Generated JS: don't generate empty default: cases in switch (#1300)

* Generated JS: don't generate empty `default:` cases in `switch` * chore: snapshot runtime tests
melange-re · Jan 14, 2025 · 82fc7dd · 82fc7dd
1 parent 2de72a2
commit 82fc7dd
Show file tree

Hide file tree

Showing 17 changed files with 89 additions and 171 deletions.
diff --git a/jscomp/core/js_dump.ml b/jscomp/core/js_dump.ml
@@ -471,9 +471,8 @@ and pp_function ~return_unit ~is_method cxt ~fn_state (l : Ident.t list)
           param_body ());
       outer_cxt
 
-(* Assume the cond would not change the context,
-    since it can be either [int] or [string]
-*)
+(* Assume the cond would not change the context, since it can be either [int]
+   or [string] *)
 and pp_one_case_clause : 'a. _ -> (_ -> 'a -> unit) -> 'a * J.case_clause -> _ =
  fun cxt pp_cond
      (switch_case, ({ switch_body; should_break; comment } : J.case_clause)) ->

diff --git a/jscomp/core/lam_compile.ml b/jscomp/core/lam_compile.ml
@@ -611,8 +611,10 @@ and compile_general_cases :
             match default with
             | Complete -> None
             | NonComplete -> None
-            | Default lam ->
-                Some (Js_output.output_as_block (compile_lambda cxt lam))
+            | Default lam -> (
+                match Js_output.output_as_block (compile_lambda cxt lam) with
+                | [] -> None
+                | xs -> Some xs)
           in
           let make_comment i =
             match get_cstr_name i with

diff --git a/jscomp/test/dist/jscomp/test/flow_parser_reg_test.js b/jscomp/test/dist/jscomp/test/flow_parser_reg_test.js
diff --git a/jscomp/test/dist/jscomp/test/gpr_1438.js b/jscomp/test/dist/jscomp/test/gpr_1438.js
diff --git a/jscomp/test/dist/jscomp/test/gpr_2931_test.js b/jscomp/test/dist/jscomp/test/gpr_2931_test.js
diff --git a/jscomp/test/dist/jscomp/test/mario_game.js b/jscomp/test/dist/jscomp/test/mario_game.js
diff --git a/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js b/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js
diff --git a/jscomp/test/dist/jscomp/test/ocaml_proto_test.js b/jscomp/test/dist/jscomp/test/ocaml_proto_test.js