Merge branch 'master' into typeWriter

Author: CyrusNajmabadi

src/harness/typeWriter.ts

@@ -49,10 +49,10 @@ class TypeWriterWalker {
             var symbolString = "Symbol(" + this.checker.symbolToString(symbol, node.parent);
             if (symbol.declarations) {
                 for (let declaration of symbol.declarations) {
-                    symbolString += ",";
+                    symbolString += ", ";
                     let declSourceFile = declaration.getSourceFile();
                     let declLineAndCharacter = declSourceFile.getLineAndCharacterOfPosition(declaration.pos);
-                    symbolString += `Decl(${ ts.getBaseFileName(declSourceFile.fileName) },${ declLineAndCharacter.line },${ declLineAndCharacter.character })`
+                    symbolString += `Decl(${ ts.getBaseFileName(declSourceFile.fileName) }, ${ declLineAndCharacter.line }, ${ declLineAndCharacter.character })`
                 }
             }
             symbolString += ")";

src/services/services.ts

@@ -3793,6 +3793,10 @@ module ts {
                 return undefined;
             }
 
+            if (isLabelName(node)) {
+                return undefined;
+            }
+
             let symbol = typeInfoResolver.getSymbolAtLocation(node);
             if (!symbol) {
                 // Try getting just type at this position and show

tests/baselines/reference/2dArrays.types

@@ -1,40 +1,40 @@
 === tests/cases/compiler/2dArrays.ts ===
 class Cell {
->Cell : Cell, Symbol(Cell,Decl(2dArrays.ts,0,0))
+>Cell : Cell, Symbol(Cell, Decl(2dArrays.ts, 0, 0))
 }
 
 class Ship {
->Ship : Ship, Symbol(Ship,Decl(2dArrays.ts,1,1))
+>Ship : Ship, Symbol(Ship, Decl(2dArrays.ts, 1, 1))
 
     isSunk: boolean;
->isSunk : boolean, Symbol(isSunk,Decl(2dArrays.ts,3,12))
+>isSunk : boolean, Symbol(isSunk, Decl(2dArrays.ts, 3, 12))
 }
 
 class Board {
->Board : Board, Symbol(Board,Decl(2dArrays.ts,5,1))
+>Board : Board, Symbol(Board, Decl(2dArrays.ts, 5, 1))
 
     ships: Ship[];
->ships : Ship[], Symbol(ships,Decl(2dArrays.ts,7,13))
->Ship : Ship, Symbol(Ship,Decl(2dArrays.ts,1,1))
+>ships : Ship[], Symbol(ships, Decl(2dArrays.ts, 7, 13))
+>Ship : Ship, Symbol(Ship, Decl(2dArrays.ts, 1, 1))
 
     cells: Cell[];
->cells : Cell[], Symbol(cells,Decl(2dArrays.ts,8,18))
->Cell : Cell, Symbol(Cell,Decl(2dArrays.ts,0,0))
+>cells : Cell[], Symbol(cells, Decl(2dArrays.ts, 8, 18))
+>Cell : Cell, Symbol(Cell, Decl(2dArrays.ts, 0, 0))
 
     private allShipsSunk() {
->allShipsSunk : () => boolean, Symbol(allShipsSunk,Decl(2dArrays.ts,9,18))
+>allShipsSunk : () => boolean, Symbol(allShipsSunk, Decl(2dArrays.ts, 9, 18))
 
         return this.ships.every(function (val) { return val.isSunk; });
 >this.ships.every(function (val) { return val.isSunk; }) : boolean
->this.ships.every : (callbackfn: (value: Ship, index: number, array: Ship[]) => boolean, thisArg?: any) => boolean, Symbol(Array.every,Decl(lib.d.ts,1094,62))
->this.ships : Ship[], Symbol(ships,Decl(2dArrays.ts,7,13))
->this : Board, Symbol(Board,Decl(2dArrays.ts,5,1))
->ships : Ship[], Symbol(ships,Decl(2dArrays.ts,7,13))
->every : (callbackfn: (value: Ship, index: number, array: Ship[]) => boolean, thisArg?: any) => boolean, Symbol(Array.every,Decl(lib.d.ts,1094,62))
+>this.ships.every : (callbackfn: (value: Ship, index: number, array: Ship[]) => boolean, thisArg?: any) => boolean, Symbol(Array.every, Decl(lib.d.ts, 1094, 62))
+>this.ships : Ship[], Symbol(ships, Decl(2dArrays.ts, 7, 13))
+>this : Board, Symbol(Board, Decl(2dArrays.ts, 5, 1))
+>ships : Ship[], Symbol(ships, Decl(2dArrays.ts, 7, 13))
+>every : (callbackfn: (value: Ship, index: number, array: Ship[]) => boolean, thisArg?: any) => boolean, Symbol(Array.every, Decl(lib.d.ts, 1094, 62))
 >function (val) { return val.isSunk; } : (val: Ship) => boolean
->val : Ship, Symbol(val,Decl(2dArrays.ts,12,42))
->val.isSunk : boolean, Symbol(Ship.isSunk,Decl(2dArrays.ts,3,12))
->val : Ship, Symbol(val,Decl(2dArrays.ts,12,42))
->isSunk : boolean, Symbol(Ship.isSunk,Decl(2dArrays.ts,3,12))
+>val : Ship, Symbol(val, Decl(2dArrays.ts, 12, 42))
+>val.isSunk : boolean, Symbol(Ship.isSunk, Decl(2dArrays.ts, 3, 12))
+>val : Ship, Symbol(val, Decl(2dArrays.ts, 12, 42))
+>isSunk : boolean, Symbol(Ship.isSunk, Decl(2dArrays.ts, 3, 12))
     }    
 }

tests/baselines/reference/APISample_compile.types

@@ -7,38 +7,38 @@
  */
 
 declare var console: any;
->console : any, Symbol(console,Decl(APISample_transform.ts,7,11))
+>console : any, Symbol(console, Decl(APISample_transform.ts, 7, 11))
 
 import * as ts from "typescript";
->ts : typeof ts, Symbol(ts,Decl(APISample_transform.ts,9,6))
+>ts : typeof ts, Symbol(ts, Decl(APISample_transform.ts, 9, 6))
 
 const source = "let x: string  = 'string'";
->source : string, Symbol(source,Decl(APISample_transform.ts,11,5))
+>source : string, Symbol(source, Decl(APISample_transform.ts, 11, 5))
 >"let x: string  = 'string'" : string
 
 let result = ts.transpile(source, { module: ts.ModuleKind.CommonJS });
->result : string, Symbol(result,Decl(APISample_transform.ts,13,3))
+>result : string, Symbol(result, Decl(APISample_transform.ts, 13, 3))
 >ts.transpile(source, { module: ts.ModuleKind.CommonJS }) : string
->ts.transpile : (input: string, compilerOptions?: ts.CompilerOptions, fileName?: string, diagnostics?: ts.Diagnostic[]) => string, Symbol(ts.transpile,Decl(typescript.d.ts,1729,5))
->ts : typeof ts, Symbol(ts,Decl(APISample_transform.ts,9,6))
->transpile : (input: string, compilerOptions?: ts.CompilerOptions, fileName?: string, diagnostics?: ts.Diagnostic[]) => string, Symbol(ts.transpile,Decl(typescript.d.ts,1729,5))
->source : string, Symbol(source,Decl(APISample_transform.ts,11,5))
+>ts.transpile : (input: string, compilerOptions?: ts.CompilerOptions, fileName?: string, diagnostics?: ts.Diagnostic[]) => string, Symbol(ts.transpile, Decl(typescript.d.ts, 1729, 5))
+>ts : typeof ts, Symbol(ts, Decl(APISample_transform.ts, 9, 6))
+>transpile : (input: string, compilerOptions?: ts.CompilerOptions, fileName?: string, diagnostics?: ts.Diagnostic[]) => string, Symbol(ts.transpile, Decl(typescript.d.ts, 1729, 5))
+>source : string, Symbol(source, Decl(APISample_transform.ts, 11, 5))
 >{ module: ts.ModuleKind.CommonJS } : { [x: string]: ts.ModuleKind; module: ts.ModuleKind; }
->module : ts.ModuleKind, Symbol(module,Decl(APISample_transform.ts,13,35))
->ts.ModuleKind.CommonJS : ts.ModuleKind, Symbol(ts.ModuleKind.CommonJS,Decl(typescript.d.ts,1108,17))
->ts.ModuleKind : typeof ts.ModuleKind, Symbol(ts.ModuleKind,Decl(typescript.d.ts,1106,5))
->ts : typeof ts, Symbol(ts,Decl(APISample_transform.ts,9,6))
->ModuleKind : typeof ts.ModuleKind, Symbol(ts.ModuleKind,Decl(typescript.d.ts,1106,5))
->CommonJS : ts.ModuleKind, Symbol(ts.ModuleKind.CommonJS,Decl(typescript.d.ts,1108,17))
+>module : ts.ModuleKind, Symbol(module, Decl(APISample_transform.ts, 13, 35))
+>ts.ModuleKind.CommonJS : ts.ModuleKind, Symbol(ts.ModuleKind.CommonJS, Decl(typescript.d.ts, 1108, 17))
+>ts.ModuleKind : typeof ts.ModuleKind, Symbol(ts.ModuleKind, Decl(typescript.d.ts, 1106, 5))
+>ts : typeof ts, Symbol(ts, Decl(APISample_transform.ts, 9, 6))
+>ModuleKind : typeof ts.ModuleKind, Symbol(ts.ModuleKind, Decl(typescript.d.ts, 1106, 5))
+>CommonJS : ts.ModuleKind, Symbol(ts.ModuleKind.CommonJS, Decl(typescript.d.ts, 1108, 17))
 
 console.log(JSON.stringify(result));
 >console.log(JSON.stringify(result)) : any
 >console.log : any
->console : any, Symbol(console,Decl(APISample_transform.ts,7,11))
+>console : any, Symbol(console, Decl(APISample_transform.ts, 7, 11))
 >log : any
 >JSON.stringify(result) : string
->JSON.stringify : { (value: any): string; (value: any, replacer: (key: string, value: any) => any): string; (value: any, replacer: any[]): string; (value: any, replacer: (key: string, value: any) => any, space: any): string; (value: any, replacer: any[], space: any): string; }, Symbol(JSON.stringify,Decl(lib.d.ts,964,70),Decl(lib.d.ts,969,34),Decl(lib.d.ts,975,78),Decl(lib.d.ts,981,51),Decl(lib.d.ts,988,90))
->JSON : JSON, Symbol(JSON,Decl(lib.d.ts,955,42),Decl(lib.d.ts,1000,11))
->stringify : { (value: any): string; (value: any, replacer: (key: string, value: any) => any): string; (value: any, replacer: any[]): string; (value: any, replacer: (key: string, value: any) => any, space: any): string; (value: any, replacer: any[], space: any): string; }, Symbol(JSON.stringify,Decl(lib.d.ts,964,70),Decl(lib.d.ts,969,34),Decl(lib.d.ts,975,78),Decl(lib.d.ts,981,51),Decl(lib.d.ts,988,90))
->result : string, Symbol(result,Decl(APISample_transform.ts,13,3))
+>JSON.stringify : { (value: any): string; (value: any, replacer: (key: string, value: any) => any): string; (value: any, replacer: any[]): string; (value: any, replacer: (key: string, value: any) => any, space: any): string; (value: any, replacer: any[], space: any): string; }, Symbol(JSON.stringify, Decl(lib.d.ts, 964, 70), Decl(lib.d.ts, 969, 34), Decl(lib.d.ts, 975, 78), Decl(lib.d.ts, 981, 51), Decl(lib.d.ts, 988, 90))
+>JSON : JSON, Symbol(JSON, Decl(lib.d.ts, 955, 42), Decl(lib.d.ts, 1000, 11))
+>stringify : { (value: any): string; (value: any, replacer: (key: string, value: any) => any): string; (value: any, replacer: any[]): string; (value: any, replacer: (key: string, value: any) => any, space: any): string; (value: any, replacer: any[], space: any): string; }, Symbol(JSON.stringify, Decl(lib.d.ts, 964, 70), Decl(lib.d.ts, 969, 34), Decl(lib.d.ts, 975, 78), Decl(lib.d.ts, 981, 51), Decl(lib.d.ts, 988, 90))
+>result : string, Symbol(result, Decl(APISample_transform.ts, 13, 3))