Allow multiple 'this' property assignments in Salsa

RyanCavanaugh · RyanCavanaugh · commit 7259b9fd4aa2 · 2016-01-27T14:00:33.000-08:00
Fixes issue microsoft#6645
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -1435,7 +1435,8 @@ namespace ts {
             // Declare a 'member' in case it turns out the container was an ES5 class
             if (container.kind === SyntaxKind.FunctionExpression || container.kind === SyntaxKind.FunctionDeclaration) {
                 container.symbol.members = container.symbol.members || {};
-                declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes);
+                // It's acceptable for multiple 'this' assignments of the same identifier to occur
+                declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes & ~SymbolFlags.Property);
             }
         }
 
diff --git a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics23.ts b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics23.ts
@@ -0,0 +1,14 @@
+/// <reference path="fourslash.ts" />
+
+// @allowJs: true
+// @Filename: a.js
+//// function Person(age) {
+////     if (age >= 18) {
+////         this.canVote = true;
+////     } else {
+////         this.canVote = false;
+////     }
+//// }
+
+verify.getSyntacticDiagnostics(`[]`);
+verify.getSemanticDiagnostics(`[]`);

Original file line number	Diff line number	Diff line change
`@@ -1435,7 +1435,8 @@ namespace ts {`
`1435`	`1435`	`// Declare a 'member' in case it turns out the container was an ES5 class`
`1436`	`1436`	`if (container.kind === SyntaxKind.FunctionExpression \|\| container.kind === SyntaxKind.FunctionDeclaration) {`
`1437`	`1437`	`container.symbol.members = container.symbol.members \|\| {};`
`1438`		`- declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes);`
	`1438`	`+ // It's acceptable for multiple 'this' assignments of the same identifier to occur`
	`1439`	`+ declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes & ~SymbolFlags.Property);`
`1439`	`1440`	`}`
`1440`	`1441`	`}`
`1441`	`1442`