Fix issue semi-colon gets inserted unnecessarily (#5749)

* Fix issue semi-colon gets inserted unnecessarily * Simplify if condition a bit
babel · May 19, 2017 · c474fd4 · c474fd4
1 parent 2788a91
commit c474fd4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/expected.js
@@ -17,14 +17,11 @@ var A = function (_B) {
     _classCallCheck(this, A);
 
     if (track !== undefined) {
-      ;
-
       var _this = _possibleConstructorReturn(this, (A.__proto__ || Object.getPrototypeOf(A)).call(this, track));
     } else {
-      ;
-
       var _this = _possibleConstructorReturn(this, (A.__proto__ || Object.getPrototypeOf(A)).call(this));
-    }return _possibleConstructorReturn(_this);
+    }
+    return _possibleConstructorReturn(_this);
   }
 
   return A;

diff --git a/...el-plugin-transform-es2015-destructuring/test/fixtures/destructuring/issue-5744/actual.js b/...el-plugin-transform-es2015-destructuring/test/fixtures/destructuring/issue-5744/actual.js
@@ -0,0 +1 @@
+if (true) [a, b] = [b, a];
diff --git a/...-plugin-transform-es2015-destructuring/test/fixtures/destructuring/issue-5744/expected.js b/...-plugin-transform-es2015-destructuring/test/fixtures/destructuring/issue-5744/expected.js
@@ -0,0 +1,6 @@
+if (true) {
+  var _ref = [b, a];
+  a = _ref[0];
+  b = _ref[1];
+  _ref;
+}
diff --git a/packages/babel-traverse/src/path/modification.js b/packages/babel-traverse/src/path/modification.js
@@ -126,7 +126,10 @@ export function insertAfter(nodes) {
     if (Array.isArray(this.container)) {
       return this._containerInsertAfter(nodes);
     } else if (this.isStatementOrBlock()) {
-      if (this.node) nodes.unshift(this.node);
+      // Unshift current node if it's not an empty expression
+      if (this.node && (!this.isExpressionStatement() || this.node.expression != null)) {
+        nodes.unshift(this.node);
+      }
       this._replaceWith(t.blockStatement(nodes));
     } else {
       throw new Error("We don't know what to do with this node type. " +