Merge branch 'master' into errorOnWithStatement

Author: JsonFreeman

src/compiler/parser.ts

@@ -1836,7 +1836,12 @@ module ts {
  if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) {
  var sig = parseSignature(SyntaxKind.CallSignature, SyntaxKind.ColonToken);
  var body = parseBody(/* ignoreMissingOpenBrace */ false);
- node.initializer = makeFunctionExpression(SyntaxKind.FunctionExpression, node.pos, node.name, sig, body);
+ // do not propagate property name as name for function expression
+ // for scenarios like 
+ // var x = 1;
+ // var y = { x() { } } 
+ // otherwise this will bring y.x into the scope of x which is incorrect
+ 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;