Merge branch 'master' into transitiveExports

Author: DanielRosenwasser

src/compiler/checker.ts

@@ -3865,6 +3865,7 @@ module ts {
             let expandingFlags: number;
             let depth = 0;
             let overflow = false;
+            let elaborateErrors = false;
 
             Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
 
@@ -3879,7 +3880,8 @@ module ts {
                 // where errors were being reported.
                 if (errorInfo.next === undefined) {
                     errorInfo = undefined;
-                    isRelatedTo(source, target, errorNode !== undefined, headMessage, /* elaborateErrors */ true);
+                    elaborateErrors = true;
+                    isRelatedTo(source, target, errorNode !== undefined, headMessage);
                 }
                 if (containingMessageChain) {
                     errorInfo = concatenateDiagnosticMessageChains(containingMessageChain, errorInfo);
@@ -3897,7 +3899,7 @@ module ts {
             // Ternary.True if they are related with no assumptions,
             // Ternary.Maybe if they are related with assumptions of other relationships, or
             // Ternary.False if they are not related.
-            function isRelatedTo(source: Type, target: Type, reportErrors?: boolean, headMessage?: DiagnosticMessage, elaborateErrors = false): Ternary {
+            function isRelatedTo(source: Type, target: Type, reportErrors?: boolean, headMessage?: DiagnosticMessage): Ternary {
                 let result: Ternary;
                 // both types are the same - covers 'they are the same primitive type or both are Any' or the same type parameter cases
                 if (source === target) return Ternary.True;
@@ -3964,7 +3966,7 @@ module ts {
                     // identity relation does not use apparent type
                     let sourceOrApparentType = relation === identityRelation ? source : getApparentType(source);
                     if (sourceOrApparentType.flags & TypeFlags.ObjectType && target.flags & TypeFlags.ObjectType &&
-                        (result = objectTypeRelatedTo(sourceOrApparentType, <ObjectType>target, reportStructuralErrors, elaborateErrors))) {
+                        (result = objectTypeRelatedTo(sourceOrApparentType, <ObjectType>target, reportStructuralErrors))) {
                         errorInfo = saveErrorInfo;
                         return result;
                     }
@@ -4061,7 +4063,7 @@ module ts {
             // Third, check if both types are part of deeply nested chains of generic type instantiations and if so assume the types are
             // equal and infinitely expanding. Fourth, if we have reached a depth of 100 nested comparisons, assume we have runaway recursion
             // and issue an error. Otherwise, actually compare the structure of the two types.
-            function objectTypeRelatedTo(source: ObjectType, target: ObjectType, reportErrors: boolean, elaborateErrors = false): Ternary {
+            function objectTypeRelatedTo(source: ObjectType, target: ObjectType, reportErrors: boolean): Ternary {
                 if (overflow) {
                     return Ternary.False;
                 }

src/server/editorServices.ts

@@ -1,5 +1,7 @@
 /// <reference path="..\compiler\commandLineParser.ts" />
 /// <reference path="..\services\services.ts" />
+/// <reference path="protocol.d.ts" />
+/// <reference path="session.ts" />
 /// <reference path="node.d.ts" />
 
 module ts.server {
@@ -16,6 +18,16 @@ module ts.server {
 
     var lineCollectionCapacity = 4;
 
+    function mergeFormatOptions(formatCodeOptions: FormatCodeOptions, formatOptions: protocol.FormatOptions): void {
+        var hasOwnProperty = Object.prototype.hasOwnProperty;
+        Object.keys(formatOptions).forEach((key) => {
+            var codeKey = key.charAt(0).toUpperCase() + key.substring(1);
+            if (hasOwnProperty.call(formatCodeOptions, codeKey)) {
+                formatCodeOptions[codeKey] = formatOptions[key];
+            }
+        });
+    }
+
     class ScriptInfo {
         svc: ScriptVersionCache;
         children: ScriptInfo[] = [];     // files referenced by this file
@@ -27,12 +39,9 @@ module ts.server {
             this.svc = ScriptVersionCache.fromString(content);
         }
 
-        setFormatOptions(tabSize?: number, indentSize?: number) {
-            if (tabSize) {
-                this.formatCodeOptions.TabSize = tabSize;
-            }
-            if (indentSize) {
-                this.formatCodeOptions.IndentSize = indentSize;
+        setFormatOptions(formatOptions: protocol.FormatOptions): void {
+            if (formatOptions) {
+                mergeFormatOptions(this.formatCodeOptions, formatOptions);
             }
         }
 
@@ -448,15 +457,19 @@ module ts.server {
             if (args.file) {
                 var info = this.filenameToScriptInfo[args.file];
                 if (info) {
-                    info.setFormatOptions(args.tabSize, args.indentSize);
-                    this.log("Host configuration update for file " + args.file + " tab size " + args.tabSize);
+                    info.setFormatOptions(args.formatOptions);  
+                    this.log("Host configuration update for file " + args.file);
                 }
             }
             else {
-                this.hostConfiguration.formatCodeOptions.TabSize = args.tabSize;
-                this.hostConfiguration.formatCodeOptions.IndentSize = args.indentSize;
-                this.hostConfiguration.hostInfo = args.hostInfo;
-                this.log("Host information " + args.hostInfo, "Info");
+                if (args.hostInfo !== undefined) {
+                    this.hostConfiguration.hostInfo = args.hostInfo;
+                    this.log("Host information " + args.hostInfo, "Info");                    
+                }
+                if (args.formatOptions) {
+                    mergeFormatOptions(this.hostConfiguration.formatCodeOptions, args.formatOptions);                    
+                    this.log("Format host information updated", "Info");
+                }
             }
         }
 

src/server/protocol.d.ts

@@ -299,23 +299,77 @@ declare module ts.server.protocol {
         body?: RenameResponseBody;
     }
 
+    /**
+     * Editor options
+     */
+    export interface EditorOptions {
+      
+        /** Number of spaces for each tab. Default value is 4. */
+        tabSize?: number;
+        
+        /** Number of spaces to indent during formatting. Default value is 4. */
+        indentSize?: number;
+        
+        /** The new line character to be used. Default value is the OS line delimiter. */
+        newLineCharacter?: string;
+        
+        /** Whether tabs should be converted to spaces. Default value is true. */
+        convertTabsToSpaces?: boolean;        
+    }
+        
+    /**
+     * Format options
+     */
+    export interface FormatOptions extends EditorOptions {
+      
+        /** Defines space handling after a comma delimiter. Default value is true. */
+        insertSpaceAfterCommaDelimiter?: boolean;
+        
+        /** Defines space handling after a semicolon in a for statemen. Default value is true */
+        insertSpaceAfterSemicolonInForStatements?: boolean;
+        
+        /** Defines space handling after a binary operator. Default value is true. */
+        insertSpaceBeforeAndAfterBinaryOperators?: boolean;
+        
+        /** Defines space handling after keywords in control flow statement. Default value is true. */
+        insertSpaceAfterKeywordsInControlFlowStatements?: boolean;
+        
+        /** Defines space handling after function keyword for anonymous functions. Default value is false. */
+        insertSpaceAfterFunctionKeywordForAnonymousFunctions?: boolean;
+        
+        /** Defines space handling after opening and before closing non empty parenthesis. Default value is false. */
+        insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
+        
+        /** Defines whether an open brace is put onto a new line for functions or not. Default value is false. */
+        placeOpenBraceOnNewLineForFunctions?: boolean;
+        
+        /** Defines whether an open brace is put onto a new line for control blocks or not. Default value is false. */
+        placeOpenBraceOnNewLineForControlBlocks?: boolean;
+        
+        /** Index operator */
+        [key:string] : string | number | boolean;
+    }
+  
     /**
       * Information found in a configure request.
       */
     export interface ConfigureRequestArguments {
-        /** Number of spaces for each tab */
-        tabSize: number;
-        /** Number of spaces to indent during formatting */
-        indentSize: number;
+      
         /** 
           * Information about the host, for example 'Emacs 24.4' or
           * 'Sublime Text version 3075'
           */
-        hostInfo: string;
+        hostInfo?: string;
+        
         /**
           * If present, tab settings apply only to this file.
           */
         file?: string;
+        
+        /**
+         * The format options to use during formatting and other code editing features.
+         */
+        formatOptions?: FormatOptions;        
     }
 
     /**
@@ -337,10 +391,6 @@ declare module ts.server.protocol {
       *  Information found in an "open" request.
       */
     export interface OpenRequestArgs extends FileRequestArgs {
-        /** Initial tab size of file. */
-        tabSize?: number;
-        /** Number of spaces to indent during formatting */
-        indentSize?: number;
     }
 
     /**

src/server/session.ts

@@ -398,12 +398,9 @@ module ts.server {
             };
         }
 
-        openClientFile(fileName: string, tabSize?: number, indentSize?: number) {
+        openClientFile(fileName: string) {
             var file = ts.normalizePath(fileName);
-            var info = this.projectService.openClientFile(file);
-            if (info) {
-                info.setFormatOptions(tabSize, indentSize);
-            }
+            this.projectService.openClientFile(file);
         }
 
         getQuickInfo(line: number, offset: number, fileName: string): protocol.QuickInfoResponseBody {
@@ -789,7 +786,7 @@ module ts.server {
                     }
                     case CommandNames.Open: {
                         var openArgs = <protocol.OpenRequestArgs>request.arguments;
-                        this.openClientFile(openArgs.file,openArgs.tabSize, openArgs.indentSize);
+                        this.openClientFile(openArgs.file);
                         responseRequired = false;
                         break;
                     }

tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.errors.txt

@@ -1,5 +1,6 @@
 tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts(19,59): error TS2345: Argument of type '(c: C) => B' is not assignable to parameter of type '(x: C) => C'.
   Type 'B' is not assignable to type 'C'.
+    Property 'z' is missing in type 'B'.
 
 
 ==== tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts (1 errors) ====
@@ -24,4 +25,5 @@ tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParamete
     (new Chain(new A)).then(a => new B).then(b => new C).then(c => new B).then(b => new A);
                                                               ~~~~~~~~~~
 !!! error TS2345: Argument of type '(c: C) => B' is not assignable to parameter of type '(x: C) => C'.
-!!! error TS2345:   Type 'B' is not assignable to type 'C'.
+!!! error TS2345:   Type 'B' is not assignable to type 'C'.
+!!! error TS2345:     Property 'z' is missing in type 'B'.

tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.errors.txt

@@ -1,5 +1,6 @@
 tests/cases/compiler/contextualTypingOfGenericFunctionTypedArguments1.ts(16,32): error TS2345: Argument of type '(x: number) => string' is not assignable to parameter of type '(x: number) => Date'.
   Type 'string' is not assignable to type 'Date'.
+    Property 'toDateString' is missing in type 'String'.
 tests/cases/compiler/contextualTypingOfGenericFunctionTypedArguments1.ts(17,32): error TS2345: Argument of type '(x: number) => string' is not assignable to parameter of type '(x: number) => Date'.
   Type 'string' is not assignable to type 'Date'.
 
@@ -24,6 +25,7 @@ tests/cases/compiler/contextualTypingOfGenericFunctionTypedArguments1.ts(17,32):
                                    ~
 !!! error TS2345: Argument of type '(x: number) => string' is not assignable to parameter of type '(x: number) => Date'.
 !!! error TS2345:   Type 'string' is not assignable to type 'Date'.
+!!! error TS2345:     Property 'toDateString' is missing in type 'String'.
     var r6 = _.forEach<number>(c2, (x) => { return x.toFixed() }); 
                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number) => string' is not assignable to parameter of type '(x: number) => Date'.

tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt

@@ -5,6 +5,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGen
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(25,23): error TS2345: Argument of type '(a: T) => T' is not assignable to parameter of type '(x: Date) => Date'.
   Types of parameters 'a' and 'x' are incompatible.
     Type 'T' is not assignable to type 'Date'.
+      Property 'toDateString' is missing in type 'RegExp'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(37,36): error TS2345: Argument of type '(x: E) => F' is not assignable to parameter of type '(x: E) => E'.
   Type 'F' is not assignable to type 'E'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(50,21): error TS2345: Argument of type 'Date' is not assignable to parameter of type 'T'.
@@ -53,6 +54,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGen
 !!! error TS2345: Argument of type '(a: T) => T' is not assignable to parameter of type '(x: Date) => Date'.
 !!! error TS2345:   Types of parameters 'a' and 'x' are incompatible.
 !!! error TS2345:     Type 'T' is not assignable to type 'Date'.
+!!! error TS2345:       Property 'toDateString' is missing in type 'RegExp'.
             var r7b = foo2((a) => a, (b) => b); // valid, T is inferred to be Date
         }
 

tests/baselines/reference/genericCombinators2.errors.txt

@@ -1,5 +1,6 @@
 tests/cases/compiler/genericCombinators2.ts(15,43): error TS2345: Argument of type '(x: number, y: string) => string' is not assignable to parameter of type '(x: number, y: string) => Date'.
   Type 'string' is not assignable to type 'Date'.
+    Property 'toDateString' is missing in type 'String'.
 tests/cases/compiler/genericCombinators2.ts(16,43): error TS2345: Argument of type '(x: number, y: string) => string' is not assignable to parameter of type '(x: number, y: string) => Date'.
   Type 'string' is not assignable to type 'Date'.
 
@@ -23,6 +24,7 @@ tests/cases/compiler/genericCombinators2.ts(16,43): error TS2345: Argument of ty
                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y: string) => string' is not assignable to parameter of type '(x: number, y: string) => Date'.
 !!! error TS2345:   Type 'string' is not assignable to type 'Date'.
+!!! error TS2345:     Property 'toDateString' is missing in type 'String'.
     var r5b = _.map<number, string, Date>(c2, rf1);
                                               ~~~
 !!! error TS2345: Argument of type '(x: number, y: string) => string' is not assignable to parameter of type '(x: number, y: string) => Date'.

tests/baselines/reference/incompatibleTypes.errors.txt

@@ -17,6 +17,7 @@ tests/cases/compiler/incompatibleTypes.ts(33,7): error TS2420: Class 'C4' incorr
 tests/cases/compiler/incompatibleTypes.ts(42,5): error TS2345: Argument of type 'C1' is not assignable to parameter of type 'IFoo2'.
   Types of property 'p1' are incompatible.
     Type '() => string' is not assignable to type '(s: string) => number'.
+      Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/incompatibleTypes.ts(49,5): error TS2345: Argument of type '{ e: number; f: number; }' is not assignable to parameter of type '{ c: { b: string; }; d: string; }'.
   Property 'c' is missing in type '{ e: number; f: number; }'.
 tests/cases/compiler/incompatibleTypes.ts(66,5): error TS2322: Type '{ e: number; f: number; }' is not assignable to type '{ a: { a: string; }; b: string; }'.
@@ -92,6 +93,7 @@ tests/cases/compiler/incompatibleTypes.ts(74,5): error TS2322: Type '(a: any) =>
 !!! error TS2345: Argument of type 'C1' is not assignable to parameter of type 'IFoo2'.
 !!! error TS2345:   Types of property 'p1' are incompatible.
 !!! error TS2345:     Type '() => string' is not assignable to type '(s: string) => number'.
+!!! error TS2345:       Type 'string' is not assignable to type 'number'.
 
 
     function of1(n: { a: { a: string; }; b: string; }): number;

tests/baselines/reference/interfaceAssignmentCompat.errors.txt

@@ -1,6 +1,7 @@
 tests/cases/compiler/interfaceAssignmentCompat.ts(32,18): error TS2345: Argument of type '(a: IFrenchEye, b: IFrenchEye) => number' is not assignable to parameter of type '(a: IEye, b: IEye) => number'.
   Types of parameters 'a' and 'a' are incompatible.
     Type 'IFrenchEye' is not assignable to type 'IEye'.
+      Property 'color' is missing in type 'IFrenchEye'.
 tests/cases/compiler/interfaceAssignmentCompat.ts(37,29): error TS2339: Property '_map' does not exist on type 'typeof Color'.
 tests/cases/compiler/interfaceAssignmentCompat.ts(42,13): error TS2322: Type 'IEye' is not assignable to type 'IFrenchEye'.
   Property 'coleur' is missing in type 'IEye'.
@@ -45,6 +46,7 @@ tests/cases/compiler/interfaceAssignmentCompat.ts(44,9): error TS2322: Type 'IEy
 !!! error TS2345: Argument of type '(a: IFrenchEye, b: IFrenchEye) => number' is not assignable to parameter of type '(a: IEye, b: IEye) => number'.
 !!! error TS2345:   Types of parameters 'a' and 'a' are incompatible.
 !!! error TS2345:     Type 'IFrenchEye' is not assignable to type 'IEye'.
+!!! error TS2345:       Property 'color' is missing in type 'IFrenchEye'.
             // type of z inferred from specialized array type
             var z=x.sort(CompareEyes); // ok