microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-22 12:03:44 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #21216 from Microsoft/fix19103

Browse Source 
Fix incorrect parenthesization logic for conditional expression branches
This commit is contained in:
Ron Buckton
2018-01-16 17:00:55 -08:00
committed by GitHub
parent cd525fb6de 16b13fe449
commit dcc5c32abf
5 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/factory.ts
View File

@@ -3960,7 +3960,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;
}