cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix(requeue): Always requeue implicitely created BlockStatements (#6193)

Browse Source 
This reverts the former fix done in #5743 and always requeues
BlockStatements when they get created.

This also fixes a bug in babel-generator which would indent code
even though no comments are present.
This commit is contained in:
Daniel Tschinder
2017-09-02 07:02:21 +02:00
committed by Henry Zhu
parent 2dd03e3ee9
commit ca117e08cb
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/babel-generator/src/printer.js
View File

@@ -443,7 +443,7 @@ export default class Printer {
}
printAndIndentOnComments(node, parent) {
const indent = !!node.leadingComments;
const indent = node.leadingComments && node.leadingComments.length > 0;
if (indent) this.indent();
this.print(node, parent);
if (indent) this.dedent();
@@ -468,7 +468,7 @@ export default class Printer {
}
printInnerComments(node, indent = true) {
if (!node.innerComments) return;
if (!node.innerComments || !node.innerComments.length) return;
if (indent) this.indent();
this._printComments(node.innerComments);
if (indent) this.dedent();

16
packages/babel-traverse/src/path/modification.js
View File

@@ -29,7 +29,7 @@ export function insertBefore(nodes) {
return this._containerInsertBefore(nodes);
} else if (this.isStatementOrBlock()) {
if (this.node) nodes.push(this.node);
this._replaceWith(t.blockStatement(nodes));
this.replaceWith(t.blockStatement(nodes));
} else {
throw new Error(
"We don't know what to do with this node type. " +
@@ -104,10 +104,6 @@ export function _containerInsertAfter(nodes) {
*/
export function insertAfter(nodes) {
return this._insertAfter(nodes);
}
export function _insertAfter(nodes, shouldRequeue = false) {
this._assertUnremoved();
nodes = this._verifyNodeList(nodes);
@@ -116,10 +112,7 @@ export function _insertAfter(nodes, shouldRequeue = false) {
this.parentPath.isExpressionStatement() ||
this.parentPath.isLabeledStatement()
) {
// `replaceWithMultiple` requeues if there's a replacement for this.node,
// but not for an ancestor's. Set `shouldRequeue` to true so that any replacement
// for an ancestor node can be enqueued. Fix #5628 and #5023.
return this.parentPath._insertAfter(nodes, true);
return this.parentPath.insertAfter(nodes);
} else if (
this.isNodeType("Expression") ||
(this.parentPath.isForStatement() && this.key === "init")
@@ -142,10 +135,7 @@ export function _insertAfter(nodes, shouldRequeue = false) {
) {
nodes.unshift(this.node);
}
this._replaceWith(t.blockStatement(nodes));
if (shouldRequeue) {
this.requeue();
}
this.replaceWith(t.blockStatement(nodes));
} else {
throw new Error(
"We don't know what to do with this node type. " +