Merge pull request microsoft#330 from Microsoft/pullContextualTypes

Pull model for contextual types

Author: ahejlsberg

src/compiler/binder.ts

@@ -252,7 +252,7 @@ module ts {
 
         function bindCatchVariableDeclaration(node: CatchBlock) {
             var symbol = createSymbol(SymbolFlags.Variable, node.variable.text || "__missing");
-            addDeclarationToSymbol(symbol, node.variable, SymbolFlags.Variable);
+            addDeclarationToSymbol(symbol, node, SymbolFlags.Variable);
             var saveParent = parent;
             parent = node;
             forEachChild(node, bind);

src/compiler/checker.ts

@@ -320,7 +320,9 @@ module ts {
         text: string;
     }
 
-    export interface Expression extends Node { }
+    export interface Expression extends Node {
+        contextualType?: Type;  // Used to temporarily assign a contextual type during overload resolution
+    }
 
     export interface UnaryExpression extends Expression {
         operator: SyntaxKind;
@@ -736,17 +738,18 @@ module ts {
     }
 
     export enum NodeCheckFlags {
-        TypeChecked   = 0x00000001,  // Node has been type checked
-        LexicalThis   = 0x00000002,  // Lexical 'this' reference
-        CaptureThis   = 0x00000004,  // Lexical 'this' used in body
-        EmitExtends   = 0x00000008,  // Emit __extends
-        SuperInstance = 0x00000010,  // Instance 'super' reference
-        SuperStatic   = 0x00000020,  // Static 'super' reference
+        TypeChecked    = 0x00000001,  // Node has been type checked
+        LexicalThis    = 0x00000002,  // Lexical 'this' reference
+        CaptureThis    = 0x00000004,  // Lexical 'this' used in body
+        EmitExtends    = 0x00000008,  // Emit __extends
+        SuperInstance  = 0x00000010,  // Instance 'super' reference
+        SuperStatic    = 0x00000020,  // Static 'super' reference
+        ContextChecked = 0x00000040,  // Contextual types have been assigned
     }
 
     export interface NodeLinks {
         resolvedType?: Type;            // Cached type of type node
-        resolvedSignature?: Signature;  // Cached signature of signature node
+        resolvedSignature?: Signature;  // Cached signature of signature node or call expression
         resolvedSymbol?: Symbol;        // Cached name resolution result
         flags?: NodeCheckFlags;         // Set of flags specific to Node
         enumMemberValue?: number;       // Constant value of enum member

src/compiler/types.ts

@@ -1,4 +1,4 @@
-==== tests/cases/conformance/functions/functionImplementationErrors.ts (7 errors) ====
+==== tests/cases/conformance/functions/functionImplementationErrors.ts (8 errors) ====
     // FunctionExpression with no return type annotation with multiple return statements with unrelated types
     var f1 = function () {
              ~~~~~~~~~~~~~
@@ -68,6 +68,8 @@
     // FunctionExpression with non -void return type annotation with a throw, no return, and other code
     // Should be error but isn't
     undefined === function (): number {
+                               ~~~~~~
+!!! A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
         throw undefined;
         var x = 4;
     };

tests/baselines/reference/functionImplementationErrors.errors.txt

@@ -1,4 +1,4 @@
-==== tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts (9 errors) ====
+==== tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts (8 errors) ====
     // these should be errors
     class GetAndSet {
         getAndSet = null;             // error at "getAndSet"
@@ -14,8 +14,6 @@
         public set haveGetAndSet(value) {  // error at "value"
                    ~~~~~~~~~~~~~
 !!! Accessors are only available when targeting ECMAScript 5 and higher.
-                                 ~~~~~
-!!! Parameter 'value' implicitly has an 'any' type.
             this.getAndSet = value;
         }
     }

tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.errors.txt

@@ -1,8 +1,10 @@
-==== tests/cases/conformance/parser/ecmascript5/Generics/parserCastVersusArrowFunction1.ts (7 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Generics/parserCastVersusArrowFunction1.ts (13 errors) ====
     var v = <T>() => 1;
     var v = <T>a;
              ~
 !!! Cannot find name 'T'.
+               ~
+!!! Cannot find name 'a'.
 
     var v = <T>(a) => 1;
         ~
@@ -17,9 +19,19 @@
     var v = <T>(a);
              ~
 !!! Cannot find name 'T'.
+                ~
+!!! Cannot find name 'a'.
     var v = <T>(a, b);
              ~
 !!! Cannot find name 'T'.
+                ~
+!!! Cannot find name 'a'.
+                   ~
+!!! Cannot find name 'b'.
     var v = <T>(a = 1, b = 2);
              ~
-!!! Cannot find name 'T'.
+!!! Cannot find name 'T'.
+                ~
+!!! Cannot find name 'a'.
+                       ~
+!!! Cannot find name 'b'.

tests/baselines/reference/parserCastVersusArrowFunction1.errors.txt

@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/parserRealSource8.ts (133 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/parserRealSource8.ts (134 errors) ====
     // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. 
     // See LICENSE.txt in the project root for complete license information.
 
@@ -383,6 +383,8 @@
                         outerFnc.type.members = (<SymbolScopeBuilder>(<TypeSymbol>container).type.memberScope).valueMembers;
                                                   ~~~~~~~~~~~~~~~~~~
 !!! Cannot find name 'SymbolScopeBuilder'.
+                                                                       ~~~~~~~~~~
+!!! Cannot find name 'TypeSymbol'.
                     }
                     funcScope = context.scopeChain.fnc.type.memberScope;
                     outerFnc.innerStaticFuncs[outerFnc.innerStaticFuncs.length] = funcDecl;

tests/baselines/reference/parserRealSource8.errors.txt

@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration3.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration3.ts (4 errors) ====
     function runTests() {
         var outfile = new Harness.Compiler.WriterAggregator()
                           ~~~~~~~
@@ -8,6 +8,8 @@
 !!! Cannot find name 'Harness'.
           , compiler = <TypeScript.TypeScriptCompiler>new TypeScript.TypeScriptCompiler(outerr)
                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'TypeScript'.
+                                                          ~~~~~~~~~~
 !!! Cannot find name 'TypeScript'.
           , code;
     }