Do not consider element accesses which are neither statically bindable nor late bound as special assignments (microsoft#34679)

weswigham · web-flow · commit 07d3a2ec7e4b · 2019-10-23T16:01:25.000-07:00
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -2115,7 +2115,7 @@ namespace ts {
         if (expr.operatorToken.kind !== SyntaxKind.EqualsToken || !isAccessExpression(expr.left)) {
             return AssignmentDeclarationKind.None;
         }
-        if (isBindableStaticNameExpression(expr.left.expression) && getElementOrPropertyAccessName(expr.left) === "prototype" && isObjectLiteralExpression(getInitializerOfBinaryExpression(expr))) {
+        if (isBindableStaticNameExpression(expr.left.expression, /*excludeThisKeyword*/ true) && getElementOrPropertyAccessName(expr.left) === "prototype" && isObjectLiteralExpression(getInitializerOfBinaryExpression(expr))) {
             // F.prototype = { ... }
             return AssignmentDeclarationKind.Prototype;
         }
@@ -2183,8 +2183,10 @@ namespace ts {
                 // exports.name = expr OR module.exports.name = expr OR exports["name"] = expr ...
                 return AssignmentDeclarationKind.ExportsProperty;
             }
-            // F.G...x = expr
-            return AssignmentDeclarationKind.Property;
+            if (isBindableStaticNameExpression(lhs, /*excludeThisKeyword*/ true) || (isElementAccessExpression(lhs) && isDynamicName(lhs) && lhs.expression.kind !== SyntaxKind.ThisKeyword)) {
+                // F.G...x = expr
+                return AssignmentDeclarationKind.Property;
+            }
         }
 
         return AssignmentDeclarationKind.None;
diff --git a/tests/baselines/reference/jsNegativeElementAccessNotBound.symbols b/tests/baselines/reference/jsNegativeElementAccessNotBound.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/jsNegativeELementAccessNotBound.js ===
+var indexMap = {};
+>indexMap : Symbol(indexMap, Decl(jsNegativeELementAccessNotBound.js, 0, 3))
+
+indexMap[-1] = 0;
+>indexMap : Symbol(indexMap, Decl(jsNegativeELementAccessNotBound.js, 0, 3))
+
diff --git a/tests/baselines/reference/jsNegativeElementAccessNotBound.types b/tests/baselines/reference/jsNegativeElementAccessNotBound.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/jsNegativeELementAccessNotBound.js ===
+var indexMap = {};
+>indexMap : {}
+>{} : {}
+
+indexMap[-1] = 0;
+>indexMap[-1] = 0 : 0
+>indexMap[-1] : any
+>indexMap : {}
+>-1 : -1
+>1 : 1
+>0 : 0
+
diff --git a/tests/cases/compiler/jsNegativeElementAccessNotBound.ts b/tests/cases/compiler/jsNegativeElementAccessNotBound.ts
@@ -0,0 +1,6 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+// @filename: jsNegativeELementAccessNotBound.js
+var indexMap = {};
+indexMap[-1] = 0;

Original file line number	Diff line number	Diff line change
`@@ -2115,7 +2115,7 @@ namespace ts {`
`2115`	`2115`	`if (expr.operatorToken.kind !== SyntaxKind.EqualsToken \|\| !isAccessExpression(expr.left)) {`
`2116`	`2116`	`return AssignmentDeclarationKind.None;`
`2117`	`2117`	`}`
`2118`		`- if (isBindableStaticNameExpression(expr.left.expression) && getElementOrPropertyAccessName(expr.left) === "prototype" && isObjectLiteralExpression(getInitializerOfBinaryExpression(expr))) {`
	`2118`	`+ if (isBindableStaticNameExpression(expr.left.expression, /excludeThisKeyword/ true) && getElementOrPropertyAccessName(expr.left) === "prototype" && isObjectLiteralExpression(getInitializerOfBinaryExpression(expr))) {`
`2119`	`2119`	`// F.prototype = { ... }`
`2120`	`2120`	`return AssignmentDeclarationKind.Prototype;`
`2121`	`2121`	`}`
`@@ -2183,8 +2183,10 @@ namespace ts {`
`2183`	`2183`	`// exports.name = expr OR module.exports.name = expr OR exports["name"] = expr ...`
`2184`	`2184`	`return AssignmentDeclarationKind.ExportsProperty;`
`2185`	`2185`	`}`
`2186`		`- // F.G...x = expr`
`2187`		`- return AssignmentDeclarationKind.Property;`
	`2186`	`+ if (isBindableStaticNameExpression(lhs, /excludeThisKeyword/ true) \|\| (isElementAccessExpression(lhs) && isDynamicName(lhs) && lhs.expression.kind !== SyntaxKind.ThisKeyword)) {`
	`2187`	`+ // F.G...x = expr`
	`2188`	`+ return AssignmentDeclarationKind.Property;`
	`2189`	`+ }`
`2188`	`2190`	`}`
`2189`	`2191`
`2190`	`2192`	`return AssignmentDeclarationKind.None;`