fix #2642

Author: bobzhang

jscomp/core/js_dump.ml

@@ -1349,7 +1349,8 @@ and statement_desc top cxt f (s : J.statement_desc) : Ext_pp_scope.t =
     P.space f ;
     P.string f s;
     semi f;
-    P.newline f;
+    (* P.newline f; *)
+    (* #2642 *)
     cxt
   | Debugger
     ->

jscomp/ext/ext_pp.ml

@@ -1,5 +1,5 @@
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -17,7 +17,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
@@ -29,24 +29,24 @@
 
 
 
-module L = struct 
+module L = struct
   let space = " "
   let indent_str = "  "
 end
 
-let indent_length = String.length L.indent_str 
+let indent_length = String.length L.indent_str
 
 type t = {
   output_string : string -> unit;
-  output_char : char -> unit; 
+  output_char : char -> unit;
   flush : unit -> unit;
   mutable indent_level : int;
-  mutable last_new_line : bool; 
+  mutable last_new_line : bool;
   (* only when we print newline, we print the indent *)
 }
 
-let from_channel chan = { 
-  output_string = (fun  s -> output_string chan s); 
+let from_channel chan = {
+  output_string = (fun  s -> output_string chan s);
   output_char = (fun c -> output_char chan c);
   flush = (fun _ -> flush chan);
   indent_level = 0 ;
@@ -62,105 +62,105 @@ let from_buffer buf = {
   last_new_line = false;
 }
 
-(* If we have [newline] in [s], 
-   all indentations will be broken 
+(* If we have [newline] in [s],
+   all indentations will be broken
    in the future, we can detect this in [s]
 *)
-let string t s = 
+let string t s =
   t.output_string  s ;
   t.last_new_line <- false
 
-let newline t = 
-  if not t.last_new_line then 
+let newline t =
+  if not t.last_new_line then
     begin
       t.output_char  '\n';
-      for i = 0 to t.indent_level - 1 do 
+      for i = 0 to t.indent_level - 1 do
         t.output_string  L.indent_str;
       done;
       t.last_new_line <- true
     end
 
-let force_newline t = 
+let force_newline t =
   t.output_char  '\n';
-  for i = 0 to t.indent_level - 1 do 
+  for i = 0 to t.indent_level - 1 do
     t.output_string  L.indent_str;
   done
 
-let space t  = 
+let space t  =
   string t L.space
 
-let nspace  t n  = 
+let nspace  t n  =
   string  t (String.make n ' ')
 
-let group t i action = 
+let group t i action =
   if i = 0 then action ()
-  else 
+  else
     let old = t.indent_level in
     t.indent_level <- t.indent_level + i;
-    Ext_pervasives.finally () (fun _ -> t.indent_level <- old) action 
+    Ext_pervasives.finally () (fun _ -> t.indent_level <- old) action
 
 let vgroup = group
 
-let paren t action = 
+let paren t action =
   string t "(";
   let v = action () in
   string t ")";
-  v 
+  v
 
-let brace fmt u = 
+let brace fmt u =
   string fmt "{";
   (* break1 fmt ; *)
   let v = u () in
   string fmt "}";
-  v 
+  v
 
-let bracket fmt u = 
+let bracket fmt u =
   string fmt "[";
   let v = u () in
   string fmt "]";
-  v 
+  v
 
-let brace_vgroup st n action = 
+let brace_vgroup st n action =
   string st "{";
-  let v = vgroup st n (fun _ -> 
-      newline st; 
+  let v = vgroup st n (fun _ ->
+      newline st;
       let v =  action () in
       v
     ) in
   force_newline st;
   string st "}";
   v
 
-let bracket_vgroup st n action = 
+let bracket_vgroup st n action =
   string st "[";
-  let v = vgroup st n (fun _ -> 
-      newline st; 
+  let v = vgroup st n (fun _ ->
+      newline st;
       let v =  action () in
       v
     ) in
   force_newline st;
   string st "]";
   v
 
-let bracket_group st n action = 
+let bracket_group st n action =
   group st n (fun _ -> bracket st action)
 
-let paren_vgroup st n action = 
+let paren_vgroup st n action =
   string st "(";
-  let v = group st n (fun _ -> 
-      newline st; 
+  let v = group st n (fun _ ->
+      newline st;
       let v = action () in
       v
     ) in
   newline st;
   string st ")";
-  v 
+  v
 let paren_group st n action = group st n (fun _ -> paren st action)
 
-let brace_group st n action = 
+let brace_group st n action =
   group st n (fun _ -> brace st action )
 
-let indent t n = 
-  t.indent_level <- t.indent_level + n 
+let indent t n =
+  t.indent_level <- t.indent_level + n
 
 let flush t () = t.flush ()

jscomp/test/a_scope_bug.js

@@ -10,7 +10,6 @@ function odd(_z) {
     console.log(String(a));
     _z = 32;
     continue ;
-    
   };
 }
 

jscomp/test/and_or_tailcall_test.js

@@ -11,7 +11,6 @@ function f(b, _, _n) {
     } else {
       _n = n + 1 | 0;
       continue ;
-      
     }
   };
 }
@@ -26,7 +25,6 @@ function or_f(b, _, _n) {
     } else {
       _n = n + 1 | 0;
       continue ;
-      
     }
   };
 }

jscomp/test/app_root_finder.js

@@ -18,7 +18,6 @@ function find_package_json(_dir) {
       } else {
         _dir = new_dir;
         continue ;
-        
       }
     }
   };

