From 6c11ceb8db0a085144ee0041793b1e7faa4c172f Mon Sep 17 00:00:00 2001 From: Wenlu Wang Date: Wed, 17 Jun 2020 04:44:01 +0800 Subject: [PATCH] Assignment operator is definite assignment (#39087) Co-authored-by: Orta Therox --- src/compiler/utilities.ts | 4 ++-- .../baselines/reference/logicalAssignment9.js | 13 +++++++++++++ .../reference/logicalAssignment9.symbols | 15 +++++++++++++++ .../reference/logicalAssignment9.types | 19 +++++++++++++++++++ .../logicalAssignment/logicalAssignment9.ts | 5 +++++ 5 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/reference/logicalAssignment9.js create mode 100644 tests/baselines/reference/logicalAssignment9.symbols create mode 100644 tests/baselines/reference/logicalAssignment9.types create mode 100644 tests/cases/conformance/esnext/logicalAssignment/logicalAssignment9.ts diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 6da1e74c3c4..4fb0922febf 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2594,8 +2594,8 @@ namespace ts { switch (parent.kind) { case SyntaxKind.BinaryExpression: const binaryOperator = (parent).operatorToken.kind; - return isAssignmentOperator(binaryOperator) && !isLogicalOrCoalescingAssignmentOperator(binaryOperator) && (parent).left === node ? - binaryOperator === SyntaxKind.EqualsToken ? AssignmentKind.Definite : AssignmentKind.Compound : + return isAssignmentOperator(binaryOperator) && (parent).left === node ? + binaryOperator === SyntaxKind.EqualsToken || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? AssignmentKind.Definite : AssignmentKind.Compound : AssignmentKind.None; case SyntaxKind.PrefixUnaryExpression: case SyntaxKind.PostfixUnaryExpression: diff --git a/tests/baselines/reference/logicalAssignment9.js b/tests/baselines/reference/logicalAssignment9.js new file mode 100644 index 00000000000..88f006d3722 --- /dev/null +++ b/tests/baselines/reference/logicalAssignment9.js @@ -0,0 +1,13 @@ +//// [logicalAssignment9.ts] +declare let x: { a?: boolean }; + +x.a ??= true; +x.a &&= false; + + +//// [logicalAssignment9.js] +"use strict"; +var _a; +var _b, _c; +(_a = (_b = x).a) !== null && _a !== void 0 ? _a : (_b.a = true); +(_c = x).a && (_c.a = false); diff --git a/tests/baselines/reference/logicalAssignment9.symbols b/tests/baselines/reference/logicalAssignment9.symbols new file mode 100644 index 00000000000..b22586c0afd --- /dev/null +++ b/tests/baselines/reference/logicalAssignment9.symbols @@ -0,0 +1,15 @@ +=== tests/cases/conformance/esnext/logicalAssignment/logicalAssignment9.ts === +declare let x: { a?: boolean }; +>x : Symbol(x, Decl(logicalAssignment9.ts, 0, 11)) +>a : Symbol(a, Decl(logicalAssignment9.ts, 0, 16)) + +x.a ??= true; +>x.a : Symbol(a, Decl(logicalAssignment9.ts, 0, 16)) +>x : Symbol(x, Decl(logicalAssignment9.ts, 0, 11)) +>a : Symbol(a, Decl(logicalAssignment9.ts, 0, 16)) + +x.a &&= false; +>x.a : Symbol(a, Decl(logicalAssignment9.ts, 0, 16)) +>x : Symbol(x, Decl(logicalAssignment9.ts, 0, 11)) +>a : Symbol(a, Decl(logicalAssignment9.ts, 0, 16)) + diff --git a/tests/baselines/reference/logicalAssignment9.types b/tests/baselines/reference/logicalAssignment9.types new file mode 100644 index 00000000000..ea2d6f84ed7 --- /dev/null +++ b/tests/baselines/reference/logicalAssignment9.types @@ -0,0 +1,19 @@ +=== tests/cases/conformance/esnext/logicalAssignment/logicalAssignment9.ts === +declare let x: { a?: boolean }; +>x : { a?: boolean | undefined; } +>a : boolean | undefined + +x.a ??= true; +>x.a ??= true : boolean +>x.a : boolean | undefined +>x : { a?: boolean | undefined; } +>a : boolean | undefined +>true : true + +x.a &&= false; +>x.a &&= false : false | undefined +>x.a : boolean | undefined +>x : { a?: boolean | undefined; } +>a : boolean | undefined +>false : false + diff --git a/tests/cases/conformance/esnext/logicalAssignment/logicalAssignment9.ts b/tests/cases/conformance/esnext/logicalAssignment/logicalAssignment9.ts new file mode 100644 index 00000000000..e17ad290b03 --- /dev/null +++ b/tests/cases/conformance/esnext/logicalAssignment/logicalAssignment9.ts @@ -0,0 +1,5 @@ +// @strict: true +declare let x: { a?: boolean }; + +x.a ??= true; +x.a &&= false;