Merge pull request microsoft#7268 from RyanCavanaugh/fix7063

RyanCavanaugh · RyanCavanaugh · commit a264cea78391 · 2016-03-01T13:57:04.000-08:00
Don't error on duplicate prototype property assignments
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -1466,7 +1466,8 @@ namespace ts {
             }
 
             // Declare the method/property
-            declareSymbol(funcSymbol.members, funcSymbol, leftSideOfAssignment, SymbolFlags.Property, SymbolFlags.PropertyExcludes);
+            // It's acceptable for multiple prototype property assignments of the same identifier to occur
+            declareSymbol(funcSymbol.members, funcSymbol, leftSideOfAssignment, SymbolFlags.Property, SymbolFlags.PropertyExcludes & ~SymbolFlags.Property);
         }
 
         function bindCallExpression(node: CallExpression) {
diff --git a/tests/cases/fourslash/jsDocClasses1.ts b/tests/cases/fourslash/jsDocClasses1.ts
@@ -0,0 +1,28 @@
+///<reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: Foo.js
+
+//// function fn() {
+//// 	this.foo = 10;
+//// }
+//// fn.prototype.foo = 14;
+//// var x = new fn();
+//// 
+//// function fn2() {
+//// 	this.foo = 10;
+//// 	this.foo = 10;
+//// }
+//// fn2.prototype.foo = 14;
+//// fn2.prototype.foo = 14;
+//// var y = new fn2();
+//// 
+//// function fn3() {
+//// 	this.foo = 10;
+//// }
+//// fn3.prototype.foo = 14;
+//// fn3.prototype.foo = 14;
+//// var z = new fn3();
+
+verify.numberOfErrorsInCurrentFile(0);
+

Original file line number	Diff line number	Diff line change
`@@ -1466,7 +1466,8 @@ namespace ts {`
`1466`	`1466`	`}`
`1467`	`1467`
`1468`	`1468`	`// Declare the method/property`
`1469`		`- declareSymbol(funcSymbol.members, funcSymbol, leftSideOfAssignment, SymbolFlags.Property, SymbolFlags.PropertyExcludes);`
	`1469`	`+ // It's acceptable for multiple prototype property assignments of the same identifier to occur`
	`1470`	`+ declareSymbol(funcSymbol.members, funcSymbol, leftSideOfAssignment, SymbolFlags.Property, SymbolFlags.PropertyExcludes & ~SymbolFlags.Property);`
`1470`	`1471`	`}`
`1471`	`1472`
`1472`	`1473`	`function bindCallExpression(node: CallExpression) {`