cargdev/angular
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(compiler): add parens around binary / ternary expressions

Browse Source 
This fixes cases where binary / ternary operators are nested
(e.g. a nested ternary operator).
This commit is contained in:
Tobias Bosch
2017-09-23 11:30:51 -07:00
committed by Victor Berchet
parent a8a9660112
commit 3799f43c71
2 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/compiler-cli/src/transformers/node_emitter.ts
View File

@ -310,13 +310,13 @@ class _NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
return this.record(expr, this._visitIdentifier(expr.value));
}
visitConditionalExpr(expr: ConditionalExpr): RecordedNode<ts.ConditionalExpression> {
// TODO {chuckj}: Review use of ! on flaseCase. Should it be non-nullable?
visitConditionalExpr(expr: ConditionalExpr): RecordedNode<ts.ParenthesizedExpression> {
// TODO {chuckj}: Review use of ! on falseCase. Should it be non-nullable?
return this.record(
expr,
ts.createConditional(
ts.createParen(ts.createConditional(
expr.condition.visitExpression(this, null), expr.trueCase.visitExpression(this, null),
expr.falseCase !.visitExpression(this, null)));
expr.falseCase !.visitExpression(this, null))));
}
visitNotExpr(expr: NotExpr): RecordedNode<ts.PrefixUnaryExpression> {
@ -345,7 +345,7 @@ class _NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
/* type */ undefined, this._visitStatements(expr.statements)));
}
visitBinaryOperatorExpr(expr: BinaryOperatorExpr): RecordedNode<ts.BinaryExpression> {
visitBinaryOperatorExpr(expr: BinaryOperatorExpr): RecordedNode<ts.ParenthesizedExpression> {
let binaryOperator: ts.BinaryOperator;
switch (expr.operator) {
case BinaryOperator.And:
@ -397,9 +397,9 @@ class _NodeEmitterVisitor implements StatementVisitor, ExpressionVisitor {
throw new Error(`Unknown operator: ${expr.operator}`);
}
return this.record(
expr, ts.createBinary(
expr, ts.createParen(ts.createBinary(
expr.lhs.visitExpression(this, null), binaryOperator,
expr.rhs.visitExpression(this, null)));
expr.rhs.visitExpression(this, null))));
}
visitReadPropExpr(expr: ReadPropExpr): RecordedNode<ts.PropertyAccessExpression> {