fix review

Kingwl · Kingwl · commit 57be95d33881 · 2019-09-14T03:05:56.000+08:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -1375,7 +1375,6 @@ namespace ts {
             }
         }
 
-        // TODO(rbuckton): Determine how to hook ?? into flow typing
         function bindBinaryExpressionFlow(node: BinaryExpression) {
             const operator = node.operatorToken.kind;
             if (operator === SyntaxKind.AmpersandAmpersandToken || operator === SyntaxKind.BarBarToken || operator === SyntaxKind.QuestionQuestionToken) {
@@ -2730,7 +2729,7 @@ namespace ts {
             init = init && getRightMostAssignedExpression(init);
             if (init) {
                 const isPrototypeAssignment = isPrototypeAccess(isVariableDeclaration(node) ? node.name : isBinaryExpression(node) ? node.left : node);
-                return !!getExpandoInitializer(isBinaryExpression(init) && init.operatorToken.kind === SyntaxKind.BarBarToken ? init.right : init, isPrototypeAssignment);
+                return !!getExpandoInitializer(isBinaryExpression(init) && (init.operatorToken.kind === SyntaxKind.BarBarToken || init.operatorToken.kind === SyntaxKind.QuestionQuestionToken) ? init.right : init, isPrototypeAssignment);
             }
             return false;
         }
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -24514,10 +24514,10 @@ namespace ts {
             const { left, operatorToken, right } = node;
             if (operatorToken.kind === SyntaxKind.QuestionQuestionToken) {
                 if (isBinaryExpression(left) && (left.operatorToken.kind === SyntaxKind.BarBarToken || left.operatorToken.kind === SyntaxKind.AmpersandAmpersandToken)) {
-                    error(left, Diagnostics.Operator_0_cannot_immediately_contain_or_be_contained_within_an_1_operation, tokenToString(left.operatorToken.kind), tokenToString(operatorToken.kind));
+                    grammarErrorOnNode(left, Diagnostics._0_and_1_operations_cannot_be_mixed_without_parentheses, tokenToString(left.operatorToken.kind), tokenToString(operatorToken.kind));
                 }
                 if (isBinaryExpression(right) && (right.operatorToken.kind === SyntaxKind.BarBarToken || right.operatorToken.kind === SyntaxKind.AmpersandAmpersandToken)) {
-                    error(right, Diagnostics.Operator_0_cannot_immediately_contain_or_be_contained_within_an_1_operation, tokenToString(right.operatorToken.kind), tokenToString(operatorToken.kind));
+                    grammarErrorOnNode(right, Diagnostics._0_and_1_operations_cannot_be_mixed_without_parentheses, tokenToString(right.operatorToken.kind), tokenToString(operatorToken.kind));
                 }
             }
         }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -3180,7 +3180,7 @@
         "category": "Error",
         "code": 5075
     },
-    "Operator '{0}' cannot immediately contain, or be contained within an '{1}' operation.": {
+    "'{0}' and '{1}' operations cannot be mixed without parentheses.": {
         "category": "Error",
         "code": 5076
     },
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -3006,7 +3006,7 @@ namespace ts {
                     return parseJSDocAllType(/*postfixEquals*/ true);
                 case SyntaxKind.QuestionQuestionToken:
                     // If there is '??', consider that is prefix '?' in JSDoc type.
-                    scanner.reScanQuestionQuestionToken();
+                    scanner.reScanQuestionToken();
                     // falls through
                 case SyntaxKind.QuestionToken:
                     return parseJSDocUnknownOrNullableType();
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -33,7 +33,7 @@ namespace ts {
         scanJsxAttributeValue(): SyntaxKind;
         reScanJsxToken(): JsxTokenSyntaxKind;
         reScanLessThanToken(): SyntaxKind;
-        reScanQuestionQuestionToken(): SyntaxKind;
+        reScanQuestionToken(): SyntaxKind;
         scanJsxToken(): JsxTokenSyntaxKind;
         scanJsDocToken(): JSDocSyntaxKind;
         scan(): SyntaxKind;
@@ -902,7 +902,7 @@ namespace ts {
             scanJsxAttributeValue,
             reScanJsxToken,
             reScanLessThanToken,
-            reScanQuestionQuestionToken,
+            reScanQuestionToken,
             scanJsxToken,
             scanJsDocToken,
             scan,
@@ -2023,8 +2023,8 @@ namespace ts {
             return token;
         }
 
-        function reScanQuestionQuestionToken(): SyntaxKind {
-            Debug.assert(token === SyntaxKind.QuestionQuestionToken, "'reScanQuestionQuestionToken' should only be called on a '??'");
+        function reScanQuestionToken(): SyntaxKind {
+            Debug.assert(token === SyntaxKind.QuestionQuestionToken, "'reScanQuestionToken' should only be called on a '??'");
             pos = tokenPos + 1;
             return token = SyntaxKind.QuestionToken;
         }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -1982,7 +1982,7 @@ namespace ts {
     /** Given an expando initializer, return its declaration name, or the left-hand side of the assignment if it's part of an assignment declaration. */
     export function getNameOfExpando(node: Declaration): DeclarationName | undefined {
         if (isBinaryExpression(node.parent)) {
-            const parent = (node.parent.operatorToken.kind === SyntaxKind.BarBarToken && isBinaryExpression(node.parent.parent)) ? node.parent.parent : node.parent;
+            const parent = ((node.parent.operatorToken.kind === SyntaxKind.BarBarToken || node.parent.operatorToken.kind === SyntaxKind.QuestionQuestionToken) && isBinaryExpression(node.parent.parent)) ? node.parent.parent : node.parent;
             if (parent.operatorToken.kind === SyntaxKind.EqualsToken && isIdentifier(parent.left)) {
                 return parent.left;
             }
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -3203,7 +3203,7 @@ declare namespace ts {
         scanJsxAttributeValue(): SyntaxKind;
         reScanJsxToken(): JsxTokenSyntaxKind;
         reScanLessThanToken(): SyntaxKind;
-        reScanQuestionQuestionToken(): SyntaxKind;
+        reScanQuestionToken(): SyntaxKind;
         scanJsxToken(): JsxTokenSyntaxKind;
         scanJsDocToken(): JSDocSyntaxKind;
         scan(): SyntaxKind;
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -3203,7 +3203,7 @@ declare namespace ts {
         scanJsxAttributeValue(): SyntaxKind;
         reScanJsxToken(): JsxTokenSyntaxKind;
         reScanLessThanToken(): SyntaxKind;
-        reScanQuestionQuestionToken(): SyntaxKind;
+        reScanQuestionToken(): SyntaxKind;
         scanJsxToken(): JsxTokenSyntaxKind;
         scanJsDocToken(): JSDocSyntaxKind;
         scan(): SyntaxKind;
diff --git a/tests/baselines/reference/nullishCoalescingOperator3.js b/tests/baselines/reference/nullishCoalescingOperator3.js
@@ -11,6 +11,6 @@ const aa1 = a1 ?? a2 ?? a3 ?? a4 ?? a5 ?? a6 ?? 'whatever'
 
 
 //// [nullishCoalescingOperator3.js]
-var _a, _b, _c, _d, _e;
 "use strict";
+var _a, _b, _c, _d, _e;
 var aa1 = (_e = (_d = (_c = (_b = (_a = (a1 != null ? a1 : a2), (_a != null ? _a : a3)), (_b != null ? _b : a4)), (_c != null ? _c : a5)), (_d != null ? _d : a6)), (_e != null ? _e : 'whatever'));
diff --git a/tests/baselines/reference/nullishCoalescingOperator5.errors.txt b/tests/baselines/reference/nullishCoalescingOperator5.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator5.ts(6,6): error TS5076: Operator '||' cannot immediately contain, or be contained within an '??' operation.
-tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator5.ts(9,1): error TS5076: Operator '||' cannot immediately contain, or be contained within an '??' operation.
-tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator5.ts(12,6): error TS5076: Operator '&&' cannot immediately contain, or be contained within an '??' operation.
-tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator5.ts(15,1): error TS5076: Operator '&&' cannot immediately contain, or be contained within an '??' operation.
+tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator5.ts(6,6): error TS5076: '||' and '??' operations cannot be mixed without parentheses.
+tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator5.ts(9,1): error TS5076: '||' and '??' operations cannot be mixed without parentheses.
+tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator5.ts(12,6): error TS5076: '&&' and '??' operations cannot be mixed without parentheses.
+tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator5.ts(15,1): error TS5076: '&&' and '??' operations cannot be mixed without parentheses.
 
 
 ==== tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator5.ts (4 errors) ====
@@ -12,22 +12,22 @@ tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingO
     // should be a syntax error
     a ?? b || c;
          ~~~~~~
-!!! error TS5076: Operator '||' cannot immediately contain, or be contained within an '??' operation.
+!!! error TS5076: '||' and '??' operations cannot be mixed without parentheses.
     
     // should be a syntax error
     a || b ?? c;
     ~~~~~~
-!!! error TS5076: Operator '||' cannot immediately contain, or be contained within an '??' operation.
+!!! error TS5076: '||' and '??' operations cannot be mixed without parentheses.
     
     // should be a syntax error
     a ?? b && c;
          ~~~~~~
-!!! error TS5076: Operator '&&' cannot immediately contain, or be contained within an '??' operation.
+!!! error TS5076: '&&' and '??' operations cannot be mixed without parentheses.
     
     // should be a syntax error
     a && b ?? c;
     ~~~~~~
-!!! error TS5076: Operator '&&' cannot immediately contain, or be contained within an '??' operation.
+!!! error TS5076: '&&' and '??' operations cannot be mixed without parentheses.
     
     // Valid according to spec
     a ?? (b || c);
diff --git a/tests/baselines/reference/nullishCoalescingOperator5.js b/tests/baselines/reference/nullishCoalescingOperator5.js
@@ -41,8 +41,8 @@ a && (b ?? c);
 
 
 //// [nullishCoalescingOperator5.js]
-var _a, _b, _c, _d;
 "use strict";
+var _a, _b, _c, _d;
 // should be a syntax error
 (a != null ? a : b || c);
 // should be a syntax error
diff --git a/tests/baselines/reference/nullishCoalescingOperator8.js b/tests/baselines/reference/nullishCoalescingOperator8.js
@@ -8,8 +8,8 @@ const n3 = a.m() ?? b.p ?? b.m() ?? "default";;
 
 
 //// [nullishCoalescingOperator8.js]
-var _a, _b, _c, _d, _e;
 "use strict";
+var _a, _b, _c, _d, _e;
 var n1 = (_a = a.p, (_a != null ? _a : "default"));
 var n2 = (_b = a.m(), (_b != null ? _b : "default"));
 var n3 = (_e = (_d = (_c = a.m(), (_c != null ? _c : b.p)), (_d != null ? _d : b.m())), (_e != null ? _e : "default"));
diff --git a/tests/baselines/reference/nullishCoalescingOperator9.js b/tests/baselines/reference/nullishCoalescingOperator9.js
@@ -0,0 +1,11 @@
+//// [nullishCoalescingOperator9.ts]
+declare let f: null | ((x: string) => void);
+
+let g = f || (abc => { void abc.toLowerCase() })
+let gg = f ?? (abc => { void abc.toLowerCase() })
+
+
+//// [nullishCoalescingOperator9.js]
+"use strict";
+var g = f || (function (abc) { void abc.toLowerCase(); });
+var gg = (f != null ? f : (function (abc) { void abc.toLowerCase(); }));
diff --git a/tests/baselines/reference/nullishCoalescingOperator9.symbols b/tests/baselines/reference/nullishCoalescingOperator9.symbols
@@ -0,0 +1,21 @@
+=== tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator9.ts ===
+declare let f: null | ((x: string) => void);
+>f : Symbol(f, Decl(nullishCoalescingOperator9.ts, 0, 11))
+>x : Symbol(x, Decl(nullishCoalescingOperator9.ts, 0, 24))
+
+let g = f || (abc => { void abc.toLowerCase() })
+>g : Symbol(g, Decl(nullishCoalescingOperator9.ts, 2, 3))
+>f : Symbol(f, Decl(nullishCoalescingOperator9.ts, 0, 11))
+>abc : Symbol(abc, Decl(nullishCoalescingOperator9.ts, 2, 14))
+>abc.toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --))
+>abc : Symbol(abc, Decl(nullishCoalescingOperator9.ts, 2, 14))
+>toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --))
+
+let gg = f ?? (abc => { void abc.toLowerCase() })
+>gg : Symbol(gg, Decl(nullishCoalescingOperator9.ts, 3, 3))
+>f : Symbol(f, Decl(nullishCoalescingOperator9.ts, 0, 11))
+>abc : Symbol(abc, Decl(nullishCoalescingOperator9.ts, 3, 15))
+>abc.toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --))
+>abc : Symbol(abc, Decl(nullishCoalescingOperator9.ts, 3, 15))
+>toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --))
+
diff --git a/tests/baselines/reference/nullishCoalescingOperator9.types b/tests/baselines/reference/nullishCoalescingOperator9.types
@@ -0,0 +1,32 @@
+=== tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator9.ts ===
+declare let f: null | ((x: string) => void);
+>f : ((x: string) => void) | null
+>null : null
+>x : string
+
+let g = f || (abc => { void abc.toLowerCase() })
+>g : (x: string) => void
+>f || (abc => { void abc.toLowerCase() }) : (x: string) => void
+>f : ((x: string) => void) | null
+>(abc => { void abc.toLowerCase() }) : (abc: string) => void
+>abc => { void abc.toLowerCase() } : (abc: string) => void
+>abc : string
+>void abc.toLowerCase() : undefined
+>abc.toLowerCase() : string
+>abc.toLowerCase : () => string
+>abc : string
+>toLowerCase : () => string
+
+let gg = f ?? (abc => { void abc.toLowerCase() })
+>gg : (x: string) => void
+>f ?? (abc => { void abc.toLowerCase() }) : (x: string) => void
+>f : ((x: string) => void) | null
+>(abc => { void abc.toLowerCase() }) : (abc: string) => void
+>abc => { void abc.toLowerCase() } : (abc: string) => void
+>abc : string
+>void abc.toLowerCase() : undefined
+>abc.toLowerCase() : string
+>abc.toLowerCase : () => string
+>abc : string
+>toLowerCase : () => string
+
diff --git a/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator9.ts b/tests/cases/conformance/expressions/nullishCoalescingOperator/nullishCoalescingOperator9.ts
@@ -0,0 +1,6 @@
+// @strict: true
+
+declare let f: null | ((x: string) => void);
+
+let g = f || (abc => { void abc.toLowerCase() })
+let gg = f ?? (abc => { void abc.toLowerCase() })

Original file line number	Diff line number	Diff line change
`@@ -1375,7 +1375,6 @@ namespace ts {`
`1375`	`1375`	`}`
`1376`	`1376`	`}`
`1377`	`1377`
`1378`		`- // TODO(rbuckton): Determine how to hook ?? into flow typing`
`1379`	`1378`	`function bindBinaryExpressionFlow(node: BinaryExpression) {`
`1380`	`1379`	`const operator = node.operatorToken.kind;`
`1381`	`1380`	`if (operator === SyntaxKind.AmpersandAmpersandToken \|\| operator === SyntaxKind.BarBarToken \|\| operator === SyntaxKind.QuestionQuestionToken) {`
`@@ -2730,7 +2729,7 @@ namespace ts {`
`2730`	`2729`	`init = init && getRightMostAssignedExpression(init);`
`2731`	`2730`	`if (init) {`
`2732`	`2731`	`const isPrototypeAssignment = isPrototypeAccess(isVariableDeclaration(node) ? node.name : isBinaryExpression(node) ? node.left : node);`
`2733`		`- return !!getExpandoInitializer(isBinaryExpression(init) && init.operatorToken.kind === SyntaxKind.BarBarToken ? init.right : init, isPrototypeAssignment);`
	`2732`	`+ return !!getExpandoInitializer(isBinaryExpression(init) && (init.operatorToken.kind === SyntaxKind.BarBarToken \|\| init.operatorToken.kind === SyntaxKind.QuestionQuestionToken) ? init.right : init, isPrototypeAssignment);`
`2734`	`2733`	`}`
`2735`	`2734`	`return false;`
`2736`	`2735`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24514,10 +24514,10 @@ namespace ts {`
`24514`	`24514`	`const { left, operatorToken, right } = node;`
`24515`	`24515`	`if (operatorToken.kind === SyntaxKind.QuestionQuestionToken) {`
`24516`	`24516`	`if (isBinaryExpression(left) && (left.operatorToken.kind === SyntaxKind.BarBarToken \|\| left.operatorToken.kind === SyntaxKind.AmpersandAmpersandToken)) {`
`24517`		`- error(left, Diagnostics.Operator_0_cannot_immediately_contain_or_be_contained_within_an_1_operation, tokenToString(left.operatorToken.kind), tokenToString(operatorToken.kind));`
	`24517`	`+ grammarErrorOnNode(left, Diagnostics._0_and_1_operations_cannot_be_mixed_without_parentheses, tokenToString(left.operatorToken.kind), tokenToString(operatorToken.kind));`
`24518`	`24518`	`}`
`24519`	`24519`	`if (isBinaryExpression(right) && (right.operatorToken.kind === SyntaxKind.BarBarToken \|\| right.operatorToken.kind === SyntaxKind.AmpersandAmpersandToken)) {`
`24520`		`- error(right, Diagnostics.Operator_0_cannot_immediately_contain_or_be_contained_within_an_1_operation, tokenToString(right.operatorToken.kind), tokenToString(operatorToken.kind));`
	`24520`	`+ grammarErrorOnNode(right, Diagnostics._0_and_1_operations_cannot_be_mixed_without_parentheses, tokenToString(right.operatorToken.kind), tokenToString(operatorToken.kind));`
`24521`	`24521`	`}`
`24522`	`24522`	`}`
`24523`	`24523`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1982,7 +1982,7 @@ namespace ts {`
`1982`	`1982`	`/** Given an expando initializer, return its declaration name, or the left-hand side of the assignment if it's part of an assignment declaration. */`
`1983`	`1983`	`export function getNameOfExpando(node: Declaration): DeclarationName \| undefined {`
`1984`	`1984`	`if (isBinaryExpression(node.parent)) {`
`1985`		`- const parent = (node.parent.operatorToken.kind === SyntaxKind.BarBarToken && isBinaryExpression(node.parent.parent)) ? node.parent.parent : node.parent;`
	`1985`	`+ const parent = ((node.parent.operatorToken.kind === SyntaxKind.BarBarToken \|\| node.parent.operatorToken.kind === SyntaxKind.QuestionQuestionToken) && isBinaryExpression(node.parent.parent)) ? node.parent.parent : node.parent;`
`1986`	`1986`	`if (parent.operatorToken.kind === SyntaxKind.EqualsToken && isIdentifier(parent.left)) {`
`1987`	`1987`	`return parent.left;`
`1988`	`1988`	`}`