update control flow

Kingwl · Kingwl · commit 6418943f03f9 · 2019-09-27T11:45:45.000+08:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -1009,8 +1009,7 @@ namespace ts {
                 else {
                     return node.kind === SyntaxKind.BinaryExpression && (
                         (<BinaryExpression>node).operatorToken.kind === SyntaxKind.AmpersandAmpersandToken ||
-                        (<BinaryExpression>node).operatorToken.kind === SyntaxKind.BarBarToken ||
-                        (<BinaryExpression>node).operatorToken.kind === SyntaxKind.QuestionQuestionToken);
+                        (<BinaryExpression>node).operatorToken.kind === SyntaxKind.BarBarToken);
                 }
             }
         }
@@ -1436,6 +1435,14 @@ namespace ts {
             bindCondition(node.right, trueTarget, falseTarget);
         }
 
+        function bindNullishCollasingExpression(node: BinaryExpression, trueTarget: FlowLabel, falseTarget: FlowLabel) {
+            const notNullLabel = createBranchLabel();
+            bindCondition(node.left, trueTarget, notNullLabel);
+            currentFlow = finishFlowLabel(notNullLabel);
+            bind(node.operatorToken);
+            bindCondition(node.right, trueTarget, falseTarget!);
+        }
+
         function bindPrefixUnaryExpressionFlow(node: PrefixUnaryExpression) {
             if (node.operator === SyntaxKind.ExclamationToken) {
                 const saveTrueTarget = currentTrueTarget;
@@ -1468,6 +1475,9 @@ namespace ts {
                     bindLogicalExpression(node, postExpressionLabel, postExpressionLabel);
                     currentFlow = finishFlowLabel(postExpressionLabel);
                 }
+                else if (operator === SyntaxKind.QuestionQuestionToken) {
+                    bindNullishCollasingExpression(node, currentTrueTarget!, currentFalseTarget!);
+                }
                 else {
                     bindLogicalExpression(node, currentTrueTarget!, currentFalseTarget!);
                 }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -1514,7 +1514,6 @@ namespace ts {
     export type LogicalOperator
         = SyntaxKind.AmpersandAmpersandToken
         | SyntaxKind.BarBarToken
-        | SyntaxKind.QuestionQuestionToken
         ;
 
     // see: https://tc39.github.io/ecma262/#prod-LogicalANDExpression
@@ -1548,7 +1547,8 @@ namespace ts {
 
     // see: https://tc39.github.io/ecma262/#prod-AssignmentExpression
     export type AssignmentOperatorOrHigher
-        = LogicalOperatorOrHigher
+        = SyntaxKind.QuestionQuestionToken
+        | LogicalOperatorOrHigher
         | AssignmentOperator
         ;
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -4028,8 +4028,7 @@ namespace ts {
     export function isLogicalOperator(token: SyntaxKind): boolean {
         return token === SyntaxKind.BarBarToken
             || token === SyntaxKind.AmpersandAmpersandToken
-            || token === SyntaxKind.ExclamationToken
-            || token === SyntaxKind.QuestionQuestionToken;
+            || token === SyntaxKind.ExclamationToken;
     }
 
     export function isAssignmentOperator(token: SyntaxKind): boolean {
diff --git a/src/services/codefixes/inferFromUsage.ts b/src/services/codefixes/inferFromUsage.ts
@@ -719,7 +719,7 @@ namespace ts.codefix {
                     }
                     break;
 
-                // LogicalOperator
+                // LogicalOperator Or NullishCoalescing
                 case SyntaxKind.BarBarToken:
                 case SyntaxKind.QuestionQuestionToken:
                     if (node === parent.left &&
diff --git a/tests/baselines/reference/nullishCoalescingOperator11.errors.txt b/tests/baselines/reference/nullishCoalescingOperator11.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator11.ts(3,18): error TS2533: Object is possibly 'null' or 'undefined'.
+tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator11.ts(3,22): error TS2339: Property 'toFixed' does not exist on type '"" | 0'.
+  Property 'toFixed' does not exist on type '""'.
+
+
+==== tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator11.ts (2 errors) ====
+    declare const f11: 1 | 0 | '' | null | undefined;
+    
+    let g11 = f11 ?? f11.toFixed()
+                     ~~~
+!!! error TS2533: Object is possibly 'null' or 'undefined'.
+                         ~~~~~~~
+!!! error TS2339: Property 'toFixed' does not exist on type '"" | 0'.
+!!! error TS2339:   Property 'toFixed' does not exist on type '""'.
+    
+    
+    
diff --git a/tests/baselines/reference/nullishCoalescingOperator11.js b/tests/baselines/reference/nullishCoalescingOperator11.js
@@ -0,0 +1,11 @@
+//// [nullishCoalescingOperator11.ts]
+declare const f11: 1 | 0 | '' | null | undefined;
+
+let g11 = f11 ?? f11.toFixed()
+
+
+
+
+//// [nullishCoalescingOperator11.js]
+"use strict";
+var g11 = (f11 !== null && f11 !== void 0 ? f11 : f11.toFixed());
diff --git a/tests/baselines/reference/nullishCoalescingOperator11.symbols b/tests/baselines/reference/nullishCoalescingOperator11.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator11.ts ===
+declare const f11: 1 | 0 | '' | null | undefined;
+>f11 : Symbol(f11, Decl(nullishCoalescingOperator11.ts, 0, 13))
+
+let g11 = f11 ?? f11.toFixed()
+>g11 : Symbol(g11, Decl(nullishCoalescingOperator11.ts, 2, 3))
+>f11 : Symbol(f11, Decl(nullishCoalescingOperator11.ts, 0, 13))
+>f11 : Symbol(f11, Decl(nullishCoalescingOperator11.ts, 0, 13))
+
+
+
diff --git a/tests/baselines/reference/nullishCoalescingOperator11.types b/tests/baselines/reference/nullishCoalescingOperator11.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator11.ts ===
+declare const f11: 1 | 0 | '' | null | undefined;
+>f11 : "" | 0 | 1 | null | undefined
+>null : null
+
+let g11 = f11 ?? f11.toFixed()
+>g11 : any
+>f11 ?? f11.toFixed() : any
+>f11 : "" | 0 | 1 | null | undefined
+>f11.toFixed() : any
+>f11.toFixed : any
+>f11 : "" | 0 | null | undefined
+>toFixed : any
+
+
+
diff --git a/tests/baselines/reference/nullishCoalescingOperator5.types b/tests/baselines/reference/nullishCoalescingOperator5.types
@@ -20,7 +20,7 @@ a ?? b || c;
 a || b ?? c;
 >a || b ?? c : string | undefined
 >a || b : string | undefined
->a : string | undefined
+>a : string
 >b : string | undefined
 >c : string | undefined
 
diff --git a/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator11.ts b/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator11.ts
@@ -0,0 +1,7 @@
+// @strict: true
+
+declare const f11: 1 | 0 | '' | null | undefined;
+
+let g11 = f11 ?? f11.toFixed()
+
+

Original file line number	Diff line number	Diff line change
`@@ -1009,8 +1009,7 @@ namespace ts {`
`1009`	`1009`	`else {`
`1010`	`1010`	`return node.kind === SyntaxKind.BinaryExpression && (`
`1011`	`1011`	`(<BinaryExpression>node).operatorToken.kind === SyntaxKind.AmpersandAmpersandToken \|\|`
`1012`		`- (<BinaryExpression>node).operatorToken.kind === SyntaxKind.BarBarToken \|\|`
`1013`		`- (<BinaryExpression>node).operatorToken.kind === SyntaxKind.QuestionQuestionToken);`
	`1012`	`+ (<BinaryExpression>node).operatorToken.kind === SyntaxKind.BarBarToken);`
`1014`	`1013`	`}`
`1015`	`1014`	`}`
`1016`	`1015`	`}`
`@@ -1436,6 +1435,14 @@ namespace ts {`
`1436`	`1435`	`bindCondition(node.right, trueTarget, falseTarget);`
`1437`	`1436`	`}`
`1438`	`1437`
	`1438`	`+ function bindNullishCollasingExpression(node: BinaryExpression, trueTarget: FlowLabel, falseTarget: FlowLabel) {`
	`1439`	`+ const notNullLabel = createBranchLabel();`
	`1440`	`+ bindCondition(node.left, trueTarget, notNullLabel);`
	`1441`	`+ currentFlow = finishFlowLabel(notNullLabel);`
	`1442`	`+ bind(node.operatorToken);`
	`1443`	`+ bindCondition(node.right, trueTarget, falseTarget!);`
	`1444`	`+ }`
	`1445`	`+`
`1439`	`1446`	`function bindPrefixUnaryExpressionFlow(node: PrefixUnaryExpression) {`
`1440`	`1447`	`if (node.operator === SyntaxKind.ExclamationToken) {`
`1441`	`1448`	`const saveTrueTarget = currentTrueTarget;`
`@@ -1468,6 +1475,9 @@ namespace ts {`
`1468`	`1475`	`bindLogicalExpression(node, postExpressionLabel, postExpressionLabel);`
`1469`	`1476`	`currentFlow = finishFlowLabel(postExpressionLabel);`
`1470`	`1477`	`}`
	`1478`	`+ else if (operator === SyntaxKind.QuestionQuestionToken) {`
	`1479`	`+ bindNullishCollasingExpression(node, currentTrueTarget!, currentFalseTarget!);`
	`1480`	`+ }`
`1471`	`1481`	`else {`
`1472`	`1482`	`bindLogicalExpression(node, currentTrueTarget!, currentFalseTarget!);`
`1473`	`1483`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1514,7 +1514,6 @@ namespace ts {`
`1514`	`1514`	`export type LogicalOperator`
`1515`	`1515`	`= SyntaxKind.AmpersandAmpersandToken`
`1516`	`1516`	`\| SyntaxKind.BarBarToken`
`1517`		`- \| SyntaxKind.QuestionQuestionToken`
`1518`	`1517`	`;`
`1519`	`1518`
`1520`	`1519`	`// see: https://tc39.github.io/ecma262/#prod-LogicalANDExpression`
`@@ -1548,7 +1547,8 @@ namespace ts {`
`1548`	`1547`
`1549`	`1548`	`// see: https://tc39.github.io/ecma262/#prod-AssignmentExpression`
`1550`	`1549`	`export type AssignmentOperatorOrHigher`
`1551`		`- = LogicalOperatorOrHigher`
	`1550`	`+ = SyntaxKind.QuestionQuestionToken`
	`1551`	`+ \| LogicalOperatorOrHigher`
`1552`	`1552`	`\| AssignmentOperator`
`1553`	`1553`	`;`
`1554`	`1554`
Original file line number	Diff line number	Diff line change
`@@ -4028,8 +4028,7 @@ namespace ts {`
`4028`	`4028`	`export function isLogicalOperator(token: SyntaxKind): boolean {`
`4029`	`4029`	`return token === SyntaxKind.BarBarToken`
`4030`	`4030`	`\|\| token === SyntaxKind.AmpersandAmpersandToken`
`4031`		`- \|\| token === SyntaxKind.ExclamationToken`
`4032`		`- \|\| token === SyntaxKind.QuestionQuestionToken;`
	`4031`	`+ \|\| token === SyntaxKind.ExclamationToken;`
`4033`	`4032`	`}`
`4034`	`4033`
`4035`	`4034`	`export function isAssignmentOperator(token: SyntaxKind): boolean {`
Original file line number	Diff line number	Diff line change
`@@ -719,7 +719,7 @@ namespace ts.codefix {`
`719`	`719`	`}`
`720`	`720`	`break;`
`721`	`721`
`722`		`- // LogicalOperator`
	`722`	`+ // LogicalOperator Or NullishCoalescing`
`723`	`723`	`case SyntaxKind.BarBarToken:`
`724`	`724`	`case SyntaxKind.QuestionQuestionToken:`
`725`	`725`	`if (node === parent.left &&`