Merge pull request #136 from Microsoft/functionNameInPropertyAssignment

do not propagate function name in property accessors

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);

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) {

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; } };

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 "";
     }
 };

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) {
     },

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) {
     },

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) {
     },

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) {

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 () {

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;

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 () {
 } };

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) {

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++;
+} };

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) {

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) {

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) {

tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js

@@ -143,7 +143,7 @@ var C = (function () {
 })();
 var a;
 var b = {
-    foo: function foo(x) {
+    foo: function (x) {
         return '';
     }
 };

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

tests/baselines/reference/parserFunctionPropertyAssignment1.js

@@ -2,5 +2,5 @@
 var v = { foo() { } };
 
 //// [parserFunctionPropertyAssignment1.js]
-var v = { foo: function foo() {
+var v = { foo: function () {
 } };

tests/baselines/reference/parserFunctionPropertyAssignment2.js

@@ -2,5 +2,5 @@
 var v = { 0() { } };
 
 //// [parserFunctionPropertyAssignment2.js]
-var v = { 0: function 0() {
+var v = { 0: function () {
 } };

tests/baselines/reference/parserFunctionPropertyAssignment3.js

@@ -2,5 +2,5 @@
 var v = { "foo"() { } };
 
 //// [parserFunctionPropertyAssignment3.js]
-var v = { "foo": function "foo"() {
+var v = { "foo": function () {
 } };

tests/baselines/reference/parserFunctionPropertyAssignment4.js

@@ -2,5 +2,5 @@
 var v = { 0<T>() { } };
 
 //// [parserFunctionPropertyAssignment4.js]
-var v = { 0: function 0() {
+var v = { 0: function () {
 } };

tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js

@@ -2,6 +2,6 @@
 var x = { n() { } };
 
 //// [sourceMapValidationFunctionPropertyAssignment.js]
-var x = { n: function n() {
+var x = { n: function () {
 } };
 //# sourceMappingURL=sourceMapValidationFunctionPropertyAssignment.js.map

tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map

@@ -1,2 +1,2 @@
 //// [sourceMapValidationFunctionPropertyAssignment.js.map]
-{"version":3,"file":"sourceMapValidationFunctionPropertyAssignment.js","sourceRoot":"","sources":["sourceMapValidationFunctionPropertyAssignment.ts"],"names":["n"],"mappings":"AAAA,IAAI,CAAC,GAAG,EAAE,CAAC,EAAD,SAAA,CAAC;AAAKA,CAACA,EAAE,CAAC"}
+{"version":3,"file":"sourceMapValidationFunctionPropertyAssignment.js","sourceRoot":"","sources":["sourceMapValidationFunctionPropertyAssignment.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,EAAE,CAAC,EAAD;AAAM,CAAC,EAAE,CAAC"}

tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt

@@ -8,7 +8,7 @@ sources: sourceMapValidationFunctionPropertyAssignment.ts
 emittedFile:tests/cases/compiler/sourceMapValidationFunctionPropertyAssignment.js
 sourceFile:sourceMapValidationFunctionPropertyAssignment.ts
 -------------------------------------------------------------------
->>>var x = { n: function n() {
+>>>var x = { n: function () {
 1 >
 2 >^^^^
 3 >    ^
@@ -16,8 +16,6 @@ sourceFile:sourceMapValidationFunctionPropertyAssignment.ts
 5 >        ^^
 6 >          ^
 7 >           ^^
-8 >             ^^^^^^^^^
-9 >                      ^
 1 >
 2 >var 
 3 >    x
@@ -25,8 +23,6 @@ sourceFile:sourceMapValidationFunctionPropertyAssignment.ts
 5 >        { 
 6 >          n
 7 >           
-8 >             
-9 >                      n
 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
 2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
 3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0)
@@ -34,8 +30,6 @@ sourceFile:sourceMapValidationFunctionPropertyAssignment.ts
 5 >Emitted(1, 11) Source(1, 11) + SourceIndex(0)
 6 >Emitted(1, 12) Source(1, 12) + SourceIndex(0)
 7 >Emitted(1, 14) Source(1, 11) + SourceIndex(0)
-8 >Emitted(1, 23) Source(1, 11) + SourceIndex(0)
-9 >Emitted(1, 24) Source(1, 12) + SourceIndex(0)
 ---
 >>>} };
 1 >
@@ -43,12 +37,12 @@ sourceFile:sourceMapValidationFunctionPropertyAssignment.ts
 3 > ^^
 4 >   ^
 5 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >() { 
+1 >n() { 
 2 >}
 3 >  }
 4 >   ;
-1 >Emitted(2, 1) Source(1, 17) + SourceIndex(0) name (n)
-2 >Emitted(2, 2) Source(1, 18) + SourceIndex(0) name (n)
+1 >Emitted(2, 1) Source(1, 17) + SourceIndex(0)
+2 >Emitted(2, 2) Source(1, 18) + SourceIndex(0)
 3 >Emitted(2, 4) Source(1, 20) + SourceIndex(0)
 4 >Emitted(2, 5) Source(1, 21) + SourceIndex(0)
 ---

tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js

@@ -42,7 +42,7 @@ var C = (function () {
 })();
 var a;
 var b = {
-    foo: function foo(x) {
+    foo: function (x) {
     },
     a: function foo(x, y) {
     },

tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js

@@ -41,8 +41,8 @@ var C = (function () {
 })();
 var a;
 var b = {
-    foo: function foo(x) {
+    foo: function (x) {
     },
-    foo: function foo(x) {
+    foo: function (x) {
     },
 };

tests/baselines/reference/thisInObjectLiterals.js

@@ -29,7 +29,7 @@ var MyClass = (function () {
     return MyClass;
 })();
 var obj = {
-    f: function f() {
+    f: function () {
         return this.spaaace;
     }
 };

tests/baselines/reference/throwInEnclosingStatements.js

@@ -88,7 +88,7 @@ var C = (function () {
 })();
 var aa = {
     id: 12,
-    biz: function biz() {
+    biz: function () {
         throw this;
     }
 };

tests/cases/compiler/nameCollisionsInPropertyAssignments.ts

@@ -0,0 +1,2 @@
+var x = 1
+var y = { x() { x++; } };