iSharkFly-Docs/angular-docs-cn
1
0
Fork 0
Code Issues 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
packages/compiler-cli/test/transformers/node_emitter_spec.ts
+22 -17
View File
@@ -179,7 +179,7 @@ describe('TypeScriptNodeEmitter', () => {
it('should support blank literals', () => {
expect(emitStmt(o.literal(null).toStmt())).toEqual('null;');
expect(emitStmt(o.literal(undefined).toStmt())).toEqual('undefined;');
expect(emitStmt(o.variable('a', null).isBlank().toStmt())).toEqual('a == null;');
expect(emitStmt(o.variable('a', null).isBlank().toStmt())).toEqual('(a == null);');
});
it('should support external identifiers', () => {
@@ -195,23 +195,28 @@ describe('TypeScriptNodeEmitter', () => {
expect(emitStmt(o.not(someVar).toStmt())).toEqual('!someVar;');
expect(emitStmt(o.assertNotNull(someVar).toStmt())).toEqual('someVar;');
expect(emitStmt(someVar.conditional(o.variable('trueCase'), o.variable('falseCase')).toStmt()))
.toEqual('someVar ? trueCase : falseCase;');
.toEqual('(someVar ? trueCase : falseCase);');
expect(emitStmt(someVar.conditional(o.variable('trueCase'), o.variable('falseCase'))
.conditional(o.variable('trueCase'), o.variable('falseCase'))
.toStmt()))
.toEqual('((someVar ? trueCase : falseCase) ? trueCase : falseCase);');
expect(emitStmt(lhs.equals(rhs).toStmt())).toEqual('lhs == rhs;');
expect(emitStmt(lhs.notEquals(rhs).toStmt())).toEqual('lhs != rhs;');
expect(emitStmt(lhs.identical(rhs).toStmt())).toEqual('lhs === rhs;');
expect(emitStmt(lhs.notIdentical(rhs).toStmt())).toEqual('lhs !== rhs;');
expect(emitStmt(lhs.minus(rhs).toStmt())).toEqual('lhs - rhs;');
expect(emitStmt(lhs.plus(rhs).toStmt())).toEqual('lhs + rhs;');
expect(emitStmt(lhs.divide(rhs).toStmt())).toEqual('lhs / rhs;');
expect(emitStmt(lhs.multiply(rhs).toStmt())).toEqual('lhs * rhs;');
expect(emitStmt(lhs.modulo(rhs).toStmt())).toEqual('lhs % rhs;');
expect(emitStmt(lhs.and(rhs).toStmt())).toEqual('lhs && rhs;');
expect(emitStmt(lhs.or(rhs).toStmt())).toEqual('lhs || rhs;');
expect(emitStmt(lhs.lower(rhs).toStmt())).toEqual('lhs < rhs;');
expect(emitStmt(lhs.lowerEquals(rhs).toStmt())).toEqual('lhs <= rhs;');
expect(emitStmt(lhs.bigger(rhs).toStmt())).toEqual('lhs > rhs;');
expect(emitStmt(lhs.biggerEquals(rhs).toStmt())).toEqual('lhs >= rhs;');
expect(emitStmt(lhs.equals(rhs).toStmt())).toEqual('(lhs == rhs);');
expect(emitStmt(lhs.notEquals(rhs).toStmt())).toEqual('(lhs != rhs);');
expect(emitStmt(lhs.identical(rhs).toStmt())).toEqual('(lhs === rhs);');
expect(emitStmt(lhs.notIdentical(rhs).toStmt())).toEqual('(lhs !== rhs);');
expect(emitStmt(lhs.minus(rhs).toStmt())).toEqual('(lhs - rhs);');
expect(emitStmt(lhs.plus(rhs).toStmt())).toEqual('(lhs + rhs);');
expect(emitStmt(lhs.divide(rhs).toStmt())).toEqual('(lhs / rhs);');
expect(emitStmt(lhs.multiply(rhs).toStmt())).toEqual('(lhs * rhs);');
expect(emitStmt(lhs.plus(rhs).multiply(rhs).toStmt())).toEqual('((lhs + rhs) * rhs);');
expect(emitStmt(lhs.modulo(rhs).toStmt())).toEqual('(lhs % rhs);');
expect(emitStmt(lhs.and(rhs).toStmt())).toEqual('(lhs && rhs);');
expect(emitStmt(lhs.or(rhs).toStmt())).toEqual('(lhs || rhs);');
expect(emitStmt(lhs.lower(rhs).toStmt())).toEqual('(lhs < rhs);');
expect(emitStmt(lhs.lowerEquals(rhs).toStmt())).toEqual('(lhs <= rhs);');
expect(emitStmt(lhs.bigger(rhs).toStmt())).toEqual('(lhs > rhs);');
expect(emitStmt(lhs.biggerEquals(rhs).toStmt())).toEqual('(lhs >= rhs);');
});
it('should support function expressions', () => {