Merge pull request microsoft#14302 from Microsoft/make-special-property-assignment-apply-only-to-lhs

sandersn · web-flow · commit 5b23dbc9990e · 2017-02-24T15:14:30.000-08:00
Provide special property assignment symbol only for left-hand side of assignment
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -20930,7 +20930,9 @@ namespace ts {
                 return getSymbolOfNode(entityName.parent);
             }
 
-            if (isInJavaScriptFile(entityName) && entityName.parent.kind === SyntaxKind.PropertyAccessExpression) {
+            if (isInJavaScriptFile(entityName) &&
+                entityName.parent.kind === SyntaxKind.PropertyAccessExpression &&
+                entityName.parent === (entityName.parent.parent as BinaryExpression).left) {
                 // Check if this is a special property assignment
                 const specialPropertyAssignmentSymbol = getSpecialPropertyAssignmentSymbolFromEntityName(entityName);
                 if (specialPropertyAssignmentSymbol) {
diff --git a/tests/cases/fourslash/renameJsSpecialAssignmentRhs1.ts b/tests/cases/fourslash/renameJsSpecialAssignmentRhs1.ts
@@ -0,0 +1,13 @@
+/// <reference path="fourslash.ts"/>
+// @allowJs: true
+// @Filename: a.js
+////const foo = {
+////    set: function (x) {
+////        this._x = x;
+////    },
+////    copy: function ([|x|]) {
+////        this._x = /**/[|x|].prop;
+////    }
+////};
+goTo.marker();
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
diff --git a/tests/cases/fourslash/renameJsSpecialAssignmentRhs2.ts b/tests/cases/fourslash/renameJsSpecialAssignmentRhs2.ts
@@ -0,0 +1,13 @@
+/// <reference path="fourslash.ts"/>
+// @allowJs: true
+// @Filename: a.js
+////const foo = {
+////    set: function (x) {
+////        this._x = x;
+////    },
+////    copy: function (/**/[|x|]) {
+////        this._x = [|x|].prop;
+////    }
+////};
+goTo.marker();
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