jscomp/test/arith_lexer.js

@@ -28,13 +28,12 @@ function __ocaml_lex_lexeme_rec(lexbuf, ___ocaml_lex_state) {
       Curry._1(lexbuf[/* refill_buff */0], lexbuf);
       ___ocaml_lex_state = __ocaml_lex_state$1;
       continue ;
-      
     } else {
       switch (__ocaml_lex_state$1) {
         case 0 : 
             ___ocaml_lex_state = 0;
             continue ;
-            case 1 : 
+        case 1 : 
             return /* NUMERAL */Block.__(0, [Caml_format.caml_int_of_string(Lexing.lexeme(lexbuf))]);
         case 2 : 
             return /* IDENT */Block.__(1, [Lexing.lexeme(lexbuf)]);

jscomp/test/array_test.js

@@ -18,7 +18,6 @@ function is_sorted(x) {
     } else if (Caml_obj.caml_lessthan(Caml_array.caml_array_get(x, i), Caml_array.caml_array_get(x, i + 1 | 0))) {
       _i = i + 1 | 0;
       continue ;
-      
     } else {
       return /* false */0;
     }

jscomp/test/ast_js_mapper_test.js

@@ -51,7 +51,6 @@ function searchForSureExists(xs, k) {
     } else {
       _i = i + 1 | 0;
       continue ;
-      
     }
   };
 }

jscomp/test/bal_set_mini.js

@@ -106,7 +106,6 @@ function min_elt(_def, _param) {
         _param = l;
         _def = param[1];
         continue ;
-        
       } else {
         return param[1];
       }
@@ -165,7 +164,6 @@ function mem(x, _param) {
       } else {
         _param = c < 0 ? param[0] : param[2];
         continue ;
-        
       }
     } else {
       return /* false */0;

jscomp/test/bdd.js

@@ -16,11 +16,9 @@ function $$eval(_bdd, vars) {
     } else if (Caml_array.caml_array_get(vars, bdd[1])) {
       _bdd = bdd[3];
       continue ;
-      
     } else {
       _bdd = bdd[0];
       continue ;
-      
     }
   };
 }
@@ -75,7 +73,6 @@ function resize(newSize) {
               ]);
           _bucket = bucket[1];
           continue ;
-          
         }
       } else {
         return /* () */0;
@@ -143,7 +140,6 @@ function mkNode(low, v, high) {
         } else {
           _b = b[1];
           continue ;
-          
         }
       } else {
         var n_002 = (nodeC[0] = nodeC[0] + 1 | 0, nodeC[0]);