Improve codegen (#57)

* travis: make it faster

* better codegen

* Move enable_comments field to config

.travis.yml

@@ -18,10 +18,16 @@ before_install:
     - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
     - git submodule update --init --recursive
 
+install:
+    - cargo test --no-run --color always --all
+
 script:
-    - cargo test --color always --all
+    - RUST_BACKTRACE=full cargo test --color always --all
+
+before_deploy:
     - cargo doc --color always 
 
+
 after_success:
 # Temporarily disabled because cargo tarpaulin does not set CARGO_MANIFEST_DIR.
 #
@@ -50,7 +56,6 @@ env:
   global:
     - CASHER_TIME_OUT=600
     - RUST_MIN_STACK=4194304
-    - RUST_BACKTRACE=full
     - CARGO_INCREMENTAL=0
     - RUSTFLAGS="--cfg procmacro2_semver_exempt"
     - secure: Z4RSNlpg/12Qx2fIjS+7TToYxPJQgK70X7u9A5lJiCIa0JfzWCxr1ZEKXfAVLG9o4nQok+nWOZa+vxR1IgyUVnf6oSanjjWl1pSRbvccxMS799NvHmGzIAiqSKAlxiSJuxf7MQbs1XBuI3XahsWLfXGPo7vPT6sKe4AAf9gT6igJr61D5hpHkVIXK7P6rnrWQALQYplyaox0NlU9UlqSXXBjdJfp3138rl7FIeYRsMMow44unBNPvs+mhVP8PWpeFWeop0jxbNbTHwnJUbCm4ZWrvqnJ/m70IMlBMN1AskLmz4KeXOhPx+XR9VtdWBX4q8lJ7s9J0hMBxrEnxgiYVBPMlLoEX+wW3zwZ5F+DQs7uLpRHYRUpxpi/7ZuQjp+uT3mN9PMMSvbHwHLH2r/CC9olKYWySXIsGsGVyyMnZeUwvgzwxiYLoeCWe4zZY99zc7jvGKbSmk0RtPu6hApPwL5A6novXbXL2QsXzqqeWpgMLmZyb7KYhM5IGIAB1oPQIqI++Re9Z+/ea/DRSUJOsA96yRQ+vVbiuClrVgDhaAaJOGYCtR1XZ5N2zRb9+Spu/ECtfisLOb9Xs1584DyRbqG69nRdjuscjYOTFZUlOoOeFvuADY65Jt0kF6u7g8NIDkJ1ROb3heKQtY/bAQUrBNUJydOQnn5tBwn8Z618+Ac=

ecmascript/codegen/src/comments.rs

@@ -7,7 +7,7 @@ impl<'a> Emitter<'a> {
         pos: BytePos,
         prefix_space: bool,
     ) -> Result {
-        if !self.enable_comments {
+        if !self.cfg.enable_comments {
             return Ok(());
         }
         // debug_assert!(self.file.contains(pos));
@@ -29,7 +29,7 @@ impl<'a> Emitter<'a> {
     }
 
     pub(super) fn emit_leading_comments_of_pos(&mut self, pos: BytePos) -> Result {
-        if !self.enable_comments {
+        if !self.cfg.enable_comments {
             return Ok(());
         }
         // debug_assert!(self.file.contains(pos));

ecmascript/codegen/src/config.rs

@@ -1,5 +1,6 @@
 #[derive(Debug, Default, Clone, Copy)]
 pub struct Config {
+    pub enable_comments: bool,
     pub omit_trailing_semi: bool,
     pub sourcemap: Option<SourceMapConfig>,
 }

ecmascript/codegen/src/decl.rs

@@ -60,9 +60,8 @@ impl<'a> Emitter<'a> {
     pub fn emit_var_declator(&mut self, node: &VarDeclarator) -> Result {
         emit!(node.name);
 
-        formatting_space!();
-
         if let Some(ref init) = node.init {
+            formatting_space!();
             punct!("=");
             formatting_space!();
             emit!(init);

ecmascript/codegen/src/lib.rs

@@ -13,6 +13,8 @@ extern crate swc_atoms;
 #[macro_use]
 extern crate swc_common;
 extern crate swc_ecma_ast;
+
+pub use self::config::{Config, SourceMapConfig};
 use self::{
     list::ListFormat,
     text_writer::WriteJs,
@@ -27,7 +29,7 @@ use swc_ecma_ast::*;
 #[macro_use]
 pub mod macros;
 mod comments;
-pub mod config;
+mod config;
 mod decl;
 pub mod list;
 #[cfg(test)]
@@ -59,7 +61,6 @@ impl<'a, N: Node> Node for &'a N {
 pub struct Emitter<'a> {
     pub cfg: config::Config,
     pub cm: Rc<SourceMap>,
-    pub enable_comments: bool,
     pub wr: Box<('a + WriteJs)>,
     pub handlers: Box<('a + Handlers)>,
     pub pos_of_leading_comments: HashSet<BytePos>,
@@ -588,7 +589,11 @@ impl<'a> Emitter<'a> {
     pub fn emit_block_stmt_or_expr(&mut self, node: &BlockStmtOrExpr) -> Result {
         match *node {
             BlockStmtOrExpr::BlockStmt(ref block_stmt) => emit!(block_stmt),
-            BlockStmtOrExpr::Expr(ref expr) => emit!(expr),
+            BlockStmtOrExpr::Expr(ref expr) => {
+                self.wr.increase_indent()?;
+                emit!(expr);
+                self.wr.decrease_indent()?;
+            }
         }
     }
 
@@ -1159,7 +1164,10 @@ impl<'a> Emitter<'a> {
                 emit!(e);
                 semi!();
             }
-            Stmt::Block(ref e) => emit!(e),
+            Stmt::Block(ref e) => {
+                emit!(e);
+                return Ok(());
+            }
             Stmt::Empty(ref e) => emit!(e),
             Stmt::Debugger(ref e) => emit!(e),
             Stmt::With(ref e) => emit!(e),
@@ -1260,10 +1268,16 @@ impl<'a> Emitter<'a> {
         punct!(")");
         space!();
 
+        let is_block_stmt = match *node.cons {
+            Stmt::Block(_) => true,
+            _ => false,
+        };
         emit!(node.cons);
 
         if let Some(ref alt) = node.alt {
-            space!();
+            if is_block_stmt {
+                space!();
+            }
             keyword!("else");
             space!();
             emit!(alt);
@@ -1449,7 +1463,6 @@ fn get_text_of_node<T: Spanned>(
     node: &T,
     _include_travia: bool,
 ) -> Option<String> {
-    return None;
     let span = node.span();
     if span.is_dummy() || span.ctxt() != SyntaxContext::empty() {
         // This node is transformed so we shoukld not use original source code.

ecmascript/codegen/src/tests.rs

@@ -41,7 +41,6 @@ impl Builder {
             cm: self.cm.clone(),
             wr: box text_writer::JsWriter::new(self.cm.clone(), "\n", s, &mut src_map_builder),
             handlers: box Noop,
-            enable_comments: true,
             pos_of_leading_comments: Default::default(),
         };
 
@@ -109,13 +108,13 @@ fn test_from_to(from: &str, to: &str) {
 
 #[test]
 fn empty_stmt() {
-    test_from_to(";", ";");
+    test_from_to(";", ";\n");
 }
 
 #[test]
 #[ignore]
 fn simple_if_else_stmt() {
-    test_from_to("if(true);else;", "if (true) ; else ;");
+    test_from_to("if(true);else;", "if (true) ; else ;\n");
 }
 
 #[test]

ecmascript/codegen/tests/references/02b924339f85fe00.js

@@ -1 +1 @@
-for(var { a , b  }  in c);
+for(var { a , b  } in c);

ecmascript/codegen/tests/references/053c0475e49bd36b.js

@@ -1 +1 @@
-for(const a  in b)c(a);
+for(const a in b)c(a);

ecmascript/codegen/tests/references/058c33e92f0d37a5.js

@@ -1,4 +1,4 @@
-var a ;
+var a;
 if (b()) {
     new a(1);
 } else {

ecmascript/codegen/tests/references/05b849122b429743.js

@@ -1 +1 @@
-var _፩፪፫፬፭፮፯፰፱ ;
+var _፩፪፫፬፭፮፯፰፱;

ecmascript/codegen/tests/references/05d268921a1f6899.js

@@ -1 +1,2 @@
-do continue;while (true)
+do continue;
+while (true)

ecmascript/codegen/tests/references/05d5195f0d388d98.js

@@ -1 +1 @@
-var A\u{42}C ;
+var A\u{42}C;

ecmascript/codegen/tests/references/070d82d1b3b3a975.js

@@ -1,5 +1,5 @@
 (function() {
-    var a ;
+    var a;
     eval('a');
     function b() {
         a = a += 1;

ecmascript/codegen/tests/references/08358cb4732d8ce1.js

@@ -1 +1 @@
-var 𞸊𞸋 ;
+var 𞸊𞸋;

ecmascript/codegen/tests/references/08ba81b9af0132ea.js

@@ -1,3 +1,3 @@
 (function() {
-    for(var a ; a < 1; ++a);
+    for(var a; a < 1; ++a);
 }());

ecmascript/codegen/tests/references/0986e63317738f46.js

@@ -1,6 +1,6 @@
-var a , b ;
+var a, b;
 if (a && !(a + "1") && b) {
-    var c ;
+    var c;
     d();
 } else {
     e();
@@ -8,6 +8,6 @@ if (a && !(a + "1") && b) {
 if (a || !!(a + "1") || b) {
     d();
 } else {
-    var f ;
+    var f;
     e();
 }

ecmascript/codegen/tests/references/0a38bb9fff27bc21.js

@@ -1,5 +1,5 @@
 (function() {
-    var a ;
+    var a;
     function b() {
         a = a += 1;
     }

ecmascript/codegen/tests/references/0b2804600405dbf6.js

@@ -1,2 +1,2 @@
-var a , b , c , d ;
+var a, b, c, d;
 a = ( b(), c(), d()) ? 1 : 2;

ecmascript/codegen/tests/references/0b4e932ec15cdae4.js

@@ -1,3 +1,3 @@
 for(var a = 1;;){
-    let a ;
+    let a;
 }

ecmascript/codegen/tests/references/0b50309b4112013e.js

@@ -1,2 +1,2 @@
-var a ;
+var a;
 (a);

ecmascript/codegen/tests/references/0bbda5d7d8ae8990.js

@@ -1,5 +1,5 @@
 function a() {
     while(true){
     }
-    var b ;
+    var b;
 }

ecmascript/codegen/tests/references/14bb381a17b683e3.js

@@ -1 +1 @@
-for(var [a, , b]  in c);
+for(var [a, , b] in c);

ecmascript/codegen/tests/references/151d4db59b774864.js

@@ -1 +1 @@
-var ℘ ;
+var ℘;

ecmascript/codegen/tests/references/162fd7b4a7647a1b.js

@@ -1,5 +1,5 @@
 (function() {
-    var a ;
+    var a;
     with (b){
         a.c = ( d(), e());
     }

ecmascript/codegen/tests/references/17302b9b0cab0c69.module.js

@@ -1 +1,2 @@
-export { };1;
+export { };
+1;

ecmascript/codegen/tests/references/174d05abbd69a960.js

@@ -1 +1 @@
-for(var { a , b  }  of c);
+for(var { a , b  } of c);

ecmascript/codegen/tests/references/175a032b2252eb0d.js

@@ -1,4 +1,4 @@
 (function() {
-    var a ;
+    var a;
     ( 1, a)();
 }());

ecmascript/codegen/tests/references/17d881105a9a6c85.js

@@ -1,3 +1,3 @@
-for(var a  in b)(function() {
+for(var a in b)(function() {
     c('d');
 }());

ecmascript/codegen/tests/references/1b0c0fc32b9e5e35.js

@@ -1,5 +1,5 @@
 void function() {
-    var a ;
+    var a;
     a = function() {
         return 1;
     };

ecmascript/codegen/tests/references/1ba78d63a36ea567.js

@@ -1 +1 @@
-for(let a  in a);
+for(let a in a);

ecmascript/codegen/tests/references/1f5de1d7092dcd82.js

@@ -1 +1 @@
-var a ;
+var a;

ecmascript/codegen/tests/references/209fc98bea7b9d67.js

@@ -1 +1,2 @@
-if (true) a(); else ;
+if (true) a();
+else ;

ecmascript/codegen/tests/references/21f1173fff072ee5.js

@@ -1 +1 @@
-let a ;
+let a;

ecmascript/codegen/tests/references/25296359c69440e8.js

@@ -1 +1 @@
-for(let a  in [1, 2])3;
+for(let a in [1, 2])3;

ecmascript/codegen/tests/references/25542e65ad9d2bf1.js

@@ -1,4 +1,4 @@
 (function() {
-    var a ;
+    var a;
     b(typeof a ===" 'c');
 }());

ecmascript/codegen/tests/references/264266c68369c672.js

@@ -1,5 +1,5 @@
 function a() {
-    var b ;
+    var b;
     if (b = 'b') {
         return b;
     } else {

ecmascript/codegen/tests/references/26aa785e12e00fb1.js

@@ -1,3 +1,4 @@
 (function() {
-    if (a) return; else return;
+    if (a) return;
+    else return;
 }());

ecmascript/codegen/tests/references/26b946d7cc01c226.js

@@ -1 +1 @@
-var yield ;
+var yield;

ecmascript/codegen/tests/references/26f27d747e98d3eb.js

@@ -1,8 +1,8 @@
 function a() {
     if (b) {
-        let c ;
+        let c;
-        let d ;
+        let d;
-        var e ;
+        var e;
-        var f ;
+        var f;
     }
 }

ecmascript/codegen/tests/references/2b0727c871857af5.js

@@ -1 +1 @@
-let a , b ;
+let a, b;

ecmascript/codegen/tests/references/3348741c8bdd4f3c.js

@@ -1 +1 @@
-for(const a  of b)c(a);
+for(const a of b)c(a);

ecmascript/codegen/tests/references/347e9a5443e4cd3c.js

@@ -1,3 +1,3 @@
 {
-    let a ;
+    let a;
 }

ecmascript/codegen/tests/references/35e730121a5e6326.js

@@ -1 +1,2 @@
-for(;;)if (a()) b(); else break;
+for(;;)if (a()) b();
+else break;

ecmascript/codegen/tests/references/3852fb3ffb8fd8d5.js

@@ -1 +1,2 @@
-if (true) a(); else ;
+if (true) a();
+else ;

ecmascript/codegen/tests/references/3b1ab093f7ebeb51.module.js

@@ -1 +1 @@
-export var a ;;
+export var a;;

ecmascript/codegen/tests/references/3c0c251ad455218d.js

@@ -1 +1,2 @@
-do a();while (true)
+do a();
+while (true)

ecmascript/codegen/tests/references/3cf53efb53099596.js

@@ -1,5 +1,6 @@
 for(; a();){
-    if (b()) c(); else break;
+    if (b()) c();
+    else break;
     d();
     e();
 }

ecmascript/codegen/tests/references/3e3a99768a4a1502.js

@@ -1,3 +1,3 @@
 (a)=>({
-     b: 1 
+         b: 1 
-});
+    });

ecmascript/codegen/tests/references/3f44c09167d5753d.js

@@ -1 +1 @@
-let ℮ ;
+let ℮;

ecmascript/codegen/tests/references/414b9b02f2789648.js

@@ -1,4 +1,4 @@
-var a ;
+var a;
 a = b ? true : false;
 a = !b ? true : false;
 a = b() ? true : false;

ecmascript/codegen/tests/references/43163c094787d534.js

@@ -1 +1 @@
-for(const { a , b  }  of c);
+for(const { a , b  } of c);

ecmascript/codegen/tests/references/446ffc8afda7e47f.js

@@ -1,4 +1,4 @@
 (function() {
-    var a , b , c = 1, d , e , f = 2;
+    var a, b, c = 1, d, e, f = 2;
     ( a, b, c) + ( d, e, f);
 }());

ecmascript/codegen/tests/references/465b79616fdc9794.js

@@ -1 +1 @@
-var ℘\u2118 ;
+var ℘\u2118;

ecmascript/codegen/tests/references/492d3fde7a53e85a.js

@@ -1,3 +1,3 @@
 switch(a){
-    case 1: let b ;
+    case 1: let b;
 }

ecmascript/codegen/tests/references/4a807fda565547a2.js

@@ -1 +1 @@
-for(let a  in b)c(a);
+for(let a in b)c(a);

ecmascript/codegen/tests/references/4c56fb063bea0ec2.js

@@ -1 +1 @@
-for(var a  of b);
+for(var a of b);

ecmascript/codegen/tests/references/4e997dab642864ca.js

@@ -1 +1 @@
-var \u{41}BC ;
+var \u{41}BC;

ecmascript/codegen/tests/references/4efcd175a5db8b47.js

@@ -1 +1,2 @@
-if (a) b; else c;
+if (a) b;
+else c;

ecmascript/codegen/tests/references/5183eafe6b4cd6e0.js

@@ -1 +1 @@
-for(var a ; b; c);
+for(var a; b; c);

ecmascript/codegen/tests/references/5239dd0fc0effb71.js

@@ -1,5 +1,5 @@
 function a() {
-    var b ;
+    var b;
     with (c){
         b;
     }

ecmascript/codegen/tests/references/56ec311ffc030121.module.js

@@ -1 +1 @@
-export let a ;;
+export let a;;

ecmascript/codegen/tests/references/57ad28ff7d96f031.js

@@ -1,3 +1,3 @@
-for(var a  in b){
+for(var a in b){
     c;
 }

ecmascript/codegen/tests/references/596746323492fbfd.js

@@ -1 +1 @@
-var _\u{1EE03} ;
+var _\u{1EE03};

ecmascript/codegen/tests/references/5b9f113c3bdd0c49.js

@@ -4,12 +4,12 @@ function a() {
     throw "d";
     if (c) {
         e();
-        var c ;
+        var c;
         function b() {
         }
         ;
         (function() {
-            var f ;
+            var f;
             function e() {
             }
             ;

ecmascript/codegen/tests/references/5c3d125ce5f032aa.js

@@ -1 +1 @@
-var \u{1EE00} ;
+var \u{1EE00};

ecmascript/codegen/tests/references/5c5ef7a4bdc3e081.js

@@ -1,4 +1,4 @@
-var a ;
+var a;
 if (b) {
     a = 1 + 2;
 } else {

ecmascript/codegen/tests/references/5cf0dc4259e98c15.js

@@ -1,4 +1,4 @@
-var a , b ;
+var a, b;
 a.c = ( a = {
 }, 1);
 b = ( b = {

ecmascript/codegen/tests/references/5d3e89c83953788e.js

@@ -1,3 +1,3 @@
 function a() {
-    for(var b  in c);
+    for(var b in c);
 }

ecmascript/codegen/tests/references/5d8ab2c35c7eb883.js

@@ -1,4 +1,4 @@
-var a ;
+var a;
 if (b()) {
     a();
 } else {

ecmascript/codegen/tests/references/639b9076cc56e57c.js

@@ -1,3 +1,4 @@
 while(true){
-    if (a) break; else b;
+    if (a) break;
+    else b;
 }

ecmascript/codegen/tests/references/63c92209eb77315a.js

@@ -1 +1 @@
-var let ;
+var let;

ecmascript/codegen/tests/references/65228d6a31a06406.js

@@ -1,4 +1,4 @@
-var a ;
+var a;
 a = true && b;
 a = 1 && c.d("a");
 a = 2 * 3 && 4 * b;

ecmascript/codegen/tests/references/66ea15f7de78add7.module.js

@@ -1 +1 @@
-export var a ;;
+export var a;;

ecmascript/codegen/tests/references/684237281767d41d.js

@@ -1,4 +1,5 @@
 {
-    do ;while (false)
+    do ;
+    while (false)
     false;
 }

ecmascript/codegen/tests/references/69cbe8ec2f64382d.js

@@ -1 +1 @@
-var a , b ;
+var a, b;

ecmascript/codegen/tests/references/6cfcfc99afcb6e1a.js

@@ -1 +1 @@
-for(let a  of [1, 2])3;
+for(let a of [1, 2])3;

ecmascript/codegen/tests/references/6d79220c64963dad.js

@@ -1 +1,2 @@
-do ;while (true)
+do ;
+while (true)

ecmascript/codegen/tests/references/7188bf4c56d2ffc8.js

@@ -1 +1 @@
-var \u{41}\u{42}\u{43} ;
+var \u{41}\u{42}\u{43};

ecmascript/codegen/tests/references/7a71c5f849677cd1.js

@@ -1 +1,2 @@
-do a();while (true)
+do a();
+while (true)

ecmascript/codegen/tests/references/7ac0063e99bc8720.js

@@ -1 +1 @@
-for(var a  of b)c(a);
+for(var a of b)c(a);

ecmascript/codegen/tests/references/7b71bc250036251c.js

@@ -1 +1,2 @@
-do continue;while (1)
+do continue;
+while (1)

ecmascript/codegen/tests/references/7c46ecc8f111b567.js

@@ -1 +1,2 @@
-do a();while (true)
+do a();
+while (true)

ecmascript/codegen/tests/references/7ebaa39b4a9b5b5b.js

@@ -1,2 +1,2 @@
-var a , b , c , d ;
+var a, b, c, d;
 a = !( b(), c(), d());

ecmascript/codegen/tests/references/80c6bda5cad0fbc5.js

@@ -1 +1 @@
-var a , [a] = 1;
+var a, [a] = 1;

ecmascript/codegen/tests/references/8340cdb8653046bb.js

@@ -1,2 +1,2 @@
-for(var [a, , b]  in c){
+for(var [a, , b] in c){
 }

ecmascript/codegen/tests/references/8996d3eb07c6f7cd.js

@@ -1 +1 @@
-for(let a  of b);
+for(let a of b);

ecmascript/codegen/tests/references/8a40542f1f53c4f0.js

@@ -1 +1 @@
-for(const a  of b);
+for(const a of b);

ecmascript/codegen/tests/references/8c27fb7ef1e3ca3d.js

@@ -1,3 +1,4 @@
 (function() {
-    if (a) return b; else return c;
+    if (a) return b;
+    else return c;
 }());

ecmascript/codegen/tests/references/8c5c46a300d5addb.module.js

@@ -1,2 +1,3 @@
 export function a() {
-};;1;
+};;
+1;

ecmascript/codegen/tests/references/8d6435fa243d5b1a.js

@@ -1 +1 @@
-var a ;
+var a;

ecmascript/codegen/tests/references/906e545ceef0fcfd.js

@@ -1,3 +1,4 @@
 (function() {
-    if (a) throw b; else throw c;
+    if (a) throw b;
+    else throw c;
 }());

ecmascript/codegen/tests/references/90fa9751ab71ce28.js

@@ -1,5 +1,5 @@
 (function() {
-    var a ;
+    var a;
     with (b){
         a;
     }

ecmascript/codegen/tests/references/925443c6cf79aa88.js

@@ -1 +1,3 @@
-a: do do continue a;while (true)while (true)
+a: do do continue a;
+while (true)
+while (true)

ecmascript/codegen/tests/references/93108a695e5ff29d.js

@@ -1,15 +1,15 @@
 (function() {
-    var a ;
+    var a;
     if (b) return;
     a = new c();
     return a;
 })()(function() {
-    var a ;
+    var a;
     if (b) return;
     a = new c();
     return a;
 })()(function() {
-    var a ;
+    var a;
     if (b) return;
     a = new c();
     return a;

ecmascript/codegen/tests/references/93d4c5dfbddf859d.js

@@ -8,5 +8,6 @@ if (a) {
     with (a)if (b) throw c;
 } else d;
 if (a) {
-    do if (b) throw c;while (a)
+    do if (b) throw c;
+    while (a)
 } else d;

ecmascript/codegen/tests/references/96059002704b3ac3.js

@@ -1,7 +1,8 @@
 for(; a();){
     b();
     c();
-    if (d()) e(); else break;
+    if (d()) e();
+    else break;
     f();
     g();
 }

ecmascript/codegen/tests/references/9a6711e879a99536.js

@@ -1,3 +1,3 @@
 {
-    let a ;
+    let a;
 }

ecmascript/codegen/tests/references/9b9d0e250e01155d.js

@@ -1,4 +1,4 @@
-var a , b ;
+var a, b;
 if (c()) {
     a = new b(1);
 } else {

ecmascript/codegen/tests/references/a515d7aaea7b816f.js

@@ -1,3 +1,4 @@
 (function() {
-    if (a) return 1; else return;
+    if (a) return 1;
+    else return;
 }());

ecmascript/codegen/tests/references/a7c8ad2a73ed00d0.js

@@ -1 +1 @@
-for(let [a, , b]  of c);
+for(let [a, , b] of c);