Merge branch 'goto_definition_super', remote-tracking branch 'origin' into constructor_references

src/compiler/checker.ts

@@ -3346,7 +3346,13 @@ namespace ts {
                         // Otherwise, fall back to 'any'.
                         else {
                             if (compilerOptions.noImplicitAny) {
-                                error(setter, Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation, symbolToString(symbol));
+                                if (setter) {
+                                    error(setter, Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation, symbolToString(symbol));
+                                }
+                                else {
+                                    Debug.assert(!!getter, "there must existed getter as we are current checking either setter or getter in this function");
+                                    error(getter, Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation, symbolToString(symbol));
+                                }
                             }
                             type = anyType;
                         }
@@ -11960,18 +11966,12 @@ namespace ts {
             // Function interface, since they have none by default. This is a bit of a leap of faith
             // that the user will not add any.
             const callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
-
             const constructSignatures = getSignaturesOfType(apparentType, SignatureKind.Construct);
-            // TS 1.0 spec: 4.12
-            // If FuncExpr is of type Any, or of an object type that has no call or construct signatures
-            // but is a subtype of the Function interface, the call is an untyped function call. In an
-            // untyped function call no TypeArgs are permitted, Args can be any argument list, no contextual
+
+            // TS 1.0 Spec: 4.12
+            // In an untyped function call no TypeArgs are permitted, Args can be any argument list, no contextual
             // types are provided for the argument expressions, and the result is always of type Any.
-            // We exclude union types because we may have a union of function types that happen to have
-            // no common signatures.
-            if (isTypeAny(funcType) ||
-                (isTypeAny(apparentType) && funcType.flags & TypeFlags.TypeParameter) ||
-                (!callSignatures.length && !constructSignatures.length && !(funcType.flags & TypeFlags.Union) && isTypeAssignableTo(funcType, globalFunctionType))) {
+            if (isUntypedFunctionCall(funcType, apparentType, callSignatures.length, constructSignatures.length)) {
                 // The unknownType indicates that an error already occurred (and was reported).  No
                 // need to report another error in this case.
                 if (funcType !== unknownType && node.typeArguments) {
@@ -11994,6 +11994,29 @@ namespace ts {
             return resolveCall(node, callSignatures, candidatesOutArray);
         }
 
+        /**
+         * TS 1.0 spec: 4.12
+         * If FuncExpr is of type Any, or of an object type that has no call or construct signatures
+         * but is a subtype of the Function interface, the call is an untyped function call.
+         */
+        function isUntypedFunctionCall(funcType: Type, apparentFuncType: Type, numCallSignatures: number, numConstructSignatures: number) {
+            if (isTypeAny(funcType)) {
+                return true;
+            }
+            if (isTypeAny(apparentFuncType) && funcType.flags & TypeFlags.TypeParameter) {
+                return true;
+            }
+            if (!numCallSignatures && !numConstructSignatures) {
+                // We exclude union types because we may have a union of function types that happen to have
+                // no common signatures.
+                if (funcType.flags & TypeFlags.Union) {
+                    return false;
+                }
+                return isTypeAssignableTo(funcType, globalFunctionType);
+            }
+            return false;
+        }
+
         function resolveNewExpression(node: NewExpression, candidatesOutArray: Signature[]): Signature {
             if (node.arguments && languageVersion < ScriptTarget.ES5) {
                 const spreadIndex = getSpreadArgumentIndex(node.arguments);
@@ -12119,8 +12142,9 @@ namespace ts {
             }
 
             const callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
+            const constructSignatures = getSignaturesOfType(apparentType, SignatureKind.Construct);
 
-            if (isTypeAny(tagType) || (!callSignatures.length && !(tagType.flags & TypeFlags.Union) && isTypeAssignableTo(tagType, globalFunctionType))) {
+            if (isUntypedFunctionCall(tagType, apparentType, callSignatures.length, constructSignatures.length)) {
                 return resolveUntypedCall(node);
             }
 
@@ -12165,7 +12189,8 @@ namespace ts {
             }
 
             const callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
-            if (funcType === anyType || (!callSignatures.length && !(funcType.flags & TypeFlags.Union) && isTypeAssignableTo(funcType, globalFunctionType))) {
+            const constructSignatures = getSignaturesOfType(apparentType, SignatureKind.Construct);
+            if (isUntypedFunctionCall(funcType, apparentType, callSignatures.length, constructSignatures.length)) {
                 return resolveUntypedCall(node);
             }
 
@@ -18763,7 +18788,13 @@ namespace ts {
                     (augmentations || (augmentations = [])).push(file.moduleAugmentations);
                 }
                 if (file.symbol && file.symbol.globalExports) {
-                    mergeSymbolTable(globals, file.symbol.globalExports);
+                    // Merge in UMD exports with first-in-wins semantics (see #9771)
+                    const source = file.symbol.globalExports;
+                    for (const id in source) {
+                        if (!(id in globals)) {
+                            globals[id] = source[id];
+                        }
+                    }
                 }
             });
 

src/compiler/diagnosticMessages.json

@@ -2871,11 +2871,7 @@
     "Element implicitly has an 'any' type because index expression is not of type 'number'.": {
         "category": "Error",
         "code": 7015
-    },
-    "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation.": {
-        "category": "Error",
-        "code": 7016
-    },
+    }, 
     "Index signature of object type implicitly has an 'any' type.": {
         "category": "Error",
         "code": 7017
@@ -2932,6 +2928,14 @@
         "category": "Error",
         "code": 7031
     },
+    "Property '{0}' implicitly has type 'any', because its set accessor lacks a parameter type annotation.": {
+        "category": "Error",
+        "code": 7032
+    },
+    "Property '{0}' implicitly has type 'any', because its get accessor lacks a return type annotation.": {
+        "category": "Error",
+        "code": 7033
+    },
     "You cannot rename this element.": {
         "category": "Error",
         "code": 8000

src/compiler/emitter.ts

@@ -6587,7 +6587,7 @@ const _super = (function (geti, seti) {
                             // import { x, y } from "foo"
                             // import d, * as x from "foo"
                             // import d, { x, y } from "foo"
-                            const isNakedImport = SyntaxKind.ImportDeclaration && !(<ImportDeclaration>node).importClause;
+                            const isNakedImport = node.kind === SyntaxKind.ImportDeclaration && !(<ImportDeclaration>node).importClause;
                             if (!isNakedImport) {
                                 write(varOrConst);
                                 write(getGeneratedNameForNode(<ImportDeclaration>node));

src/compiler/parser.ts

@@ -2339,6 +2339,7 @@ namespace ts {
                     token() === SyntaxKind.LessThanToken ||
                     token() === SyntaxKind.QuestionToken ||
                     token() === SyntaxKind.ColonToken ||
+                    token() === SyntaxKind.CommaToken ||
                     canParseSemicolon();
             }
             return false;

src/compiler/utilities.ts

@@ -1035,6 +1035,18 @@ namespace ts {
         return undefined;
     }
 
+    export function isCallLikeExpression(node: Node): node is CallLikeExpression {
+        switch (node.kind) {
+            case SyntaxKind.CallExpression:
+            case SyntaxKind.NewExpression:
+            case SyntaxKind.TaggedTemplateExpression:
+            case SyntaxKind.Decorator:
+                return true;
+            default:
+                return false;
+        }
+    }
+
     export function getInvokedExpression(node: CallLikeExpression): Expression {
         if (node.kind === SyntaxKind.TaggedTemplateExpression) {
             return (<TaggedTemplateExpression>node).tag;

src/harness/fourslash.ts

@@ -206,6 +206,24 @@ namespace FourSlash {
 
         private inputFiles = ts.createMap<string>();  // Map between inputFile's fileName and its content for easily looking up when resolving references
 
+        private static getDisplayPartsJson(displayParts: ts.SymbolDisplayPart[]) {
+            let result = "";
+            ts.forEach(displayParts, part => {
+                if (result) {
+                    result += ",\n    ";
+                }
+                else {
+                    result = "[\n    ";
+                }
+                result += JSON.stringify(part);
+            });
+            if (result) {
+                result += "\n]";
+            }
+
+            return result;
+        }
+
         // Add input file which has matched file name with the given reference-file path.
         // This is necessary when resolveReference flag is specified
         private addMatchedInputFile(referenceFilePath: string, extensions: string[]) {
@@ -777,6 +795,20 @@ namespace FourSlash {
             ts.forEachProperty(this.rangesByText(), ranges => this.verifyRangesReferenceEachOther(ranges));
         }
 
+        public verifyDisplayPartsOfReferencedSymbol(expected: ts.SymbolDisplayPart[]) {
+            const referencedSymbols = this.findReferencesAtCaret();
+
+            if (referencedSymbols.length === 0) {
+                this.raiseError("No referenced symbols found at current caret position");
+            }
+            else if (referencedSymbols.length > 1) {
+                this.raiseError("More than one referenced symbol found");
+            }
+
+            assert.equal(TestState.getDisplayPartsJson(referencedSymbols[0].definition.displayParts),
+                TestState.getDisplayPartsJson(expected), this.messageAtLastKnownMarker("referenced symbol definition display parts"));
+        }
+
         private verifyReferencesWorker(references: ts.ReferenceEntry[], fileName: string, start: number, end: number, isWriteAccess?: boolean, isDefinition?: boolean) {
             for (let i = 0; i < references.length; i++) {
                 const reference = references[i];
@@ -811,6 +843,10 @@ namespace FourSlash {
             return this.languageService.getReferencesAtPosition(this.activeFile.fileName, this.currentCaretPosition);
         }
 
+        private findReferencesAtCaret() {
+            return this.languageService.findReferences(this.activeFile.fileName, this.currentCaretPosition);
+        }
+
         public getSyntacticDiagnostics(expected: string) {
             const diagnostics = this.languageService.getSyntacticDiagnostics(this.activeFile.fileName);
             this.testDiagnostics(expected, diagnostics);
@@ -856,30 +892,12 @@ namespace FourSlash {
             displayParts: ts.SymbolDisplayPart[],
             documentation: ts.SymbolDisplayPart[]) {
 
-            function getDisplayPartsJson(displayParts: ts.SymbolDisplayPart[]) {
-                let result = "";
-                ts.forEach(displayParts, part => {
-                    if (result) {
-                        result += ",\n    ";
-                    }
-                    else {
-                        result = "[\n    ";
-                    }
-                    result += JSON.stringify(part);
-                });
-                if (result) {
-                    result += "\n]";
-                }
-
-                return result;
-            }
-
             const actualQuickInfo = this.languageService.getQuickInfoAtPosition(this.activeFile.fileName, this.currentCaretPosition);
             assert.equal(actualQuickInfo.kind, kind, this.messageAtLastKnownMarker("QuickInfo kind"));
             assert.equal(actualQuickInfo.kindModifiers, kindModifiers, this.messageAtLastKnownMarker("QuickInfo kindModifiers"));
             assert.equal(JSON.stringify(actualQuickInfo.textSpan), JSON.stringify(textSpan), this.messageAtLastKnownMarker("QuickInfo textSpan"));
-            assert.equal(getDisplayPartsJson(actualQuickInfo.displayParts), getDisplayPartsJson(displayParts), this.messageAtLastKnownMarker("QuickInfo displayParts"));
-            assert.equal(getDisplayPartsJson(actualQuickInfo.documentation), getDisplayPartsJson(documentation), this.messageAtLastKnownMarker("QuickInfo documentation"));
+            assert.equal(TestState.getDisplayPartsJson(actualQuickInfo.displayParts), TestState.getDisplayPartsJson(displayParts), this.messageAtLastKnownMarker("QuickInfo displayParts"));
+            assert.equal(TestState.getDisplayPartsJson(actualQuickInfo.documentation), TestState.getDisplayPartsJson(documentation), this.messageAtLastKnownMarker("QuickInfo documentation"));
         }
 
         public verifyRenameLocations(findInStrings: boolean, findInComments: boolean, ranges?: Range[]) {
@@ -1546,7 +1564,7 @@ namespace FourSlash {
         public goToDefinition(definitionIndex: number) {
             const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
             if (!definitions || !definitions.length) {
-                this.raiseError("goToDefinition failed - expected to at least one definition location but got 0");
+                this.raiseError("goToDefinition failed - expected to find at least one definition location but got 0");
             }
 
             if (definitionIndex >= definitions.length) {
@@ -1561,7 +1579,7 @@ namespace FourSlash {
         public goToTypeDefinition(definitionIndex: number) {
             const definitions = this.languageService.getTypeDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
             if (!definitions || !definitions.length) {
-                this.raiseError("goToTypeDefinition failed - expected to at least one definition location but got 0");
+                this.raiseError("goToTypeDefinition failed - expected to find at least one definition location but got 0");
             }
 
             if (definitionIndex >= definitions.length) {
@@ -1582,7 +1600,7 @@ namespace FourSlash {
                 this.raiseError(`goToDefinition - expected to 0 definition locations but got ${definitions.length}`);
             }
             else if (!foundDefinitions && !negative) {
-                this.raiseError("goToDefinition - expected to at least one definition location but got 0");
+                this.raiseError("goToDefinition - expected to find at least one definition location but got 0");
             }
         }
 
@@ -2947,6 +2965,10 @@ namespace FourSlashInterface {
             this.state.verifyRangesReferenceEachOther(ranges);
         }
 
+        public findReferencesDefinitionDisplayPartsAtCaretAre(expected: ts.SymbolDisplayPart[]) {
+            this.state.verifyDisplayPartsOfReferencedSymbol(expected);
+        }
+
         public rangesWithSameTextReferenceEachOther() {
             this.state.verifyRangesWithSameTextReferenceEachOther();
         }

src/harness/harness.ts

@@ -1370,23 +1370,31 @@ namespace Harness {
 
             // Produce baselines.  The first gives the types for all expressions.
             // The second gives symbols for all identifiers.
-            let e1: Error, e2: Error;
+            let typesError: Error, symbolsError: Error;
             try {
                 checkBaseLines(/*isSymbolBaseLine*/ false);
             }
             catch (e) {
-                e1 = e;
+                typesError = e;
             }
 
             try {
                 checkBaseLines(/*isSymbolBaseLine*/ true);
             }
             catch (e) {
-                e2 = e;
+                symbolsError = e;
             }
 
-            if (e1 || e2) {
-                throw e1 || e2;
+            if (typesError && symbolsError) {
+                throw new Error(typesError.message + ts.sys.newLine + symbolsError.message);
+            }
+
+            if (typesError) {
+                throw typesError;
+            }
+
+            if (symbolsError) {
+                throw symbolsError;
             }
 
             return;
@@ -1396,7 +1404,12 @@ namespace Harness {
 
                 const fullExtension = isSymbolBaseLine ? ".symbols" : ".types";
 
-                Harness.Baseline.runBaseline(baselinePath.replace(/\.tsx?/, fullExtension), () => fullBaseLine, opts);
+                // When calling this function from rwc-runner, the baselinePath will have no extension.
+                // As rwc test- file is stored in json which ".json" will get stripped off.
+                // When calling this function from compiler-runner, the baselinePath will then has either ".ts" or ".tsx" extension
+                const outputFileName = ts.endsWith(baselinePath, ".ts") || ts.endsWith(baselinePath, ".tsx") ?
+                    baselinePath.replace(/\.tsx?/, fullExtension) : baselinePath.concat(fullExtension);
+                Harness.Baseline.runBaseline(outputFileName, () => fullBaseLine, opts);
             }
 
             function generateBaseLine(typeWriterResults: ts.Map<TypeWriterResult[]>, isSymbolBaseline: boolean): string {

src/harness/rwcRunner.ts

@@ -223,7 +223,8 @@ namespace RWC {
             });
 
             it("has the expected types", () => {
-                Harness.Compiler.doTypeAndSymbolBaseline(`${baseName}.types`, compilerResult, inputFiles
+                // We don't need to pass the extension here because "doTypeAndSymbolBaseline" will append appropriate extension of ".types" or ".symbols"
+                Harness.Compiler.doTypeAndSymbolBaseline(baseName, compilerResult, inputFiles
                     .concat(otherFiles)
                     .filter(file => !!compilerResult.program.getSourceFile(file.unitName))
                     .filter(e => !Harness.isDefaultLibraryFile(e.unitName)), baselineOpts);

src/harness/unittests/services/formatting/testCode/testCode/formatting/classes.ts

@@ -1,79 +0,0 @@
-         class                    a                  {    
-                                                        constructor       (       n   :                 number    )             ;
-                                                        constructor       (       s   :                 string    )             ;
-                                                        constructor       (       ns   :                 any    )                            {    
-
-                                                        }
-
-                                                            public                 pgF       (           )                            {                  }   ;
-
-                                                            public                 pv   ;
-                                                            public                 get              d       (           )                            {    
-                                                                                                                return              30   ;
-                                                        }
-                                                            public                 set              d       (           )                            {    
-                                                        }
-
-                                                            public                 static                    get              p2       (           )                            {    
-                                                                                                                return                  {                  x   :                 30   ,                  y   :                 40              }   ;
-                                                        }
-
-                                                                         private                static                    d2       (           )                            {    
-                                                        }
-                                                                         private                static                    get              p3       (           )                            {    
-                                                                                                                return              "string"   ;
-                                                        }
-                                                                         private                pv3   ;
-
-                                                                         private                foo       (       n   :                 number    )             :                 string   ;
-                                                                         private                foo       (       s   :                 string    )             :                 string   ;
-                                                                         private                foo       (       ns   :                 any    )                            {    
-                                                                                                                return              ns.toString       (           )             ;
-                                                        }
-}
-
-         class                    b              extends              a                  {    
-}
-
-         class   m1b      { 
-
-}
-
-                                                interface   m1ib                               { 
-                                                        
-  }
-         class                    c              extends              m1b                  {    
-}
-
-         class                    ib2              implements              m1ib                  {    
-}
-
-    declare                            class                    aAmbient                  {    
-                                                        constructor                     (       n   :                 number    )             ;
-                                                        constructor                     (       s   :                 string    )             ;
-                                                            public                 pgF       (           )             :                 void   ;
-                                                            public                 pv   ;
-                                                            public                 d                 :                 number   ;
-                                                        static                    p2                 :                     {                  x   :                 number   ;              y   :                 number   ;              }   ;
-                                                        static                    d2       (           )             ;
-                                                        static                    p3   ;
-                                                                         private                pv3   ;
-                                                                         private                foo       (       s    )             ;
-}
-
-         class                    d                  {    
-                                                                         private                foo       (       n   :                 number    )             :                 string   ;
-                                                                         private                foo       (       ns   :                 any    )                            {    
-                                                                                                                return              ns.toString       (           )             ;
-                                                        }
-                                                                         private                foo       (       s   :                 string    )             :                 string   ;
-}
-
-         class                    e                  {    
-                                                                         private                foo       (       ns   :                 any    )                            {    
-                                                                                                                return              ns.toString       (           )             ;
-                                                        }
-                                                                         private                foo       (       s   :                 string    )             :                 string   ;
-                                                                         private                foo       (       n   :                 number    )             :                 string   ;
-}
-

src/harness/unittests/services/formatting/testCode/testCode/formatting/classesBaseline.ts

@@ -1,79 +0,0 @@
-class a {
-    constructor(n: number);
-    constructor(s: string);
-    constructor(ns: any) {
-
-    }
-
-    public pgF() { };
-
-    public pv;
-    public get d() {
-        return 30;
-    }
-    public set d() {
-    }
-
-    public static get p2() {
-        return { x: 30, y: 40 };
-    }
-
-    private static d2() {
-    }
-    private static get p3() {
-        return "string";
-    }
-    private pv3;
-
-    private foo(n: number): string;
-    private foo(s: string): string;
-    private foo(ns: any) {
-        return ns.toString();
-    }
-}
-
-class b extends a {
-}
-
-class m1b {
-
-}
-
-interface m1ib {
-
-}
-class c extends m1b {
-}
-
-class ib2 implements m1ib {
-}
-
-declare class aAmbient {
-    constructor(n: number);
-    constructor(s: string);
-    public pgF(): void;
-    public pv;
-    public d: number;
-    static p2: { x: number; y: number; };
-    static d2();
-    static p3;
-    private pv3;
-    private foo(s);
-}
-
-class d {
-    private foo(n: number): string;
-    private foo(ns: any) {
-        return ns.toString();
-    }
-    private foo(s: string): string;
-}
-
-class e {
-    private foo(ns: any) {
-        return ns.toString();
-    }
-    private foo(s: string): string;
-    private foo(n: number): string;
-}
-

src/harness/unittests/services/formatting/testCode/testCode/formatting/colonAndQMark.ts

@@ -1,4 +0,0 @@
-class foo {
-    constructor (n?: number, m? = 5, o?: string = "") { }
-    x:number = 1?2:3;
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/colonAndQMarkBaseline.ts

@@ -1,4 +0,0 @@
-class foo {
-    constructor(n?: number, m? = 5, o?: string = "") { }
-    x: number = 1 ? 2 : 3;
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/documentReadyFunction.ts

@@ -1,3 +0,0 @@
-$    (   document   )   .  ready  (   function   (   )   {   
-    alert    (           'i am ready'  )   ;
-           }                 );

src/harness/unittests/services/formatting/testCode/testCode/formatting/documentReadyFunctionBaseLine.ts

@@ -1,3 +0,0 @@
-$(document).ready(function() {
-    alert('i am ready');
-});

src/harness/unittests/services/formatting/testCode/testCode/formatting/emptyBlock.ts

@@ -1 +0,0 @@
-{}

src/harness/unittests/services/formatting/testCode/testCode/formatting/emptyBlockBaseline.ts

@@ -1 +0,0 @@
-{ }

src/harness/unittests/services/formatting/testCode/testCode/formatting/emptyInterfaceLiteral.ts

@@ -1,10 +0,0 @@
-    function    foo  (  x  :    {    }    )    {    }
-
-foo    (  {     }   )    ;
-
-
-    
-            interface    bar    {
-                x   :    {     }   ;
-       y  :       (         )    =>    {     }   ;   
-                                                    }

src/harness/unittests/services/formatting/testCode/testCode/formatting/emptyInterfaceLiteralBaseLine.ts

@@ -1,10 +0,0 @@
-function foo(x: {}) { }
-
-foo({});
-
-
-
-interface bar {
-    x: {};
-    y: () => {};
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/fatArrowFunctions.ts

@@ -1,112 +0,0 @@
-// valid    
-    (         )           =>    1  ;   
-    (        arg )           =>    2  ;   
-        arg       =>    2  ;   
-      (        arg     = 1 )           =>    3  ;   
-    (        arg    ?        )           =>    4  ;   
-    (        arg    :    number )           =>    5  ;   
-      (        arg    :    number     = 0 )           =>    6  ;   
-    (        arg        ?                  :    number )           =>    7  ;   
-    (                 ...     arg    :    number   [      ]    )           =>    8  ;   
-      (        arg1   ,    arg2 )           =>    12  ;   
-    (        arg1     = 1   ,    arg2     =3 )           =>    13  ;   
-      (        arg1    ?          ,    arg2    ?        )           =>    14  ;   
-    (        arg1    :    number   ,    arg2    :    number )           =>    15  ;   
-    (        arg1    :    number     = 0   ,    arg2    :    number     = 1 )           =>    16  ;   
-      (        arg1    ?           :    number   ,    arg2    ?           :    number )           =>    17  ;   
-    (        arg1   ,             ...     arg2    :    number   [      ]    )           =>    18  ;   
-      (        arg1   ,    arg2    ?           :    number )           =>    19  ;   
-
-// in paren
-    (            (         )           =>    21 )      ;   
-    (            (        arg )           =>    22 )      ;   
-    (            (        arg     = 1 )           =>    23 )      ;   
-    (            (        arg    ?        )           =>    24 )      ;   
-    (            (        arg    :    number )           =>    25 )      ;   
-    (            (        arg    :    number     = 0 )           =>    26 )      ;   
-    (            (        arg    ?           :    number )           =>    27 )      ;   
-    (            (                 ...     arg    :    number   [      ]    )           =>    28 )      ;   
-
-// in multiple paren
-    (            (            (            (            (        arg )           =>    { return 32  ;    } )     )     )     )      ;   
-
-// in ternary exression
-      false        ?            (         )           =>    41     :    null  ;   
-   false        ?            (        arg )           =>    42     :    null  ;   
-    false        ?            (        arg     = 1 )           =>    43     :    null  ;   
-      false        ?            (        arg    ?        )           =>    44     :    null  ;   
-    false        ?            (        arg    :    number )           =>    45     :    null  ;   
-   false        ?            (        arg    ?           :    number )           =>    46     :    null  ;   
-      false        ?            (        arg    ?           :    number     = 0 )           =>    47     :    null  ;   
-   false        ?            (                 ...     arg    :    number   [      ]    )           =>    48     :    null  ;   
-
-// in ternary exression within paren
-   false        ?            (            (         )           =>    51 )         :    null  ;   
-    false        ?            (            (        arg )           =>    52 )         :    null  ;   
-    false        ?            (            (        arg     = 1 )           =>    53 )         :    null  ;   
-      false        ?            (            (        arg    ?        )           =>    54 )         :    null  ;   
-    false        ?            (            (        arg    :    number )           =>    55 )         :    null  ;   
-      false        ?            (            (        arg    ?           :    number )           =>    56 )         :    null  ;   
-    false        ?            (            (        arg    ?           :    number     = 0 )           =>    57 )         :    null  ;   
-   false        ?            (            (                 ...     arg    :    number   [      ]    )           =>    58 )         :    null  ;   
-
-// ternary exression's else clause
-   false        ?        null     :        (         )           =>    61  ;   
-        false        ?        null     :        (        arg )           =>    62  ;   
-   false        ?        null     :        (        arg     = 1 )           =>    63  ;   
-      false        ?        null     :        (        arg    ?        )           =>    64  ;   
-   false        ?        null     :        (        arg    :    number )           =>    65  ;   
-    false        ?        null     :        (        arg    ?           :    number )           =>    66  ;   
-        false        ?        null     :        (        arg    ?           :    number     = 0 )           =>    67  ;   
-    false        ?        null     :        (                 ...     arg    :    number   [      ]    )           =>    68  ;   
-
-
-// nested ternary expressions
-    (        a    ?        )           =>    { return a  ;    }     ?            (        b    ?         )           =>    { return b  ;    }     :        (        c    ?         )           =>    { return c  ;    }  ;   
-
-//multiple levels
-    (        a    ?        )           =>    { return a  ;    }     ?            (        b )          =>       (        c )          =>   81     :        (        c )          =>       (        d )          =>   82  ;   
-
-
-// In Expressions
-    (            (        arg )           =>    90 )     instanceof Function  ;   
-      (            (        arg     = 1 )           =>    91 )     instanceof Function  ;   
-        (            (        arg    ?         )           =>    92 )     instanceof Function  ;   
-      (            (        arg    :    number )           =>    93 )     instanceof Function  ;   
-    (            (        arg    :    number     = 1 )           =>    94 )     instanceof Function  ;   
-        (            (        arg    ?           :    number )           =>    95 )     instanceof Function  ;   
-      (            (                 ...     arg    :    number   [      ]    )           =>    96 )     instanceof Function  ;   
-
-''    +        (        arg )           =>    100  ;   
-        (            (        arg )           =>    0 )        +    ''    +        (        arg )           =>    101  ;   
-          (            (        arg     = 1 )           =>    0 )        +    ''    +        (        arg     = 2 )           =>    102  ;   
-    (            (        arg    ?        )           =>    0 )        +    ''    +        (        arg    ?        )           =>    103  ;   
-      (            (        arg    :   number )           =>    0 )        +    ''    +        (        arg    :   number )           =>    104  ;   
-        (            (        arg    :   number     = 1 )           =>    0 )        +    ''    +        (        arg    :   number     = 2 )           =>    105  ;   
-    (            (        arg    ?           :   number     = 1 )           =>    0 )        +    ''    +        (        arg    ?           :   number     = 2 )           =>    106  ;   
-      (            (                 ...     arg    :   number   [      ]    )           =>    0 )        +    ''    +        (                 ...     arg    :   number   [      ]    )           =>    107  ;   
-    (            (        arg1   ,    arg2    ?        )           =>    0 )        +    ''    +        (        arg1   ,   arg2    ?        )           =>    108  ;   
-      (            (        arg1   ,             ...     arg2    :   number   [      ]    )           =>    0 )        +    ''    +        (        arg1   ,             ...     arg2    :   number   [      ]    )           =>    108  ;   
-
-
-// Function Parameters
-function foo    (                 ...     arg    :    any   [      ]    )     { }
-
-foo    (        
-        (        a )           =>    110   ,    
-        (            (        a )           =>    111 )       ,    
-        (        a )           =>    {
-        return 112  ;   
-    }   ,   
-        (        a    ?         )           =>    113   ,    
-        (        a   ,    b    ?         )           =>    114   ,    
-        (        a    :    number )           =>    115   ,    
-        (        a    :    number     = 0 )           =>    116   ,    
-        (        a     = 0 )           =>    117   ,    
-        (        a    ?           :    number     = 0 )           =>    118   ,    
-        (        a    ?    ,   b   ?          :    number     = 0 )           =>    118   ,    
-        (                 ...     a    :    number   [      ]    )           =>    119   ,    
-        (        a   ,    b    ?            = 0   ,             ...     c    :    number   [      ]    )           =>    120   ,   
-        (        a )           =>        (        b )           =>        (        c )           =>    121   ,   
-        false       ?            (        a )           =>    0     :        (        b )           =>    122
- )      ;   

src/harness/unittests/services/formatting/testCode/testCode/formatting/fatArrowFunctionsBaseline.ts

@@ -1,112 +0,0 @@
-// valid    
-() => 1;
-(arg) => 2;
-arg => 2;
-(arg = 1) => 3;
-(arg?) => 4;
-(arg: number) => 5;
-(arg: number = 0) => 6;
-(arg?: number) => 7;
-(...arg: number[]) => 8;
-(arg1, arg2) => 12;
-(arg1 = 1, arg2 = 3) => 13;
-(arg1?, arg2?) => 14;
-(arg1: number, arg2: number) => 15;
-(arg1: number = 0, arg2: number = 1) => 16;
-(arg1?: number, arg2?: number) => 17;
-(arg1, ...arg2: number[]) => 18;
-(arg1, arg2?: number) => 19;
-
-// in paren
-(() => 21);
-((arg) => 22);
-((arg = 1) => 23);
-((arg?) => 24);
-((arg: number) => 25);
-((arg: number = 0) => 26);
-((arg?: number) => 27);
-((...arg: number[]) => 28);
-
-// in multiple paren
-(((((arg) => { return 32; }))));
-
-// in ternary exression
-false ? () => 41 : null;
-false ? (arg) => 42 : null;
-false ? (arg = 1) => 43 : null;
-false ? (arg?) => 44 : null;
-false ? (arg: number) => 45 : null;
-false ? (arg?: number) => 46 : null;
-false ? (arg?: number = 0) => 47 : null;
-false ? (...arg: number[]) => 48 : null;
-
-// in ternary exression within paren
-false ? (() => 51) : null;
-false ? ((arg) => 52) : null;
-false ? ((arg = 1) => 53) : null;
-false ? ((arg?) => 54) : null;
-false ? ((arg: number) => 55) : null;
-false ? ((arg?: number) => 56) : null;
-false ? ((arg?: number = 0) => 57) : null;
-false ? ((...arg: number[]) => 58) : null;
-
-// ternary exression's else clause
-false ? null : () => 61;
-false ? null : (arg) => 62;
-false ? null : (arg = 1) => 63;
-false ? null : (arg?) => 64;
-false ? null : (arg: number) => 65;
-false ? null : (arg?: number) => 66;
-false ? null : (arg?: number = 0) => 67;
-false ? null : (...arg: number[]) => 68;
-
-
-// nested ternary expressions
-(a?) => { return a; } ? (b?) => { return b; } : (c?) => { return c; };
-
-//multiple levels
-(a?) => { return a; } ? (b) => (c) => 81 : (c) => (d) => 82;
-
-
-// In Expressions
-((arg) => 90) instanceof Function;
-((arg = 1) => 91) instanceof Function;
-((arg?) => 92) instanceof Function;
-((arg: number) => 93) instanceof Function;
-((arg: number = 1) => 94) instanceof Function;
-((arg?: number) => 95) instanceof Function;
-((...arg: number[]) => 96) instanceof Function;
-
-'' + (arg) => 100;
-((arg) => 0) + '' + (arg) => 101;
-((arg = 1) => 0) + '' + (arg = 2) => 102;
-((arg?) => 0) + '' + (arg?) => 103;
-((arg: number) => 0) + '' + (arg: number) => 104;
-((arg: number = 1) => 0) + '' + (arg: number = 2) => 105;
-((arg?: number = 1) => 0) + '' + (arg?: number = 2) => 106;
-((...arg: number[]) => 0) + '' + (...arg: number[]) => 107;
-((arg1, arg2?) => 0) + '' + (arg1, arg2?) => 108;
-((arg1, ...arg2: number[]) => 0) + '' + (arg1, ...arg2: number[]) => 108;
-
-
-// Function Parameters
-function foo(...arg: any[]) { }
-
-foo(
-        (a) => 110,
-        ((a) => 111),
-        (a) => {
-            return 112;
-        },
-        (a?) => 113,
-        (a, b?) => 114,
-        (a: number) => 115,
-        (a: number = 0) => 116,
-        (a = 0) => 117,
-        (a?: number = 0) => 118,
-        (a?, b?: number = 0) => 118,
-        (...a: number[]) => 119,
-        (a, b? = 0, ...c: number[]) => 120,
-        (a) => (b) => (c) => 121,
-        false ? (a) => 0 : (b) => 122
- );

src/harness/unittests/services/formatting/testCode/testCode/formatting/formatDebuggerStatement.ts

@@ -1,2 +0,0 @@
-if(false){debugger;}
-  if    (   false   )   {    debugger  ;   }

src/harness/unittests/services/formatting/testCode/testCode/formatting/formatDebuggerStatementBaseline.ts

@@ -1,2 +0,0 @@
-if (false) { debugger; }
-if (false) { debugger; }

src/harness/unittests/services/formatting/testCode/testCode/formatting/formatvariableDeclarationList.ts

@@ -1,13 +0,0 @@
-var   fun1   =   function   (     )     {   
-            var               x   =   'foo'             ,
-                z   =   'bar'           ;
-                return  x            ;
-},
-
-fun2   =   (                function        (   f               )   {
-            var   fun   =   function   (        )       {
-                        console         .  log             (           f     (  )  )       ;
-            },
-            x   =   'Foo'           ;
-                return   fun            ;
-}   (           fun1            )   )       ;

src/harness/unittests/services/formatting/testCode/testCode/formatting/formatvariableDeclarationListBaseline.ts

@@ -1,13 +0,0 @@
-var fun1 = function() {
-    var x = 'foo',
-        z = 'bar';
-    return x;
-},
-
-fun2 = (function(f) {
-    var fun = function() {
-        console.log(f());
-    },
-    x = 'Foo';
-    return fun;
-} (fun1));

src/harness/unittests/services/formatting/testCode/testCode/formatting/implicitModule.ts

@@ -1,3 +0,0 @@
-        export class A {
-
-        }

src/harness/unittests/services/formatting/testCode/testCode/formatting/implicitModuleBaseline.ts

@@ -1,3 +0,0 @@
-export class A {
-
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/importDeclaration.ts

@@ -1,6 +0,0 @@
-module Foo {
-}
-
-import bar  =    Foo;
-
-import bar2=Foo;

src/harness/unittests/services/formatting/testCode/testCode/formatting/importDeclarationBaseline.ts

@@ -1,6 +0,0 @@
-module Foo {
-}
-
-import bar = Foo;
-
-import bar2 = Foo;

src/harness/unittests/services/formatting/testCode/testCode/formatting/main.ts

@@ -1,95 +0,0 @@
-
-var a;var c          , b;var  $d
-var $e 
-var f
-a++;b++;
-
-function        f     (     )        {
-    for (i = 0; i < 10; i++) {
-        k = abc + 123 ^ d;
-        a = XYZ[m  (a[b[c][d]])];
-        break;
-
-        switch ( variable){
-       case  1: abc += 425;
-break;
-case 404 : a [x--/2]%=3 ;
-                    break ;
-                case vari : v[--x ] *=++y*( m + n / k[z]);
-                for (a in b){
-             for (a = 0; a < 10; ++a) {
-              a++;--a;
-                   if (a == b) {
-                          a++;b--;
-                     }
-else
-if (a == c){
-++a;
-(--c)+=d;
-$c = $a + --$b;
-}
-if (a == b)
-if (a != b) {
- if (a !== b)
- if (a === b)
- --a;
- else
-  --a;
-  else {
-  a--;++b;
-a++
-                    }
-                    }
-                    }
-                    for (x in y) {
-m-=m;
-k=1+2+3+4;
-}
-}
-    break;
-                
-    }
-    }
-    var a  ={b:function(){}};
-    return {a:1,b:2}
-}
-
-var z = 1;
-            for (i = 0; i < 10; i++)
-     for (j = 0; j < 10; j++)
-for (k = 0; k < 10; ++k) { 
-z++;
-}
-
-for (k = 0; k < 10; k += 2) { 
-z++;
-}
-
-    $(document).ready ();
-
-
- function  pageLoad() {
- $('#TextBox1' ) .     unbind   (  ) ;
-$('#TextBox1' ) . datepicker ( ) ; 
-}
-
-        function pageLoad    (     )    {
-    var webclass=[
-                { 'student'     :
-                { 'id': '1', 'name': 'Linda Jones', 'legacySkill': 'Access, VB 5.0' }
-        }   ,
-{    'student':
-{'id':'2','name':'Adam Davidson','legacySkill':'Cobol,MainFrame'}
-}      ,
-    { 'student':
-{   'id':'3','name':'Charles Boyer' ,'legacySkill':'HTML, XML'}
-}
-    ];
-
-$create(Sys.UI.DataView,{data:webclass},null,null,$get('SList'));
-
-} 
-
-$( document ).ready(function(){
-alert('hello');
-    } ) ;

src/harness/unittests/services/formatting/testCode/testCode/formatting/mainBaseline.ts

@@ -1,98 +0,0 @@
-
-var a; var c, b; var $d
-var $e
-var f
-a++; b++;
-
-function f() {
-    for (i = 0; i < 10; i++) {
-        k = abc + 123 ^ d;
-        a = XYZ[m(a[b[c][d]])];
-        break;
-
-        switch (variable) {
-            case 1: abc += 425;
-                break;
-            case 404: a[x-- / 2] %= 3;
-                break;
-            case vari: v[--x] *= ++y * (m + n / k[z]);
-                for (a in b) {
-                    for (a = 0; a < 10; ++a) {
-                        a++; --a;
-                        if (a == b) {
-                            a++; b--;
-                        }
-                        else
-                            if (a == c) {
-                                ++a;
-                                (--c) += d;
-                                $c = $a + --$b;
-                            }
-                        if (a == b)
-                            if (a != b) {
-                                if (a !== b)
-                                    if (a === b)
-                                        --a;
-                                    else
-                                        --a;
-                                else {
-                                    a--; ++b;
-                                    a++
-                                }
-                            }
-                    }
-                    for (x in y) {
-                        m -= m;
-                        k = 1 + 2 + 3 + 4;
-                    }
-                }
-                break;
-
-        }
-    }
-    var a = { b: function() { } };
-    return { a: 1, b: 2 }
-}
-
-var z = 1;
-for (i = 0; i < 10; i++)
-    for (j = 0; j < 10; j++)
-        for (k = 0; k < 10; ++k) {
-            z++;
-        }
-
-for (k = 0; k < 10; k += 2) {
-    z++;
-}
-
-$(document).ready();
-
-
-function pageLoad() {
-    $('#TextBox1').unbind();
-    $('#TextBox1').datepicker();
-}
-
-function pageLoad() {
-    var webclass = [
-                {
-                    'student':
-                    { 'id': '1', 'name': 'Linda Jones', 'legacySkill': 'Access, VB 5.0' }
-                },
-{
-    'student':
-    { 'id': '2', 'name': 'Adam Davidson', 'legacySkill': 'Cobol,MainFrame' }
-},
-    {
-        'student':
-    { 'id': '3', 'name': 'Charles Boyer', 'legacySkill': 'HTML, XML' }
-    }
-    ];
-
-    $create(Sys.UI.DataView, { data: webclass }, null, null, $get('SList'));
-
-}
-
-$(document).ready(function() {
-    alert('hello');
-});

src/harness/unittests/services/formatting/testCode/testCode/formatting/moduleIndentation.ts

@@ -1,3 +0,0 @@
-   module     Foo    {
-     export    module    A  .   B  .   C     {      }
-                }

src/harness/unittests/services/formatting/testCode/testCode/formatting/moduleIndentationBaseline.ts

@@ -1,3 +0,0 @@
-module Foo {
-    export module A.B.C { }
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/modules.ts

@@ -1,76 +0,0 @@
-                     module                mod1                  {    
-                                                            export                                class                    b                  {    
-                                                        }
-                                                                 class                    d                  {    
-                                                        }
-
-
-                                                            export                       interface              ib                  {    
-                                                        }
-}
-
-                     module                m2                  {    
-
-                                                            export                                            module                m3                  {    
-                                                                                                                    export                                class                    c              extends              mod1.b                  {    
-                                                                                                                }
-                                                                                                                    export                                class                    ib2              implements              mod1.ib                  {    
-                                                                                                                }
-                                                        }
-}
-
-         class                    c              extends              mod1.b                  {    
-}
-
-         class                    ib2              implements              mod1.ib                  {    
-}
-
-                    declare               export           module         "m4"         {
-                                          export           class         d         {
-                                    }   ;     
-                                    var         x         :         d   ;     
-                                          export           function         foo      (           )     :         d   ;     
-}
-
-                 import         m4         =         module      (       "m4"    )        ;     
-      export           var         x4         =         m4.x   ;     
-      export           var         d4         =         m4.d   ;     
-      export           var         f4         =         m4.foo      (           )        ;     
-
-      export           module         m1         {
-                                                        declare               export           module         "m2"         {
-                                                                              export           class         d         {
-                                                                        }   ;     
-                                                                        var         x:         d   ;     
-                                                                              export           function         foo      (           )     :         d   ;     
-                                    }
-                                                     import         m2         =         module      (       "m2"    )        ;     
-                                                     import         m3         =         module      (       "m4"    )        ;     
-
-                                          export           var         x2         =         m2.x   ;     
-                                          export           var         d2         =         m2.d   ;     
-                                          export           var         f2         =         m2.foo      (           )        ;     
-
-                                          export           var         x3         =         m3.x   ;     
-                                          export           var         d3         =         m3.d   ;     
-                                          export           var         f3         =         m3.foo      (           )        ;     
-}
-
-      export           var         x2         =         m1.m2.x   ;     
-      export           var         d2         =         m1.m2.d   ;     
-      export           var         f2         =         m1.m2.foo      (           )        ;     
-
-      export           var         x3         =         m1.m3.x   ;     
-      export           var         d3         =         m1.m3.d   ;     
-      export           var         f3         =         m1.m3.foo      (           )        ;     
-
-      export           module         m5         {
-                                          export           var         x2         =         m1.m2.x   ;     
-                                          export           var         d2         =         m1.m2.d   ;     
-                                          export           var         f2         =         m1.m2.foo      (           )        ;     
-
-                                          export           var         x3         =         m1.m3.x   ;     
-                                          export           var         d3         =         m1.m3.d   ;     
-                                          export           var         f3         =         m1.m3.foo      (           )        ;     
-}
-

src/harness/unittests/services/formatting/testCode/testCode/formatting/modulesBaseline.ts

@@ -1,76 +0,0 @@
-module mod1 {
-    export class b {
-    }
-    class d {
-    }
-
-
-    export interface ib {
-    }
-}
-
-module m2 {
-
-    export module m3 {
-        export class c extends mod1.b {
-        }
-        export class ib2 implements mod1.ib {
-        }
-    }
-}
-
-class c extends mod1.b {
-}
-
-class ib2 implements mod1.ib {
-}
-
-declare export module "m4" {
-    export class d {
-    };
-    var x: d;
-    export function foo(): d;
-}
-
-import m4 = module("m4");
-export var x4 = m4.x;
-export var d4 = m4.d;
-export var f4 = m4.foo();
-
-export module m1 {
-    declare export module "m2" {
-        export class d {
-        };
-        var x: d;
-        export function foo(): d;
-    }
-    import m2 = module("m2");
-    import m3 = module("m4");
-
-    export var x2 = m2.x;
-    export var d2 = m2.d;
-    export var f2 = m2.foo();
-
-    export var x3 = m3.x;
-    export var d3 = m3.d;
-    export var f3 = m3.foo();
-}
-
-export var x2 = m1.m2.x;
-export var d2 = m1.m2.d;
-export var f2 = m1.m2.foo();
-
-export var x3 = m1.m3.x;
-export var d3 = m1.m3.d;
-export var f3 = m1.m3.foo();
-
-export module m5 {
-    export var x2 = m1.m2.x;
-    export var d2 = m1.m2.d;
-    export var f2 = m1.m2.foo();
-
-    export var x3 = m1.m3.x;
-    export var d3 = m1.m3.d;
-    export var f3 = m1.m3.foo();
-}
-

src/harness/unittests/services/formatting/testCode/testCode/formatting/objectLiteral.ts

@@ -1,27 +0,0 @@
-var x = {foo: 1,
-bar: "tt",
-boo: 1 + 5};
-
-var x2 = {foo: 1,
-bar: "tt",boo:1+5};
-
-function Foo() {
-var typeICalc = {
-clear: {
-"()": [1, 2, 3]
-}
-}
-}
-
-// Rule for object literal members for the "value" of the memebr to follow the indent
-// of the member, i.e. the relative position of the value is maintained when the member
-// is indented.
-var x2 = {
-  foo:
-3,
-          'bar':
-                    { a: 1, b : 2}
-};
-
-var x={    };
-var y = {};

src/harness/unittests/services/formatting/testCode/testCode/formatting/objectLiteralBaseline.ts

@@ -1,31 +0,0 @@
-var x = {
-    foo: 1,
-    bar: "tt",
-    boo: 1 + 5
-};
-
-var x2 = {
-    foo: 1,
-    bar: "tt", boo: 1 + 5
-};
-
-function Foo() {
-    var typeICalc = {
-        clear: {
-            "()": [1, 2, 3]
-        }
-    }
-}
-
-// Rule for object literal members for the "value" of the memebr to follow the indent
-// of the member, i.e. the relative position of the value is maintained when the member
-// is indented.
-var x2 = {
-    foo:
-  3,
-    'bar':
-              { a: 1, b: 2 }
-};
-
-var x = {};
-var y = {};

src/harness/unittests/services/formatting/testCode/testCode/formatting/onClosingBracket.ts

@@ -1,32 +0,0 @@
-function f( ) {
-var     x = 3;
-    var z = 2   ;
-    a  = z  ++ - 2 *  x ;
-        for ( ; ; ) {
-    a+=(g +g)*a%t;
-        b --                          ;
-}
-
-    switch ( a  )
-    {
-        case 1  :     {
-    a ++  ;
-        b--;
-    if(a===a)
-                return;
-    else
-        {
-            for(a in b)
-                if(a!=a)
-    {
-    for(a in b)
-            {
-a++;
-        }
-                }
-    }
-        }
-    default:
-        break;
-    }
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/onClosingBracketBaseLine.ts

@@ -1,28 +0,0 @@
-function f() {
-    var x = 3;
-    var z = 2;
-    a = z++ - 2 * x;
-    for (; ;) {
-        a += (g + g) * a % t;
-        b--;
-    }
-
-    switch (a) {
-        case 1: {
-            a++;
-            b--;
-            if (a === a)
-                return;
-            else {
-                for (a in b)
-                    if (a != a) {
-                        for (a in b) {
-                            a++;
-                        }
-                    }
-            }
-        }
-        default:
-            break;
-    }
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/onSemiColon.ts

@@ -1 +0,0 @@
-var  a=b+c^d-e*++f;

src/harness/unittests/services/formatting/testCode/testCode/formatting/onSemiColonBaseline.ts

@@ -1 +0,0 @@
-var a = b + c ^ d - e * ++f;

src/harness/unittests/services/formatting/testCode/testCode/formatting/spaceAfterConstructor.ts

@@ -1 +0,0 @@
-class test { constructor                   () { } }

src/harness/unittests/services/formatting/testCode/testCode/formatting/spaceAfterConstructorBaseline.ts

@@ -1 +0,0 @@
-class test { constructor() { } }

src/harness/unittests/services/formatting/testCode/testCode/formatting/tabAfterCloseCurly.ts

@@ -1,10 +0,0 @@
-module Tools {
-    export enum NodeType {
-        Error,
-        Comment,
-    }	
-    export enum foob
-    {
-        Blah=1, Bleah=2
-    }
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/tabAfterCloseCurlyBaseline.ts

@@ -1,9 +0,0 @@
-module Tools {
-    export enum NodeType {
-        Error,
-        Comment,
-    }
-    export enum foob {
-        Blah = 1, Bleah = 2
-    }
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/typescriptConstructs.ts

@@ -1,65 +0,0 @@
-     module MyModule 
-     {
-                module A.B.C {
-module F {
-}
-                   }
-interface Blah 
-{
-boo: string;
-}
-    
- class Foo 
- {
-      
-}
-      
-class Foo2 {
-public foo():number {
-return 5 * 6;
-}
-public foo2() {
-if (1 === 2)
-                          
-
-{
-var y     :   number= 76;
-return y;
-}
-
-                            while (2 == 3)               {              
-  if (    y      ==       null     )       {     
-                    
-}
- }
-}
-
-public foo3() {
-if (1 === 2)
-                          
-//comment preventing line merging
-{
-var y = 76;
-return y;
-}
-
-}
- }
-     }
-
-function foo(a:number, b:number):number
-{
-return 0;
-}
-
-function bar(a:number, b:number) :number[]       {
-return [];
-}
-
-module BugFix3 {
-declare var f: { 
- (): any;
-   (x: number): string;
-       foo: number;
-};
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/typescriptConstructsBaseline.ts

@@ -1,58 +0,0 @@
-module MyModule {
-    module A.B.C {
-        module F {
-        }
-    }
-    interface Blah {
-        boo: string;
-    }
-
-    class Foo {
-
-    }
-
-    class Foo2 {
-        public foo(): number {
-            return 5 * 6;
-        }
-        public foo2() {
-            if (1 === 2) {
-                var y: number = 76;
-                return y;
-            }
-
-            while (2 == 3) {
-                if (y == null) {
-
-                }
-            }
-        }
-
-        public foo3() {
-            if (1 === 2)
-
-                //comment preventing line merging
-            {
-                var y = 76;
-                return y;
-            }
-
-        }
-    }
-}
-
-function foo(a: number, b: number): number {
-    return 0;
-}
-
-function bar(a: number, b: number): number[] {
-    return [];
-}
-
-module BugFix3 {
-    declare var f: {
-        (): any;
-        (x: number): string;
-        foo: number;
-    };
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/various.ts

@@ -1,17 +0,0 @@
-function f(a,b,c,d){
-for(var i=0;i<10;i++){
-var a=0;
-var b=a+a+a*a%a/2-1;
-b+=a;
-++b;
-f(a,b,c,d);
-if(1===1){
-var m=function(e,f){
-return e^f;
-}
-}
-}
-}
-
-for (var i = 0   ; i < this.foo(); i++) {
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/variousBaseline.ts

@@ -1,17 +0,0 @@
-function f(a, b, c, d) {
-    for (var i = 0; i < 10; i++) {
-        var a = 0;
-        var b = a + a + a * a % a / 2 - 1;
-        b += a;
-        ++b;
-        f(a, b, c, d);
-        if (1 === 1) {
-            var m = function(e, f) {
-                return e ^ f;
-            }
-        }
-    }
-}
-
-for (var i = 0   ; i < this.foo(); i++) {
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/withStatement.ts

@@ -1,9 +0,0 @@
-with (foo.bar) 
-
-   {
-
-     }
-
-with (bar.blah)
-{
-}

src/harness/unittests/services/formatting/testCode/testCode/formatting/withStatementBaseline.ts

@@ -1,6 +0,0 @@
-with (foo.bar) {
-
-}
-
-with (bar.blah) {
-}

src/services/navigationBar.ts

@@ -466,6 +466,7 @@ namespace ts.NavigationBar {
                 case SyntaxKind.MethodDeclaration:
                 case SyntaxKind.GetAccessor:
                 case SyntaxKind.SetAccessor:
+                case SyntaxKind.VariableDeclaration:
                     return hasSomeImportantChild(item);
 
                 case SyntaxKind.ArrowFunction:

src/services/services.ts

@@ -1373,8 +1373,12 @@ namespace ts {
         containerName: string;
     }
 
+    export interface ReferencedSymbolDefinitionInfo extends DefinitionInfo {
+        displayParts: SymbolDisplayPart[];
+    }
+
     export interface ReferencedSymbol {
-        definition: DefinitionInfo;
+        definition: ReferencedSymbolDefinitionInfo;
         references: ReferenceEntry[];
     }
 
@@ -2792,6 +2796,11 @@ namespace ts {
         return isRightSideOfPropertyAccess(node) ? node.parent : node;
     }
 
+    /** Get `C` given `N` if `N` is in the position `class C extends N` or `class C extends foo.N` where `N` is an identifier. */
+    function tryGetClassExtendingIdentifier(node: Node): ClassLikeDeclaration | undefined {
+        return tryGetClassExtendingExpressionWithTypeArguments(climbPastPropertyAccess(node).parent);
+    }
+
     function isCallExpressionTarget(node: Node): boolean {
         return isCallOrNewExpressionTarget(node, SyntaxKind.CallExpression);
     }
@@ -2805,9 +2814,20 @@ namespace ts {
         return target && target.parent && target.parent.kind === kind && (<CallExpression>target.parent).expression === target;
     }
 
-    /** Get `C` given `N` if `N` is in the position `class C extends N` or `class C extends foo.N` where `N` is an identifier. */
-    function tryGetClassExtendingIdentifier(node: Node): ClassLikeDeclaration | undefined {
-        return tryGetClassExtendingExpressionWithTypeArguments(climbPastPropertyAccess(node).parent);
+    function climbPastManyPropertyAccesses(node: Node): Node {
+        return isRightSideOfPropertyAccess(node) ? climbPastManyPropertyAccesses(node.parent) : node;
+    }
+
+    /** Returns a CallLikeExpression where `node` is the target being invoked. */
+    function getAncestorCallLikeExpression(node: Node): CallLikeExpression | undefined {
+        const target = climbPastManyPropertyAccesses(node);
+        const callLike = target.parent;
+        return callLike && isCallLikeExpression(callLike) && getInvokedExpression(callLike) === target && callLike;
+    }
+
+    function tryGetSignatureDeclaration(typeChecker: TypeChecker, node: Node): SignatureDeclaration | undefined {
+        const callLike = getAncestorCallLikeExpression(node);
+        return callLike && typeChecker.getResolvedSignature(callLike).declaration;
     }
 
     function isNameOfModuleDeclaration(node: Node) {
@@ -5076,14 +5096,25 @@ namespace ts {
             };
         }
 
+        function getSymbolInfo(typeChecker: TypeChecker, symbol: Symbol, node: Node) {
+            return {
+                symbolName: typeChecker.symbolToString(symbol), // Do not get scoped name, just the name of the symbol
+                symbolKind: getSymbolKind(symbol, node),
+                containerName: symbol.parent ? typeChecker.symbolToString(symbol.parent, node) : ""
+            };
+        }
+
+        function createDefinitionFromSignatureDeclaration(decl: SignatureDeclaration): DefinitionInfo {
+            const typeChecker = program.getTypeChecker();
+            const { symbolName, symbolKind, containerName } = getSymbolInfo(typeChecker, decl.symbol, decl);
+            return createDefinitionInfo(decl, symbolKind, symbolName, containerName);
+        }
+
         function getDefinitionFromSymbol(symbol: Symbol, node: Node): DefinitionInfo[] {
             const typeChecker = program.getTypeChecker();
             const result: DefinitionInfo[] = [];
             const declarations = symbol.getDeclarations();
-            const symbolName = typeChecker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol
-            const symbolKind = getSymbolKind(symbol, node);
-            const containerSymbol = symbol.parent;
-            const containerName = containerSymbol ? typeChecker.symbolToString(containerSymbol, node) : "";
+            const { symbolName, symbolKind, containerName } = getSymbolInfo(typeChecker, symbol, node);
 
             if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) &&
                 !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) {
@@ -5209,6 +5240,12 @@ namespace ts {
             }
 
             const typeChecker = program.getTypeChecker();
+
+            const calledDeclaration = tryGetSignatureDeclaration(typeChecker, node);
+            if (calledDeclaration) {
+                return [createDefinitionFromSignatureDeclaration(calledDeclaration)];
+            }
+
             let symbol = typeChecker.getSymbolAtLocation(node);
 
             // Could not find a symbol e.g. node is string or number keyword,
@@ -6118,7 +6155,7 @@ namespace ts {
 
             return result;
 
-            function getDefinition(symbol: Symbol): DefinitionInfo {
+            function getDefinition(symbol: Symbol): ReferencedSymbolDefinitionInfo {
                 const info = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, node.getSourceFile(), getContainerNode(node), node);
                 const name = map(info.displayParts, p => p.text).join("");
                 const declarations = symbol.declarations;
@@ -6132,7 +6169,8 @@ namespace ts {
                     name,
                     kind: info.symbolKind,
                     fileName: declarations[0].getSourceFile().fileName,
-                    textSpan: createTextSpan(declarations[0].getStart(), 0)
+                    textSpan: createTextSpan(declarations[0].getStart(), 0),
+                    displayParts: info.displayParts
                 };
             }
 
@@ -6331,13 +6369,14 @@ namespace ts {
                     }
                 });
 
-                const definition: DefinitionInfo = {
+                const definition: ReferencedSymbolDefinitionInfo = {
                     containerKind: "",
                     containerName: "",
                     fileName: targetLabel.getSourceFile().fileName,
                     kind: ScriptElementKind.label,
                     name: labelName,
-                    textSpan: createTextSpanFromBounds(targetLabel.getStart(), targetLabel.getEnd())
+                    textSpan: createTextSpanFromBounds(targetLabel.getStart(), targetLabel.getEnd()),
+                    displayParts: [displayPart(labelName, SymbolDisplayPartKind.text)]
                 };
 
                 return [{ definition, references }];
@@ -6660,6 +6699,11 @@ namespace ts {
                     getThisReferencesInFile(sourceFile, searchSpaceNode, possiblePositions, references);
                 }
 
+                const thisOrSuperSymbol = typeChecker.getSymbolAtLocation(thisOrSuperKeyword);
+
+                const displayParts = thisOrSuperSymbol && getSymbolDisplayPartsDocumentationAndSymbolKind(
+                    thisOrSuperSymbol, thisOrSuperKeyword.getSourceFile(), getContainerNode(thisOrSuperKeyword), thisOrSuperKeyword).displayParts;
+
                 return [{
                     definition: {
                         containerKind: "",
@@ -6667,7 +6711,8 @@ namespace ts {
                         fileName: node.getSourceFile().fileName,
                         kind: ScriptElementKind.variableElement,
                         name: "this",
-                        textSpan: createTextSpanFromBounds(node.getStart(), node.getEnd())
+                        textSpan: createTextSpanFromBounds(node.getStart(), node.getEnd()),
+                        displayParts
                     },
                     references: references
                 }];
@@ -6738,7 +6783,8 @@ namespace ts {
                         fileName: node.getSourceFile().fileName,
                         kind: ScriptElementKind.variableElement,
                         name: type.text,
-                        textSpan: createTextSpanFromBounds(node.getStart(), node.getEnd())
+                        textSpan: createTextSpanFromBounds(node.getStart(), node.getEnd()),
+                        displayParts: [displayPart(getTextOfNode(node), SymbolDisplayPartKind.stringLiteral)]
                     },
                     references: references
                 }];

tests/baselines/reference/constructableDecoratorOnClass01.errors.txt

@@ -0,0 +1,16 @@
+tests/cases/conformance/decorators/class/constructableDecoratorOnClass01.ts(4,1): error TS1238: Unable to resolve signature of class decorator when called as an expression.
+  Cannot invoke an expression whose type lacks a call signature.
+
+
+==== tests/cases/conformance/decorators/class/constructableDecoratorOnClass01.ts (1 errors) ====
+    
+    class CtorDtor {}
+    
+    @CtorDtor
+    ~~~~~~~~~
+!!! error TS1238: Unable to resolve signature of class decorator when called as an expression.
+!!! error TS1238:   Cannot invoke an expression whose type lacks a call signature.
+    class C {
+    
+    }
+    

tests/baselines/reference/constructableDecoratorOnClass01.js

@@ -0,0 +1,30 @@
+//// [constructableDecoratorOnClass01.ts]
+
+class CtorDtor {}
+
+@CtorDtor
+class C {
+
+}
+
+
+//// [constructableDecoratorOnClass01.js]
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var CtorDtor = (function () {
+    function CtorDtor() {
+    }
+    return CtorDtor;
+}());
+var C = (function () {
+    function C() {
+    }
+    C = __decorate([
+        CtorDtor
+    ], C);
+    return C;
+}());

tests/baselines/reference/constructableDecoratorOnClass01.symbols

@@ -0,0 +1,13 @@
+=== tests/cases/conformance/decorators/class/constructableDecoratorOnClass01.ts ===
+
+class CtorDtor {}
+>CtorDtor : Symbol(CtorDtor, Decl(constructableDecoratorOnClass01.ts, 0, 0))
+
+@CtorDtor
+>CtorDtor : Symbol(CtorDtor, Decl(constructableDecoratorOnClass01.ts, 0, 0))
+
+class C {
+>C : Symbol(C, Decl(constructableDecoratorOnClass01.ts, 1, 17))
+
+}
+

tests/baselines/reference/constructableDecoratorOnClass01.types

@@ -0,0 +1,13 @@
+=== tests/cases/conformance/decorators/class/constructableDecoratorOnClass01.ts ===
+
+class CtorDtor {}
+>CtorDtor : CtorDtor
+
+@CtorDtor
+>CtorDtor : typeof CtorDtor
+
+class C {
+>C : C
+
+}
+

tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.errors.txt

@@ -2,7 +2,7 @@ tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(3,5): erro
 tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(4,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(9,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(15,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(15,16): error TS7016: Property 'haveOnlySet' implicitly has type 'any', because its 'set' accessor lacks a type annotation.
+tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(15,16): error TS7032: Property 'haveOnlySet' implicitly has type 'any', because its set accessor lacks a parameter type annotation.
 tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(15,28): error TS7006: Parameter 'newXValue' implicitly has an 'any' type.
 tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(20,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(20,16): error TS7010: 'haveOnlyGet', which lacks return-type annotation, implicitly has an 'any' return type.
@@ -33,7 +33,7 @@ tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(20,16): er
                    ~~~~~~~~~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
                    ~~~~~~~~~~~
-!!! error TS7016: Property 'haveOnlySet' implicitly has type 'any', because its 'set' accessor lacks a type annotation.
+!!! error TS7032: Property 'haveOnlySet' implicitly has type 'any', because its set accessor lacks a parameter type annotation.
                                ~~~~~~~~~
 !!! error TS7006: Parameter 'newXValue' implicitly has an 'any' type.
         }

tests/baselines/reference/noImplicitAnyMissingGetAccessor.errors.txt

@@ -0,0 +1,27 @@
+tests/cases/compiler/noImplicitAnyMissingGetAccessor.ts(4,25): error TS7032: Property 'message' implicitly has type 'any', because its set accessor lacks a parameter type annotation.
+tests/cases/compiler/noImplicitAnyMissingGetAccessor.ts(4,33): error TS7006: Parameter 'str' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyMissingGetAccessor.ts(9,16): error TS7032: Property 'message' implicitly has type 'any', because its set accessor lacks a parameter type annotation.
+tests/cases/compiler/noImplicitAnyMissingGetAccessor.ts(9,24): error TS7006: Parameter 'str' implicitly has an 'any' type.
+
+
+==== tests/cases/compiler/noImplicitAnyMissingGetAccessor.ts (4 errors) ====
+    
+    abstract class Parent
+    {
+        public abstract set message(str);
+                            ~~~~~~~
+!!! error TS7032: Property 'message' implicitly has type 'any', because its set accessor lacks a parameter type annotation.
+                                    ~~~
+!!! error TS7006: Parameter 'str' implicitly has an 'any' type.
+    }
+    
+    class Child extends Parent {
+        _x: any;
+        public set message(str) {
+                   ~~~~~~~
+!!! error TS7032: Property 'message' implicitly has type 'any', because its set accessor lacks a parameter type annotation.
+                           ~~~
+!!! error TS7006: Parameter 'str' implicitly has an 'any' type.
+            this._x = str;
+        }
+    }

tests/baselines/reference/noImplicitAnyMissingGetAccessor.js

@@ -0,0 +1,44 @@
+//// [noImplicitAnyMissingGetAccessor.ts]
+
+abstract class Parent
+{
+    public abstract set message(str);
+}
+
+class Child extends Parent {
+    _x: any;
+    public set message(str) {
+        this._x = str;
+    }
+}
+
+//// [noImplicitAnyMissingGetAccessor.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var Parent = (function () {
+    function Parent() {
+    }
+    Object.defineProperty(Parent.prototype, "message", {
+        set: function (str) { },
+        enumerable: true,
+        configurable: true
+    });
+    return Parent;
+}());
+var Child = (function (_super) {
+    __extends(Child, _super);
+    function Child() {
+        _super.apply(this, arguments);
+    }
+    Object.defineProperty(Child.prototype, "message", {
+        set: function (str) {
+            this._x = str;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return Child;
+}(Parent));

tests/baselines/reference/noImplicitAnyMissingSetAccessor.errors.txt

@@ -0,0 +1,17 @@
+tests/cases/compiler/noImplicitAnyMissingSetAccessor.ts(4,25): error TS7033: Property 'message' implicitly has type 'any', because its get accessor lacks a return type annotation.
+
+
+==== tests/cases/compiler/noImplicitAnyMissingSetAccessor.ts (1 errors) ====
+    
+    abstract class Parent
+    {
+        public abstract get message();
+                            ~~~~~~~
+!!! error TS7033: Property 'message' implicitly has type 'any', because its get accessor lacks a return type annotation.
+    }
+    
+    class Child extends Parent {
+        public get message() {
+            return "";
+        }
+    }

tests/baselines/reference/noImplicitAnyMissingSetAccessor.js

@@ -0,0 +1,43 @@
+//// [noImplicitAnyMissingSetAccessor.ts]
+
+abstract class Parent
+{
+    public abstract get message();
+}
+
+class Child extends Parent {
+    public get message() {
+        return "";
+    }
+}
+
+//// [noImplicitAnyMissingSetAccessor.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var Parent = (function () {
+    function Parent() {
+    }
+    Object.defineProperty(Parent.prototype, "message", {
+        get: function () { },
+        enumerable: true,
+        configurable: true
+    });
+    return Parent;
+}());
+var Child = (function (_super) {
+    __extends(Child, _super);
+    function Child() {
+        _super.apply(this, arguments);
+    }
+    Object.defineProperty(Child.prototype, "message", {
+        get: function () {
+            return "";
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return Child;
+}(Parent));

tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentError.errors.txt

@@ -1,8 +1,5 @@
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentError.ts(4,43): error TS2322: Type '{ name: string; id: number; }' is not assignable to type '{ b: string; id: number; }'.
   Object literal may only specify known properties, and 'name' does not exist in type '{ b: string; id: number; }'.
-tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentError.ts(5,16): error TS1131: Property or signature expected.
-tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentError.ts(5,22): error TS2403: Subsequent variable declarations must have the same type.  Variable 'id' must be of type 'number', but here has type 'any'.
-tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentError.ts(5,25): error TS1128: Declaration or statement expected.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentError.ts(6,79): error TS2322: Type '{ name: string; id: number; }' is not assignable to type '{ id: string; name: number; }'.
   Types of property 'id' are incompatible.
     Type 'number' is not assignable to type 'string'.
@@ -11,7 +8,7 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
     Type 'number' is not assignable to type 'boolean'.
 
 
-==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentError.ts (6 errors) ====
+==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentError.ts (3 errors) ====
     var id: number = 10000;
     var name: string = "my name";
     
@@ -19,13 +16,7 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
                                               ~~~~
 !!! error TS2322: Type '{ name: string; id: number; }' is not assignable to type '{ b: string; id: number; }'.
 !!! error TS2322:   Object literal may only specify known properties, and 'name' does not exist in type '{ b: string; id: number; }'.
-    var person1: { name, id };  // error: can't use short-hand property assignment in type position
-                   ~~~~
-!!! error TS1131: Property or signature expected.
-                         ~~
-!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'id' must be of type 'number', but here has type 'any'.
-                            ~
-!!! error TS1128: Declaration or statement expected.
+    var person1: { name, id };  // ok
     function foo(name: string, id: number): { id: string, name: number } { return { name, id }; }  // error
                                                                                   ~~~~~~~~~~~~
 !!! error TS2322: Type '{ name: string; id: number; }' is not assignable to type '{ id: string; name: number; }'.

tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentError.js

@@ -3,7 +3,7 @@ var id: number = 10000;
 var name: string = "my name";
 
 var person: { b: string; id: number } = { name, id };  // error
-var person1: { name, id };  // error: can't use short-hand property assignment in type position
+var person1: { name, id };  // ok
 function foo(name: string, id: number): { id: string, name: number } { return { name, id }; }  // error
 function bar(obj: { name: string; id: boolean }) { }
 bar({ name, id });  // error
@@ -14,8 +14,7 @@ bar({ name, id });  // error
 var id = 10000;
 var name = "my name";
 var person = { name: name, id: id }; // error
-var person1 = name, id;
-; // error: can't use short-hand property assignment in type position
+var person1; // ok
 function foo(name, id) { return { name: name, id: id }; } // error
 function bar(obj) { }
 bar({ name: name, id: id }); // error

tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.errors.txt

@@ -3,15 +3,12 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.ts(5,79): error TS2322: Type '{ name: string; id: number; }' is not assignable to type '{ name: number; id: string; }'.
   Types of property 'name' are incompatible.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.ts(7,16): error TS1131: Property or signature expected.
-tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.ts(7,22): error TS2403: Subsequent variable declarations must have the same type.  Variable 'id' must be of type 'number', but here has type 'any'.
-tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.ts(7,25): error TS1128: Declaration or statement expected.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.ts(8,5): error TS2322: Type '{ name: number; id: string; }' is not assignable to type '{ name: string; id: number; }'.
   Types of property 'name' are incompatible.
     Type 'number' is not assignable to type 'string'.
 
 
-==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.ts (6 errors) ====
+==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.ts (3 errors) ====
     var id: number = 10000;
     var name: string = "my name";
     
@@ -25,15 +22,10 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
 !!! error TS2322:   Types of property 'name' are incompatible.
 !!! error TS2322:     Type 'string' is not assignable to type 'number'.
     function foo(name: string, id: number): { name: string, id: number } { return { name, id }; }  // error
-    var person1: { name, id };  // error : Can't use shorthand in the type position
-                   ~~~~
-!!! error TS1131: Property or signature expected.
-                         ~~
-!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'id' must be of type 'number', but here has type 'any'.
-                            ~
-!!! error TS1128: Declaration or statement expected.
+    var person1: { name, id }; // ok
     var person2: { name: string, id: number } = bar("hello", 5);
         ~~~~~~~
 !!! error TS2322: Type '{ name: number; id: string; }' is not assignable to type '{ name: string; id: number; }'.
 !!! error TS2322:   Types of property 'name' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'string'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
+    

tests/baselines/reference/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.js

@@ -5,8 +5,9 @@ var name: string = "my name";
 var person: { b: string; id: number } = { name, id };  // error
 function bar(name: string, id: number): { name: number, id: string } { return { name, id }; }  // error
 function foo(name: string, id: number): { name: string, id: number } { return { name, id }; }  // error
-var person1: { name, id };  // error : Can't use shorthand in the type position
-var person2: { name: string, id: number } = bar("hello", 5);
+var person1: { name, id }; // ok
+var person2: { name: string, id: number } = bar("hello", 5);
+
 
 //// [objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.js]
 var id = 10000;
@@ -14,6 +15,5 @@ var name = "my name";
 var person = { name: name, id: id }; // error
 function bar(name, id) { return { name: name, id: id }; } // error
 function foo(name, id) { return { name: name, id: id }; } // error
-var person1 = name, id;
-; // error : Can't use shorthand in the type position
+var person1; // ok
 var person2 = bar("hello", 5);

tests/baselines/reference/parseObjectLiteralsWithoutTypes.js

@@ -0,0 +1,10 @@
+//// [parseObjectLiteralsWithoutTypes.ts]
+let x: { foo, bar }
+let y: { foo: number, bar }
+let z: { foo, bar: number }
+
+
+//// [parseObjectLiteralsWithoutTypes.js]
+var x;
+var y;
+var z;

tests/baselines/reference/parseObjectLiteralsWithoutTypes.symbols

@@ -0,0 +1,16 @@
+=== tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts ===
+let x: { foo, bar }
+>x : Symbol(x, Decl(parseObjectLiteralsWithoutTypes.ts, 0, 3))
+>foo : Symbol(foo, Decl(parseObjectLiteralsWithoutTypes.ts, 0, 8))
+>bar : Symbol(bar, Decl(parseObjectLiteralsWithoutTypes.ts, 0, 13))
+
+let y: { foo: number, bar }
+>y : Symbol(y, Decl(parseObjectLiteralsWithoutTypes.ts, 1, 3))
+>foo : Symbol(foo, Decl(parseObjectLiteralsWithoutTypes.ts, 1, 8))
+>bar : Symbol(bar, Decl(parseObjectLiteralsWithoutTypes.ts, 1, 21))
+
+let z: { foo, bar: number }
+>z : Symbol(z, Decl(parseObjectLiteralsWithoutTypes.ts, 2, 3))
+>foo : Symbol(foo, Decl(parseObjectLiteralsWithoutTypes.ts, 2, 8))
+>bar : Symbol(bar, Decl(parseObjectLiteralsWithoutTypes.ts, 2, 13))
+

tests/baselines/reference/parseObjectLiteralsWithoutTypes.types

@@ -0,0 +1,16 @@
+=== tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts ===
+let x: { foo, bar }
+>x : { foo: any; bar: any; }
+>foo : any
+>bar : any
+
+let y: { foo: number, bar }
+>y : { foo: number; bar: any; }
+>foo : number
+>bar : any
+
+let z: { foo, bar: number }
+>z : { foo: any; bar: number; }
+>foo : any
+>bar : number
+

tests/baselines/reference/taggedTemplateUntypedTagCall01.js

@@ -0,0 +1,8 @@
+//// [taggedTemplateUntypedTagCall01.ts]
+var tag: Function;
+tag `Hello world!`;
+
+//// [taggedTemplateUntypedTagCall01.js]
+var tag;
+(_a = ["Hello world!"], _a.raw = ["Hello world!"], tag(_a));
+var _a;

tests/baselines/reference/taggedTemplateUntypedTagCall01.symbols

@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/templates/taggedTemplateUntypedTagCall01.ts ===
+var tag: Function;
+>tag : Symbol(tag, Decl(taggedTemplateUntypedTagCall01.ts, 0, 3))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+tag `Hello world!`;
+>tag : Symbol(tag, Decl(taggedTemplateUntypedTagCall01.ts, 0, 3))
+

tests/baselines/reference/taggedTemplateUntypedTagCall01.types

@@ -0,0 +1,10 @@
+=== tests/cases/conformance/es6/templates/taggedTemplateUntypedTagCall01.ts ===
+var tag: Function;
+>tag : Function
+>Function : Function
+
+tag `Hello world!`;
+>tag `Hello world!` : any
+>tag : Function
+>`Hello world!` : string
+

tests/baselines/reference/taggedTemplateWithConstructableTag01.errors.txt

@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag01.ts(3,1): error TS2349: Cannot invoke an expression whose type lacks a call signature.
+
+
+==== tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag01.ts (1 errors) ====
+    class CtorTag { }
+    
+    CtorTag `Hello world!`;
+    ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2349: Cannot invoke an expression whose type lacks a call signature.

tests/baselines/reference/taggedTemplateWithConstructableTag01.js

@@ -0,0 +1,13 @@
+//// [taggedTemplateWithConstructableTag01.ts]
+class CtorTag { }
+
+CtorTag `Hello world!`;
+
+//// [taggedTemplateWithConstructableTag01.js]
+var CtorTag = (function () {
+    function CtorTag() {
+    }
+    return CtorTag;
+}());
+(_a = ["Hello world!"], _a.raw = ["Hello world!"], CtorTag(_a));
+var _a;

tests/baselines/reference/taggedTemplateWithConstructableTag01.symbols

@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag01.ts ===
+class CtorTag { }
+>CtorTag : Symbol(CtorTag, Decl(taggedTemplateWithConstructableTag01.ts, 0, 0))
+
+CtorTag `Hello world!`;
+>CtorTag : Symbol(CtorTag, Decl(taggedTemplateWithConstructableTag01.ts, 0, 0))
+

tests/baselines/reference/taggedTemplateWithConstructableTag01.types

@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag01.ts ===
+class CtorTag { }
+>CtorTag : CtorTag
+
+CtorTag `Hello world!`;
+>CtorTag `Hello world!` : any
+>CtorTag : typeof CtorTag
+>`Hello world!` : string
+

tests/baselines/reference/taggedTemplateWithConstructableTag02.errors.txt

@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag02.ts(6,1): error TS2349: Cannot invoke an expression whose type lacks a call signature.
+
+
+==== tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag02.ts (1 errors) ====
+    interface I {
+        new (...args: any[]): string;
+        new (): number;
+    }
+    var tag: I;
+    tag `Hello world!`;
+    ~~~~~~~~~~~~~~~~~~
+!!! error TS2349: Cannot invoke an expression whose type lacks a call signature.

tests/baselines/reference/taggedTemplateWithConstructableTag02.js

@@ -0,0 +1,12 @@
+//// [taggedTemplateWithConstructableTag02.ts]
+interface I {
+    new (...args: any[]): string;
+    new (): number;
+}
+var tag: I;
+tag `Hello world!`;
+
+//// [taggedTemplateWithConstructableTag02.js]
+var tag;
+(_a = ["Hello world!"], _a.raw = ["Hello world!"], tag(_a));
+var _a;

tests/baselines/reference/taggedTemplateWithConstructableTag02.symbols

@@ -0,0 +1,16 @@
+=== tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag02.ts ===
+interface I {
+>I : Symbol(I, Decl(taggedTemplateWithConstructableTag02.ts, 0, 0))
+
+    new (...args: any[]): string;
+>args : Symbol(args, Decl(taggedTemplateWithConstructableTag02.ts, 1, 9))
+
+    new (): number;
+}
+var tag: I;
+>tag : Symbol(tag, Decl(taggedTemplateWithConstructableTag02.ts, 4, 3))
+>I : Symbol(I, Decl(taggedTemplateWithConstructableTag02.ts, 0, 0))
+
+tag `Hello world!`;
+>tag : Symbol(tag, Decl(taggedTemplateWithConstructableTag02.ts, 4, 3))
+

tests/baselines/reference/taggedTemplateWithConstructableTag02.types

@@ -0,0 +1,18 @@
+=== tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag02.ts ===
+interface I {
+>I : I
+
+    new (...args: any[]): string;
+>args : any[]
+
+    new (): number;
+}
+var tag: I;
+>tag : I
+>I : I
+
+tag `Hello world!`;
+>tag `Hello world!` : any
+>tag : I
+>`Hello world!` : string
+

tests/baselines/reference/umdGlobalConflict.js

@@ -0,0 +1,23 @@
+//// [tests/cases/compiler/umdGlobalConflict.ts] ////
+
+//// [index.d.ts]
+export as namespace Alpha;
+export var x: string;
+
+//// [index.d.ts]
+export as namespace Alpha;
+export var y: number;
+
+//// [consumer.ts]
+import * as v1 from './v1';
+import * as v2 from './v2';
+
+//// [global.ts]
+// Should be OK, first in wins
+const p: string = Alpha.x;
+
+//// [consumer.js]
+"use strict";
+//// [global.js]
+// Should be OK, first in wins
+var p = Alpha.x;

tests/baselines/reference/umdGlobalConflict.symbols

@@ -0,0 +1,29 @@
+=== tests/cases/compiler/v1/index.d.ts ===
+export as namespace Alpha;
+>Alpha : Symbol(Alpha, Decl(index.d.ts, 0, 0))
+
+export var x: string;
+>x : Symbol(x, Decl(index.d.ts, 1, 10))
+
+=== tests/cases/compiler/v2/index.d.ts ===
+export as namespace Alpha;
+>Alpha : Symbol(Alpha, Decl(index.d.ts, 0, 0))
+
+export var y: number;
+>y : Symbol(y, Decl(index.d.ts, 1, 10))
+
+=== tests/cases/compiler/consumer.ts ===
+import * as v1 from './v1';
+>v1 : Symbol(v1, Decl(consumer.ts, 0, 6))
+
+import * as v2 from './v2';
+>v2 : Symbol(v2, Decl(consumer.ts, 1, 6))
+
+=== tests/cases/compiler/global.ts ===
+// Should be OK, first in wins
+const p: string = Alpha.x;
+>p : Symbol(p, Decl(global.ts, 1, 5))
+>Alpha.x : Symbol(Alpha.x, Decl(index.d.ts, 1, 10))
+>Alpha : Symbol(Alpha, Decl(index.d.ts, 0, 0))
+>x : Symbol(Alpha.x, Decl(index.d.ts, 1, 10))
+

tests/baselines/reference/umdGlobalConflict.types

@@ -0,0 +1,29 @@
+=== tests/cases/compiler/v1/index.d.ts ===
+export as namespace Alpha;
+>Alpha : typeof Alpha
+
+export var x: string;
+>x : string
+
+=== tests/cases/compiler/v2/index.d.ts ===
+export as namespace Alpha;
+>Alpha : typeof 
+
+export var y: number;
+>y : number
+
+=== tests/cases/compiler/consumer.ts ===
+import * as v1 from './v1';
+>v1 : typeof v1
+
+import * as v2 from './v2';
+>v2 : typeof v2
+
+=== tests/cases/compiler/global.ts ===
+// Should be OK, first in wins
+const p: string = Alpha.x;
+>p : string
+>Alpha.x : string
+>Alpha : typeof Alpha
+>x : string
+

tests/cases/compiler/noImplicitAnyMissingGetAccessor.ts

@@ -0,0 +1,14 @@
+// @noImplicitAny : true
+// @target: es5
+
+abstract class Parent
+{
+    public abstract set message(str);
+}
+
+class Child extends Parent {
+    _x: any;
+    public set message(str) {
+        this._x = str;
+    }
+}

tests/cases/compiler/noImplicitAnyMissingSetAccessor.ts

@@ -0,0 +1,13 @@
+// @noImplicitAny: true
+// @target: es5
+
+abstract class Parent
+{
+    public abstract get message();
+}
+
+class Child extends Parent {
+    public get message() {
+        return "";
+    }
+}

tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts

@@ -0,0 +1,3 @@
+let x: { foo, bar }
+let y: { foo: number, bar }
+let z: { foo, bar: number }

tests/cases/compiler/umdGlobalConflict.ts

@@ -0,0 +1,15 @@
+//@filename: v1/index.d.ts
+export as namespace Alpha;
+export var x: string;
+
+//@filename: v2/index.d.ts
+export as namespace Alpha;
+export var y: number;
+
+//@filename: consumer.ts
+import * as v1 from './v1';
+import * as v2 from './v2';
+
+//@filename: global.ts
+// Should be OK, first in wins
+const p: string = Alpha.x;

tests/cases/conformance/decorators/class/constructableDecoratorOnClass01.ts

@@ -0,0 +1,8 @@
+// @experimentalDecorators: true
+
+class CtorDtor {}
+
+@CtorDtor
+class C {
+
+}

tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentError.ts

@@ -2,7 +2,7 @@
 var name: string = "my name";
 
 var person: { b: string; id: number } = { name, id };  // error
-var person1: { name, id };  // error: can't use short-hand property assignment in type position
+var person1: { name, id };  // ok
 function foo(name: string, id: number): { id: string, name: number } { return { name, id }; }  // error
 function bar(obj: { name: string; id: boolean }) { }
 bar({ name, id });  // error

tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier.ts

@@ -4,5 +4,5 @@ var name: string = "my name";
 var person: { b: string; id: number } = { name, id };  // error
 function bar(name: string, id: number): { name: number, id: string } { return { name, id }; }  // error
 function foo(name: string, id: number): { name: string, id: number } { return { name, id }; }  // error
-var person1: { name, id };  // error : Can't use shorthand in the type position
-var person2: { name: string, id: number } = bar("hello", 5);
+var person1: { name, id }; // ok
+var person2: { name: string, id: number } = bar("hello", 5);

tests/cases/conformance/es6/templates/taggedTemplateUntypedTagCall01.ts

@@ -0,0 +1,2 @@
+var tag: Function;
+tag `Hello world!`;

tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag01.ts

@@ -0,0 +1,3 @@
+class CtorTag { }
+
+CtorTag `Hello world!`;

tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag02.ts

@@ -0,0 +1,6 @@
+interface I {
+    new (...args: any[]): string;
+    new (): number;
+}
+var tag: I;
+tag `Hello world!`;

tests/cases/fourslash/cloduleAsBaseClass.ts

@@ -23,9 +23,6 @@
 ////d./*1*/
 ////D./*2*/
 
-// this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
-edit.insert('');
-
 goTo.marker('1');
 verify.completionListContains('foo');
 verify.completionListContains('foo2');

tests/cases/fourslash/cloduleAsBaseClass2.ts

@@ -28,9 +28,6 @@
 ////d./*1*/
 ////D./*2*/
 
-// this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
-edit.insert('');
-
 goTo.marker('1');
 verify.completionListContains('foo');
 verify.completionListContains('foo2');

tests/cases/fourslash/cloduleTypeOf1.ts

@@ -14,10 +14,6 @@
 ////    }
 ////}
 
-// this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
-edit.insert('');
-
-
 goTo.marker('1');
 verify.completionListContains('f');
 verify.completionListContains('foo');

tests/cases/fourslash/cloduleWithRecursiveReference.ts

@@ -9,9 +9,6 @@
 ////  }
 ////}
 
-// this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
-edit.insert('');
-
 goTo.marker();
 verify.quickInfoIs('var M.C.C: typeof M.C');
 verify.numberOfErrorsInCurrentFile(0);

tests/cases/fourslash/commentsClass.ts

@@ -58,9 +58,6 @@
 ////}
 ////var myVar = new m.m2.c/*33*/1();
 
-// this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
-edit.insert('');
-
 goTo.marker('1');
 verify.quickInfoIs("class c2", "This is class c2 without constuctor");
 

tests/cases/fourslash/commentsExternalModules.ts

@@ -31,9 +31,6 @@
 /////*10*/extMod./*11*/m1./*12*/fooExp/*13q*/ort(/*13*/);
 ////var new/*14*/Var = new extMod.m1.m2./*15*/c();
 
-// this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
-edit.insert('');
-
 goTo.file("commentsExternalModules_file0.ts");
 goTo.marker('1');
 verify.quickInfoIs("namespace m1", "Namespace comment");

tests/cases/fourslash/commentsMultiModuleMultiFile.ts

@@ -26,8 +26,6 @@
 ////}
 ////new /*7*/mu/*8*/ltiM.d();
 
-// this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
-edit.insert('');
 goTo.marker('1');
 verify.completionListContains("multiM", "namespace multiM", "this is multi declare namespace\nthi is multi namespace 2\nthis is multi namespace 3 comment");
 

tests/cases/fourslash/commentsMultiModuleSingleFile.ts

@@ -16,9 +16,6 @@
 ////new /*1*/mu/*4*/ltiM.b();
 ////new mu/*5*/ltiM.c();
 
-// this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
-edit.insert('');
-
 goTo.marker('1');
 verify.completionListContains("multiM", "namespace multiM", "this is multi declare namespace\nthi is multi namespace 2");