Merge pull request #136 from Microsoft/functionNameInPropertyAssignment

do not propagate function name in property accessors
microsoft · Jul 17, 2014 · 42183cf · 42183cf
2 parents 43ce151 + f1ce09c
commit 42183cf
Show file tree

Hide file tree

Showing 54 changed files with 68 additions and 63 deletions.
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/...baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js b/...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/...aselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js b/...aselines/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/...aselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js b/...aselines/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/.../baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js b/.../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/...baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js b/...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/...nes/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js b/...nes/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/...ines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js b/...ines/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/...ines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js b/...ines/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/...nes/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js b/...nes/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/...nes/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js b/...nes/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/...lines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js b/...lines/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/...ines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js b/...ines/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/...eference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js b/...eference/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/...reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js b/...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/...s/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js b/...s/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/...s/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js b/...s/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 () {
 } };