Merge pull request microsoft#136 from Microsoft/functionNameInPropertyAssignment

vladima · vladima · commit 42183cf6d429 · 2014-07-17T15:34:17.000-07:00
do not propagate function name in property accessors
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -1756,7 +1756,7 @@ module ts {
             if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) {
                 var sig = parseSignature(SyntaxKind.CallSignature, SyntaxKind.ColonToken);
                 var body = parseBody();
-                node.initializer = makeFunctionExpression(SyntaxKind.FunctionExpression, node.pos, node.name, sig, body);
+                node.initializer = makeFunctionExpression(SyntaxKind.FunctionExpression, node.pos, undefined, sig, body);
             }
             else {
                 parseExpected(SyntaxKind.ColonToken);
diff --git a/tests/baselines/reference/assignEveryTypeToAny.js b/tests/baselines/reference/assignEveryTypeToAny.js
@@ -90,10 +90,10 @@ var h;
 x = h;
 var i;
 x = i;
-x = { f: function f() {
+x = { f: function () {
     return 1;
 } };
-x = { f: function f(x) {
+x = { f: function (x) {
     return x;
 } };
 function j(a) {
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures2.js b/tests/baselines/reference/assignmentCompatWithCallSignatures2.js
@@ -66,7 +66,7 @@ t = { f: function (x) { return 1; } };
 t = { f: function f() {
     return 1;
 } };
-t = { f: function f(x) {
+t = { f: function (x) {
     return '';
 } };
 a = { f: function () { return 1; } };
diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.js b/tests/baselines/reference/assignmentToObjectAndFunction.js
@@ -32,7 +32,7 @@ var badFundule: Function = bad; // error
 //// [assignmentToObjectAndFunction.js]
 var errObj = { toString: 0 };
 var goodObj = {
-    toString: function toString(x) {
+    toString: function (x) {
         return "";
     }
 };
diff --git a/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js b/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js
@@ -72,7 +72,7 @@ var C = (function () {
 })();
 var a;
 var b = {
-    foo: function foo(x, y) {
+    foo: function (x, y) {
     },
     a: function foo(x, y) {
     },
diff --git a/tests/baselines/reference/callSignaturesWithDuplicateParameters.js b/tests/baselines/reference/callSignaturesWithDuplicateParameters.js
@@ -72,7 +72,7 @@ var C = (function () {
 })();
 var a;
 var b = {
-    foo: function foo(x, x) {
+    foo: function (x, x) {
     },
     a: function foo(x, x) {
     },
diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters.js b/tests/baselines/reference/callSignaturesWithOptionalParameters.js
@@ -89,7 +89,7 @@ a(1);
 a.foo();
 a.foo(1);
 var b = {
-    foo: function foo(x) {
+    foo: function (x) {
     },
     a: function foo(x, y) {
     },
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers.js b/tests/baselines/reference/callSignaturesWithParameterInitializers.js
@@ -95,7 +95,7 @@ a(1);
 a.foo();
 a.foo(1);
 var b = {
-    foo: function foo(x) {
+    foo: function (x) {
         if (x === void 0) { x = 1; }
     },
     a: function foo(x, y) {
diff --git a/tests/baselines/reference/genericsWithoutTypeParameters1.js b/tests/baselines/reference/genericsWithoutTypeParameters1.js
@@ -51,7 +51,7 @@ function foo(x, y) {
 function foo2(x, y) {
 }
 var x = { a: new C() };
-var x2 = { a: { bar: function bar() {
+var x2 = { a: { bar: function () {
     return 1;
 } } };
 var D = (function () {
diff --git a/tests/baselines/reference/invalidUndefinedValues.js b/tests/baselines/reference/invalidUndefinedValues.js
@@ -54,7 +54,7 @@ var M;
     M.x = 1;
 })(M || (M = {}));
 x = M;
-x = { f: function f() {
+x = { f: function () {
 } };
 function f(a) {
     x = a;
diff --git a/tests/baselines/reference/invalidVoidAssignments.js b/tests/baselines/reference/invalidVoidAssignments.js
@@ -59,5 +59,5 @@ var E;
 })(E || (E = {}));
 x = E;
 x = 0 /* A */;
-x = { f: function f() {
+x = { f: function () {
 } };
diff --git a/tests/baselines/reference/invalidVoidValues.js b/tests/baselines/reference/invalidVoidValues.js
@@ -46,7 +46,7 @@ var a;
 x = a;
 var b;
 x = b;
-x = { f: function f() {
+x = { f: function () {
 } };
 var M;
 (function (M) {
diff --git a/tests/baselines/reference/nameCollisionsInPropertyAssignments.js b/tests/baselines/reference/nameCollisionsInPropertyAssignments.js
@@ -0,0 +1,9 @@
+//// [nameCollisionsInPropertyAssignments.ts]
+var x = 1
+var y = { x() { x++; } }; 
+
+//// [nameCollisionsInPropertyAssignments.js]
+var x = 1;
+var y = { x: function () {
+    x++;
+} };
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js
@@ -126,7 +126,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { foo: function foo(x) {
+var b = { foo: function (x) {
     return '';
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js
@@ -126,7 +126,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { foo: function foo(x) {
+var b = { foo: function (x) {
     return '';
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js
@@ -126,7 +126,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { foo: function foo(x) {
+var b = { foo: function (x) {
     return '';
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js
@@ -143,7 +143,7 @@ var C = (function () {
 })();
 var a;
 var b = {
-    foo: function foo(x) {
+    foo: function (x) {
         return '';
     }
 };
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js
@@ -90,7 +90,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { new: function new(x) {
+var b = { new: function (x) {
     return '';
 } };
 function foo1b(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js
@@ -90,7 +90,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { new: function new(x) {
+var b = { new: function (x) {
     return '';
 } };
 function foo1b(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js
@@ -126,7 +126,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { foo: function foo(x) {
+var b = { foo: function (x) {
     return x;
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js
@@ -126,7 +126,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { foo: function foo(x, y) {
+var b = { foo: function (x, y) {
     return x;
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js
@@ -128,7 +128,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { foo: function foo(x) {
+var b = { foo: function (x) {
     return '';
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js
@@ -148,7 +148,7 @@ var D = (function () {
     return D;
 })();
 var a;
-var b = { foo: function foo(x, y) {
+var b = { foo: function (x, y) {
     return '';
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js
@@ -167,7 +167,7 @@ var D = (function () {
     return D;
 })();
 var a;
-var b = { foo: function foo(x, y) {
+var b = { foo: function (x, y) {
     return '';
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js
@@ -128,7 +128,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { foo: function foo(x) {
+var b = { foo: function (x) {
     return null;
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js
@@ -128,7 +128,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { foo: function foo(x) {
+var b = { foo: function (x) {
     return null;
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js
@@ -126,7 +126,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { foo: function foo(x) {
+var b = { foo: function (x) {
     return x;
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js
@@ -126,7 +126,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { foo: function foo(x) {
+var b = { foo: function (x) {
     return x;
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js
@@ -128,7 +128,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { foo: function foo(x, y) {
+var b = { foo: function (x, y) {
     return x;
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js
@@ -128,7 +128,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { foo: function foo(x, y) {
+var b = { foo: function (x, y) {
     return x;
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js
@@ -128,7 +128,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { foo: function foo(x, y) {
+var b = { foo: function (x, y) {
     return x;
 } };
 function foo1(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js
@@ -89,7 +89,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { new: function new(x) {
+var b = { new: function (x) {
     return '';
 } };
 function foo1b(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js
@@ -106,7 +106,7 @@ var D = (function () {
     return D;
 })();
 var a;
-var b = { new: function new(x, y) {
+var b = { new: function (x, y) {
     return '';
 } };
 function foo1b(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js
@@ -125,7 +125,7 @@ var D = (function () {
     return D;
 })();
 var a;
-var b = { new: function new(x, y) {
+var b = { new: function (x, y) {
     return '';
 } };
 function foo1b(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js
@@ -96,7 +96,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { new: function new(x) {
+var b = { new: function (x) {
     return null;
 } };
 function foo1b(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js
@@ -92,7 +92,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { new: function new(x) {
+var b = { new: function (x) {
     return null;
 } };
 function foo1b(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js
@@ -86,7 +86,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { new: function new(x) {
+var b = { new: function (x) {
     return x;
 } };
 function foo1b(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js
@@ -86,7 +86,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { new: function new(x) {
+var b = { new: function (x) {
     return new C(x);
 } };
 function foo1b(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js
@@ -88,7 +88,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { new: function new(x, y) {
+var b = { new: function (x, y) {
     return new C(x, y);
 } };
 function foo1b(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js
@@ -88,7 +88,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { new: function new(x, y) {
+var b = { new: function (x, y) {
     return new C(x, y);
 } };
 function foo1b(x) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js
@@ -88,7 +88,7 @@ var C = (function () {
     return C;
 })();
 var a;
-var b = { new: function new(x, y) {
+var b = { new: function (x, y) {
     return new C(x, y);
 } };
 function foo1b(x) {
diff --git a/tests/baselines/reference/parametersWithNoAnnotationAreAny.js b/tests/baselines/reference/parametersWithNoAnnotationAreAny.js
@@ -48,7 +48,7 @@ var C = (function () {
 })();
 var a;
 var b = {
-    foo: function foo(x) {
+    foo: function (x) {
         return x;
     },
     a: function foo(x) {
diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment1.js b/tests/baselines/reference/parserFunctionPropertyAssignment1.js
@@ -2,5 +2,5 @@
 var v = { foo() { } };
 
 //// [parserFunctionPropertyAssignment1.js]
-var v = { foo: function foo() {
+var v = { foo: function () {
 } };
diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment2.js b/tests/baselines/reference/parserFunctionPropertyAssignment2.js
@@ -2,5 +2,5 @@
 var v = { 0() { } };
 
 //// [parserFunctionPropertyAssignment2.js]
-var v = { 0: function 0() {
+var v = { 0: function () {
 } };
diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment3.js b/tests/baselines/reference/parserFunctionPropertyAssignment3.js
diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment4.js b/tests/baselines/reference/parserFunctionPropertyAssignment4.js
diff --git a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js
diff --git a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map
diff --git a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt
diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js
diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js
diff --git a/tests/baselines/reference/thisInObjectLiterals.js b/tests/baselines/reference/thisInObjectLiterals.js
diff --git a/tests/baselines/reference/throwInEnclosingStatements.js b/tests/baselines/reference/throwInEnclosingStatements.js
diff --git a/tests/cases/compiler/nameCollisionsInPropertyAssignments.ts b/tests/cases/compiler/nameCollisionsInPropertyAssignments.ts

Original file line number	Diff line number	Diff line change
`@@ -1756,7 +1756,7 @@ module ts {`
`1756`	`1756`	`if (token === SyntaxKind.OpenParenToken \|\| token === SyntaxKind.LessThanToken) {`
`1757`	`1757`	`var sig = parseSignature(SyntaxKind.CallSignature, SyntaxKind.ColonToken);`
`1758`	`1758`	`var body = parseBody();`
`1759`		`- node.initializer = makeFunctionExpression(SyntaxKind.FunctionExpression, node.pos, node.name, sig, body);`
	`1759`	`+ node.initializer = makeFunctionExpression(SyntaxKind.FunctionExpression, node.pos, undefined, sig, body);`
`1760`	`1760`	`}`
`1761`	`1761`	`else {`
`1762`	`1762`	`parseExpected(SyntaxKind.ColonToken);`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ var badFundule: Function = bad; // error`
`32`	`32`	`//// [assignmentToObjectAndFunction.js]`
`33`	`33`	`var errObj = { toString: 0 };`
`34`	`34`	`var goodObj = {`
`35`		`- toString: function toString(x) {`
	`35`	`+ toString: function (x) {`
`36`	`36`	`return "";`
`37`	`37`	`}`
`38`	`38`	`};`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ function foo(x, y) {`
`51`	`51`	`function foo2(x, y) {`
`52`	`52`	`}`
`53`	`53`	`var x = { a: new C() };`
`54`		`-var x2 = { a: { bar: function bar() {`
	`54`	`+var x2 = { a: { bar: function () {`
`55`	`55`	`return 1;`
`56`	`56`	`} } };`
`57`	`57`	`var D = (function () {`