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

simplify parentheses logic and properly parenthesise unaries - fixes #2711

Browse Source
This commit is contained in:
Sebastian McKenzie
2015-11-03 10:49:24 +00:00
parent 1e725f4806
commit cdeff2fbb1
3 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/babel-generator/src/node/parentheses.js
View File

@@ -154,7 +154,15 @@ export function ClassExpression(node: Object, parent: Object): boolean {
}
export function UnaryLike(node: Object, parent: Object): boolean {
return t.isMemberExpression(parent) && parent.object === node;
if (t.isMemberExpression(parent, { object: node })) {
return true;
}
if (t.isCallExpression(parent, { callee: node }) || t.isNewExpression(parent, { callee: node })) {
return true;
}
return false;
}
export function FunctionExpression(node: Object, parent: Object): boolean {
@@ -172,17 +180,7 @@ export function ArrowFunctionExpression(node: Object, parent: Object): boolean {
return true;
}
// (function test() {}).name;
if (t.isMemberExpression(parent) && parent.object === node) {
return true;
}
// (function () {})();
if (t.isCallExpression(parent) && parent.callee === node) {
return true;
}
return false;
return UnaryLike(node, parent);
}
export function ConditionalExpression(node: Object, parent: Object): boolean {
@@ -194,21 +192,11 @@ export function ConditionalExpression(node: Object, parent: Object): boolean {
return true;
}
if (t.isCallExpression(parent) || t.isNewExpression(parent)) {
if (parent.callee === node) {
return true;
}
}
if (t.isConditionalExpression(parent) && parent.test === node) {
if (t.isConditionalExpression(parent, { test: node })) {
return true;
}
if (t.isMemberExpression(parent) && parent.object === node) {
return true;
}
return false;
return UnaryLike(node, parent);
}
export function AssignmentExpression(node: Object): boolean {