diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index b0fe82dc60e..d7ddaf02a9d 100644 --- 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 index f082b5c9b76..7f36d13d64c 100644 --- 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 index 9cc2cebe650..b010064aba1 100644 --- 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 index 07afb884931..48395b3bdc0 100644 --- 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 index 1915a7df3f3..53cb0cc067a 100644 --- 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 index 0fe2ea5dac7..1107acc51de 100644 --- 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 index 4627a9abfe2..6f70965895a 100644 --- 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 index e41cc96ed48..a00877e92c0 100644 --- 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 index 293bad11b0a..c06dfff13d1 100644 --- 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 index b2a308d2cbf..16ff454d8da 100644 --- 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 index 4bce3d90398..980789cb949 100644 --- 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 index cc6457a41cb..9a626b687bb 100644 --- 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 new file mode 100644 index 00000000000..3035ab6e628 --- /dev/null +++ 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 index 733d378cdf0..bd45c978d62 100644 --- 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 index 4eb44d8daec..6c02956a1b2 100644 --- 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 index 314015046a9..e3cdbf7b7dc 100644 --- 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 index 7182e5cd0af..6f7ca7aaa2b 100644 --- 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 index b60ab7a68b4..ff213a2f898 100644 --- 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 index a49e12a7fb5..f3f28d5e9ad 100644 --- 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 index b967ef12e23..2e1441a4c86 100644 --- 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 index 7bb41dbb4f2..95794735b2c 100644 --- 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 index 3953d2529c6..d9fb0242fa7 100644 --- 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 index b9d3ad18f12..278d454cb01 100644 --- 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 index 180301492f0..fcdac6bdfb4 100644 --- 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 index 4ee59c0e336..79d50124d1e 100644 --- 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 index f8476f53d68..5d42e66aac1 100644 --- 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 index aceea0523ff..33ac618cb76 100644 --- 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 index 0c29c37687c..51191a5d081 100644 --- 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 index c7725f4e29d..eacf93b7f00 100644 --- 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 index 433f734ab4e..aeefeaeeb9e 100644 --- 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 index ea044f43302..fe8f5456537 100644 --- 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 index 69f8510f463..c349fe5bd1d 100644 --- 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 index add492d94f9..b18a0fa382f 100644 --- 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 index 63642515410..7cd068b7cb5 100644 --- 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 index 6caa70f01d0..5d68df0d2a2 100644 --- 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 index de1fbae6e51..8d35ec4aa39 100644 --- 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 index 8967ad413ad..5d1bffee033 100644 --- 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 index 8ba7ad89579..2d0653b4e94 100644 --- 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 index 20deac456ad..57da54fa5c3 100644 --- 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 index b29859f08e0..0eaf30f07c9 100644 --- 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 index ba3ea4cc3b6..caecc755fc6 100644 --- 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 index 64452744c96..48f8d3e520c 100644 --- 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 index 83d88df46ae..9135f98ff6d 100644 --- 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 index 8975ce36e4c..928b0113342 100644 --- 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 index 15205c0689f..03318edc134 100644 --- a/tests/baselines/reference/parserFunctionPropertyAssignment3.js +++ b/tests/baselines/reference/parserFunctionPropertyAssignment3.js @@ -2,5 +2,5 @@ var v = { "foo"() { } }; //// [parserFunctionPropertyAssignment3.js] -var v = { "foo": function "foo"() { +var v = { "foo": function () { } }; diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment4.js b/tests/baselines/reference/parserFunctionPropertyAssignment4.js index 665241e48f5..8366fb296ff 100644 --- a/tests/baselines/reference/parserFunctionPropertyAssignment4.js +++ b/tests/baselines/reference/parserFunctionPropertyAssignment4.js @@ -2,5 +2,5 @@ var v = { 0() { } }; //// [parserFunctionPropertyAssignment4.js] -var v = { 0: function 0() { +var v = { 0: function () { } }; diff --git a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js index f76df7047ea..b360b0e45a7 100644 --- a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js +++ b/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 \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map index 10c482a6ba2..74b7201ea8f 100644 --- a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.js.map +++ b/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"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationFunctionPropertyAssignment.js","sourceRoot":"","sources":["sourceMapValidationFunctionPropertyAssignment.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,EAAE,CAAC,EAAD;AAAM,CAAC,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt b/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt index 00ff4d13586..c34558a11a3 100644 --- a/tests/baselines/reference/sourceMapValidationFunctionPropertyAssignment.sourcemap.txt +++ b/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) --- diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js index ec546b4aa6a..58af9bd2fa4 100644 --- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js +++ b/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) { }, diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js index 14aa526c55e..9667537f977 100644 --- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js +++ b/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) { }, }; diff --git a/tests/baselines/reference/thisInObjectLiterals.js b/tests/baselines/reference/thisInObjectLiterals.js index 20b41670073..4782f3bccd9 100644 --- a/tests/baselines/reference/thisInObjectLiterals.js +++ b/tests/baselines/reference/thisInObjectLiterals.js @@ -29,7 +29,7 @@ var MyClass = (function () { return MyClass; })(); var obj = { - f: function f() { + f: function () { return this.spaaace; } }; diff --git a/tests/baselines/reference/throwInEnclosingStatements.js b/tests/baselines/reference/throwInEnclosingStatements.js index 41da2ec2d07..b52926e651e 100644 --- a/tests/baselines/reference/throwInEnclosingStatements.js +++ b/tests/baselines/reference/throwInEnclosingStatements.js @@ -88,7 +88,7 @@ var C = (function () { })(); var aa = { id: 12, - biz: function biz() { + biz: function () { throw this; } }; diff --git a/tests/cases/compiler/nameCollisionsInPropertyAssignments.ts b/tests/cases/compiler/nameCollisionsInPropertyAssignments.ts new file mode 100644 index 00000000000..3847cca3a45 --- /dev/null +++ b/tests/cases/compiler/nameCollisionsInPropertyAssignments.ts @@ -0,0 +1,2 @@ +var x = 1 +var y = { x() { x++; } }; \ No newline at end of file