maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix incorrect parenthesization logic for conditional expression branches

Browse source
This commit is contained in:
Ron Buckton 2018-01-16 15:17:04 -08:00
parent 64b3086f5e
commit 16b13fe449
5 changed files with 61 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/factory.ts
View file

@ -3954,7 +3954,9 @@ namespace ts {
// per ES grammar both 'whenTrue' and 'whenFalse' parts of conditional expression are assignment expressions
// so in case when comma expression is introduced as a part of previous transformations
// if should be wrapped in parens since comma operator has the lowest precedence
return e.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>e).operatorToken.kind === SyntaxKind.CommaToken
const emittedExpression = skipPartiallyEmittedExpressions(e);
return emittedExpression.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>emittedExpression).operatorToken.kind === SyntaxKind.CommaToken ||
emittedExpression.kind === SyntaxKind.CommaListExpression
? createParen(e)
: e;
}

10
tests/baselines/reference/transformParenthesizesConditionalSubexpression.js Normal file
View file

@ -0,0 +1,10 @@
//// [transformParenthesizesConditionalSubexpression.ts]
var K = 'k'
var a = { p : (true ? { [K] : 'v'} : null) }
var b = { p : (true ? { [K] : 'v'} as any : null) }
//// [transformParenthesizesConditionalSubexpression.js]
var K = 'k';
var a = { p: (true ? (_a = {}, _a[K] = 'v', _a) : null) };
var b = { p: (true ? (_b = {}, _b[K] = 'v', _b) : null) };
var _a, _b;

14
tests/baselines/reference/transformParenthesizesConditionalSubexpression.symbols Normal file
View file

@ -0,0 +1,14 @@
=== tests/cases/compiler/transformParenthesizesConditionalSubexpression.ts ===
var K = 'k'
>K : Symbol(K, Decl(transformParenthesizesConditionalSubexpression.ts, 0, 3))
var a = { p : (true ? { [K] : 'v'} : null) }
>a : Symbol(a, Decl(transformParenthesizesConditionalSubexpression.ts, 1, 3))
>p : Symbol(p, Decl(transformParenthesizesConditionalSubexpression.ts, 1, 9))
>K : Symbol(K, Decl(transformParenthesizesConditionalSubexpression.ts, 0, 3))
var b = { p : (true ? { [K] : 'v'} as any : null) }
>b : Symbol(b, Decl(transformParenthesizesConditionalSubexpression.ts, 2, 3))
>p : Symbol(p, Decl(transformParenthesizesConditionalSubexpression.ts, 2, 9))
>K : Symbol(K, Decl(transformParenthesizesConditionalSubexpression.ts, 0, 3))

30
tests/baselines/reference/transformParenthesizesConditionalSubexpression.types Normal file
View file

@ -0,0 +1,30 @@
=== tests/cases/compiler/transformParenthesizesConditionalSubexpression.ts ===
var K = 'k'
>K : string
>'k' : "k"
var a = { p : (true ? { [K] : 'v'} : null) }
>a : { p: { [x: string]: string; }; }
>{ p : (true ? { [K] : 'v'} : null) } : { p: { [x: string]: string; }; }
>p : { [x: string]: string; }
>(true ? { [K] : 'v'} : null) : { [x: string]: string; }
>true ? { [K] : 'v'} : null : { [x: string]: string; }
>true : true
>{ [K] : 'v'} : { [x: string]: string; }
>K : string
>'v' : "v"
>null : null
var b = { p : (true ? { [K] : 'v'} as any : null) }
>b : { p: any; }
>{ p : (true ? { [K] : 'v'} as any : null) } : { p: any; }
>p : any
>(true ? { [K] : 'v'} as any : null) : any
>true ? { [K] : 'v'} as any : null : any
>true : true
>{ [K] : 'v'} as any : any
>{ [K] : 'v'} : { [x: string]: string; }
>K : string
>'v' : "v"
>null : null

4
tests/cases/compiler/transformParenthesizesConditionalSubexpression.ts Normal file
View file

@ -0,0 +1,4 @@
// @target: es5
var K = 'k'
var a = { p : (true ? { [K] : 'v'} : null) }
var b = { p : (true ? { [K] : 'v'} as any : null) }