maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix the merge conflicts

Browse source
This commit is contained in:
Sheetal Nandi 2014-12-04 13:38:00 -08:00
parent f99bc15783
commit a4ab192b6f
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/compiler/checker.ts
View file

@ -4395,7 +4395,8 @@ module ts {
// That helps in making sure not assigning types as any when resolved out of order // That helps in making sure not assigning types as any when resolved out of order
var containerNodes: Node[] = []; var containerNodes: Node[] = [];
for (var parent = node.parent; parent; parent = parent.parent) { 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); containerNodes.unshift(parent);
} }
} }

2
src/harness/typeWriter.ts
View file

@ -94,7 +94,7 @@ class TypeWriterWalker {
} }
private getTypeOfNode(node: ts.Node): ts.Type { 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"); ts.Debug.assert(type !== undefined, "type doesn't exist");
return type; return type;
} }

2
tests/baselines/reference/callExpressionWithMissingTypeArgument1.errors.txt
View file

@ -4,7 +4,7 @@ tests/cases/compiler/callExpressionWithMissingTypeArgument1.ts(1,1): error TS230
==== tests/cases/compiler/callExpressionWithMissingTypeArgument1.ts (2 errors) ==== ==== tests/cases/compiler/callExpressionWithMissingTypeArgument1.ts (2 errors) ====
Foo<a,,b>(); Foo<a,,b>();
~
!!! error TS1110: Type expected. !!! error TS1110: Type expected.
~~~ ~~~
!!! error TS2304: Cannot find name 'Foo'. !!! error TS2304: Cannot find name 'Foo'.