Fix the merge conflicts

sheetalkamat · sheetalkamat · commit a4ab192b6fb9 · 2014-12-04T13:38:51.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -4395,7 +4395,8 @@ module ts {
             // That helps in making sure not assigning types as any when resolved out of order
             var containerNodes: Node[] = [];
             for (var parent = node.parent; parent; parent = parent.parent) {
-                if (isExpression(parent) && isContextSensitiveExpression(<Expression>parent)) {
+                if ((isExpression(parent) || isObjectLiteralMethod(node)) &&
+                    isContextSensitive(<Expression>parent)) {
                     containerNodes.unshift(parent);
                 }
             }
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
@@ -94,7 +94,7 @@ class TypeWriterWalker {
     }
 
     private getTypeOfNode(node: ts.Node): ts.Type {
-        var type = this.checker.getTypeOfLocation(node);
+        var type = this.checker.getTypeAtLocation(node);
         ts.Debug.assert(type !== undefined, "type doesn't exist");
         return type;
     }
diff --git a/tests/baselines/reference/callExpressionWithMissingTypeArgument1.errors.txt b/tests/baselines/reference/callExpressionWithMissingTypeArgument1.errors.txt
@@ -4,7 +4,7 @@ tests/cases/compiler/callExpressionWithMissingTypeArgument1.ts(1,1): error TS230
 
 ==== tests/cases/compiler/callExpressionWithMissingTypeArgument1.ts (2 errors) ====
     Foo<a,,b>();
-          
+          ~
 !!! error TS1110: Type expected.
     ~~~
 !!! error TS2304: Cannot find name 'Foo'.

Original file line number	Diff line number	Diff line change
`@@ -4395,7 +4395,8 @@ module ts {`
`4395`	`4395`	`// That helps in making sure not assigning types as any when resolved out of order`
`4396`	`4396`	`var containerNodes: Node[] = [];`
`4397`	`4397`	`for (var parent = node.parent; parent; parent = parent.parent) {`
`4398`		`- if (isExpression(parent) && isContextSensitiveExpression(<Expression>parent)) {`
	`4398`	`+ if ((isExpression(parent) \|\| isObjectLiteralMethod(node)) &&`
	`4399`	`+ isContextSensitive(<Expression>parent)) {`
`4399`	`4400`	`containerNodes.unshift(parent);`
`4400`	`4401`	`}`
`4401`	`4402`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ class TypeWriterWalker {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`private getTypeOfNode(node: ts.Node): ts.Type {`
`97`		`- var type = this.checker.getTypeOfLocation(node);`
	`97`	`+ var type = this.checker.getTypeAtLocation(node);`
`98`	`98`	`ts.Debug.assert(type !== undefined, "type doesn't exist");`
`99`	`99`	`return type;`
`100`	`100`	`}`