Show the type information in places where there is no symbol associated

sheetalkamat · sheetalkamat · commit 61994a7e62c3 · 2014-10-03T15:50:38.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -1071,7 +1071,9 @@ module ts {
 
             function writeType(type: Type, flags: TypeFormatFlags) {
                 if (type.flags & TypeFlags.Intrinsic) {
-                    writer.writeKind((<IntrinsicType>type).intrinsicName, SymbolDisplayPartKind.keyword);
+                    // Special handling for unknown / resolving types, they should show up as any and not unknown or __resolving
+                    writer.writeKind(!(flags & TypeFormatFlags.WriteOwnNameForAnyLike) && 
+                        (type.flags & TypeFlags.Any) ? "any" : (<IntrinsicType>type).intrinsicName, SymbolDisplayPartKind.keyword);
                 }
                 else if (type.flags & TypeFlags.Reference) {
                     writeTypeReference(<TypeReference>type);
@@ -6953,19 +6955,6 @@ module ts {
             return findChildAtPosition(sourceFile);
         }
 
-        function isInsideWithStatementBody(node: Node): boolean {
-            if (node) {
-                while (node.parent) {
-                    if (node.parent.kind === SyntaxKind.WithStatement && (<WithStatement>node.parent).statement === node) {
-                        return true;
-                    }
-                    node = node.parent;
-                }
-            }
-
-            return false;
-        }
-
         function getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[]{
             var symbols: SymbolTable = {};
             var memberFlags: NodeFlags = 0;
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -166,6 +166,19 @@ module ts {
         }
     }
 
+    export function isInsideWithStatementBody(node: Node): boolean {
+        if (node) {
+            while (node.parent) {
+                if (node.parent.kind === SyntaxKind.WithStatement && (<WithStatement>node.parent).statement === node) {
+                    return true;
+                }
+                node = node.parent;
+            }
+        }
+
+        return false;
+    }
+
     export var fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/
 
     // Invokes a callback for each child of the given node. The 'cbNode' callback is invoked for all child nodes
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -683,6 +683,7 @@ module ts {
         UseTypeOfFunction       = 0x00000002,  // Write typeof instead of function type literal
         NoTruncation            = 0x00000004,  // Don't truncate typeToString result
         WriteArrowStyleSignature= 0x00000008,  // Write arrow style signature
+        WriteOwnNameForAnyLike  = 0x00000010,  // Write symbol's own name instead of 'any' for any like types (eg. unknown, __resolving__ etc)
     }
 
     export enum SymbolFormatFlags {
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
@@ -86,7 +86,7 @@ class TypeWriterWalker {
             column: lineAndCharacter.character,
             syntaxKind: ts.SyntaxKind[node.kind],
             sourceText: sourceText,
-            type: this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.NoTruncation)
+            type: this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.NoTruncation | ts.TypeFormatFlags.WriteOwnNameForAnyLike)
         });
     }
 
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -2945,6 +2945,29 @@ module ts {
 
             var symbol = typeInfoResolver.getSymbolInfo(node);
             if (!symbol) {
+                
+                // Try getting just type at this position and show
+                switch (node.kind) {
+                    case SyntaxKind.Identifier:
+                    case SyntaxKind.PropertyAccess:
+                    case SyntaxKind.QualifiedName:
+                    case SyntaxKind.ThisKeyword:
+                    case SyntaxKind.SuperKeyword:
+                        // For the identifiers/this/usper etc get the type at position if not inside if statement
+                        if (!isInsideWithStatementBody(node)) {
+                            var type = typeInfoResolver.getTypeOfNode(node);
+                            if (type) {
+                                return {
+                                    kind: ScriptElementKind.unknown,
+                                    kindModifiers: ScriptElementKindModifier.none,
+                                    textSpan: new TypeScript.TextSpan(node.getStart(), node.getWidth()),
+                                    displayParts: typeToDisplayParts(typeInfoResolver, type, getContainerNode(node), TypeFormatFlags.NoTruncation),
+                                    documentation: type.symbol ? type.symbol.getDocumentationComment() : undefined
+                                };
+                            }
+                        }
+                }
+
                 return undefined;
             }
 
diff --git a/tests/baselines/reference/constructorOverloads1.errors.txt b/tests/baselines/reference/constructorOverloads1.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/constructorOverloads1.ts(7,5): error TS2392: Multiple constructor implementations are not allowed.
 tests/cases/compiler/constructorOverloads1.ts(16,18): error TS2345: Argument of type 'Foo' is not assignable to parameter of type 'number'.
-tests/cases/compiler/constructorOverloads1.ts(17,18): error TS2345: Argument of type 'unknown[]' is not assignable to parameter of type 'number'.
+tests/cases/compiler/constructorOverloads1.ts(17,18): error TS2345: Argument of type 'any[]' is not assignable to parameter of type 'number'.
 
 
 ==== tests/cases/compiler/constructorOverloads1.ts (3 errors) ====
@@ -28,7 +28,7 @@ tests/cases/compiler/constructorOverloads1.ts(17,18): error TS2345: Argument of
 !!! error TS2345: Argument of type 'Foo' is not assignable to parameter of type 'number'.
     var f4 = new Foo([f1,f2,f3]);
                      ~~~~~~~~~~
-!!! error TS2345: Argument of type 'unknown[]' is not assignable to parameter of type 'number'.
+!!! error TS2345: Argument of type 'any[]' is not assignable to parameter of type 'number'.
     
     f1.bar1();
     f1.bar2();
diff --git a/tests/baselines/reference/genericConstraint2.errors.txt b/tests/baselines/reference/genericConstraint2.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/genericConstraint2.ts(5,18): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list.
 tests/cases/compiler/genericConstraint2.ts(11,7): error TS2421: Class 'ComparableString' incorrectly implements interface 'Comparable<string>':
   Property 'comparer' is missing in type 'ComparableString'.
-tests/cases/compiler/genericConstraint2.ts(21,17): error TS2343: Type 'ComparableString' does not satisfy the constraint 'Comparable<unknown>':
+tests/cases/compiler/genericConstraint2.ts(21,17): error TS2343: Type 'ComparableString' does not satisfy the constraint 'Comparable<any>':
   Property 'comparer' is missing in type 'ComparableString'.
 
 
@@ -33,5 +33,5 @@ tests/cases/compiler/genericConstraint2.ts(21,17): error TS2343: Type 'Comparabl
     var b = new ComparableString("b");
     var c = compare<ComparableString>(a, b);
                     ~~~~~~~~~~~~~~~~
-!!! error TS2343: Type 'ComparableString' does not satisfy the constraint 'Comparable<unknown>':
+!!! error TS2343: Type 'ComparableString' does not satisfy the constraint 'Comparable<any>':
 !!! error TS2343:   Property 'comparer' is missing in type 'ComparableString'.
diff --git a/tests/baselines/reference/lambdaArgCrash.errors.txt b/tests/baselines/reference/lambdaArgCrash.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/lambdaArgCrash.ts(27,25): error TS2304: Cannot find name 'ItemSet'.
-tests/cases/compiler/lambdaArgCrash.ts(29,14): error TS2345: Argument of type '(items: unknown) => void' is not assignable to parameter of type '() => any'.
+tests/cases/compiler/lambdaArgCrash.ts(29,14): error TS2345: Argument of type '(items: any) => void' is not assignable to parameter of type '() => any'.
 
 
 ==== tests/cases/compiler/lambdaArgCrash.ts (2 errors) ====
@@ -35,7 +35,7 @@ tests/cases/compiler/lambdaArgCrash.ts(29,14): error TS2345: Argument of type '(
     
     	 	super.add(listener);
     	 	          ~~~~~~~~
-!!! error TS2345: Argument of type '(items: unknown) => void' is not assignable to parameter of type '() => any'.
+!!! error TS2345: Argument of type '(items: any) => void' is not assignable to parameter of type '() => any'.
     
     	}
     
diff --git a/tests/baselines/reference/maxConstraints.errors.txt b/tests/baselines/reference/maxConstraints.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/maxConstraints.ts(5,6): error TS2313: Constraint of a type parameter cannot reference any type parameter from the same type parameter list.
-tests/cases/compiler/maxConstraints.ts(8,22): error TS2345: Argument of type 'number' is not assignable to parameter of type 'Comparable<unknown>'.
+tests/cases/compiler/maxConstraints.ts(8,22): error TS2345: Argument of type 'number' is not assignable to parameter of type 'Comparable<any>'.
 
 
 ==== tests/cases/compiler/maxConstraints.ts (2 errors) ====
@@ -14,4 +14,4 @@ tests/cases/compiler/maxConstraints.ts(8,22): error TS2345: Argument of type 'nu
     var max2: Comparer = (x, y) => { return (x.compareTo(y) > 0) ? x : y };
     var maxResult = max2(1, 2);
                          ~
-!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'Comparable<unknown>'.
+!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'Comparable<any>'.
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.errors.txt b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.errors.txt
@@ -10,7 +10,7 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerCo
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(55,5): error TS2412: Property '"4.0"' of type 'number' is not assignable to numeric index type 'string'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(68,5): error TS2412: Property '2.0' of type 'number' is not assignable to numeric index type 'string'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(73,5): error TS2412: Property '"4.0"' of type 'number' is not assignable to numeric index type 'string'.
-tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(78,5): error TS2322: Type '{ [x: number]: {}; 1.0: string; 2.0: number; a: string; b: number; c: () => void; "d": string; "e": number; "3.0": string; "4.0": number; f: unknown; X: string; foo: () => string; }' is not assignable to type '{ [x: number]: string; }':
+tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(78,5): error TS2322: Type '{ [x: number]: {}; 1.0: string; 2.0: number; a: string; b: number; c: () => void; "d": string; "e": number; "3.0": string; "4.0": number; f: any; X: string; foo: () => string; }' is not assignable to type '{ [x: number]: string; }':
   Index signatures are incompatible:
     Type '{}' is not assignable to type 'string'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(88,9): error TS2304: Cannot find name 'Myn'.
@@ -116,7 +116,7 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerCo
     // error
     var b: { [x: number]: string; } = {
         ~
-!!! error TS2322: Type '{ [x: number]: {}; 1.0: string; 2.0: number; a: string; b: number; c: () => void; "d": string; "e": number; "3.0": string; "4.0": number; f: unknown; X: string; foo: () => string; }' is not assignable to type '{ [x: number]: string; }':
+!!! error TS2322: Type '{ [x: number]: {}; 1.0: string; 2.0: number; a: string; b: number; c: () => void; "d": string; "e": number; "3.0": string; "4.0": number; f: any; X: string; foo: () => string; }' is not assignable to type '{ [x: number]: string; }':
 !!! error TS2322:   Index signatures are incompatible:
 !!! error TS2322:     Type '{}' is not assignable to type 'string'.
         a: '',
diff --git a/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt b/tests/baselines/reference/overloadsWithProvisionalErrors.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/overloadsWithProvisionalErrors.ts(6,6): error TS2345: Argument of type '(s: string) => {}' is not assignable to parameter of type '(s: string) => { a: number; b: number; }'.
 tests/cases/compiler/overloadsWithProvisionalErrors.ts(7,17): error TS2304: Cannot find name 'blah'.
-tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,6): error TS2345: Argument of type '(s: string) => { a: unknown; }' is not assignable to parameter of type '(s: string) => { a: number; b: number; }'.
+tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,6): error TS2345: Argument of type '(s: string) => { a: any; }' is not assignable to parameter of type '(s: string) => { a: number; b: number; }'.
 tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,17): error TS2304: Cannot find name 'blah'.
 
 
@@ -18,6 +18,6 @@ tests/cases/compiler/overloadsWithProvisionalErrors.ts(8,17): error TS2304: Cann
 !!! error TS2304: Cannot find name 'blah'.
     func(s => ({ a: blah })); // Two errors here, one for blah not being defined, and one for the overload since it would not be applicable anyway
          ~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '(s: string) => { a: unknown; }' is not assignable to parameter of type '(s: string) => { a: number; b: number; }'.
+!!! error TS2345: Argument of type '(s: string) => { a: any; }' is not assignable to parameter of type '(s: string) => { a: number; b: number; }'.
                     ~~~~
 !!! error TS2304: Cannot find name 'blah'.
diff --git a/tests/baselines/reference/undeclaredModuleError.errors.txt b/tests/baselines/reference/undeclaredModuleError.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/undeclaredModuleError.ts(1,21): error TS2307: Cannot find external module 'fs'.
-tests/cases/compiler/undeclaredModuleError.ts(8,29): error TS2345: Argument of type '() => void' is not assignable to parameter of type '(stat: unknown, name: string) => boolean'.
+tests/cases/compiler/undeclaredModuleError.ts(8,29): error TS2345: Argument of type '() => void' is not assignable to parameter of type '(stat: any, name: string) => boolean'.
 tests/cases/compiler/undeclaredModuleError.ts(11,41): error TS2304: Cannot find name 'IDoNotExist'.
 
 
@@ -17,7 +17,7 @@ tests/cases/compiler/undeclaredModuleError.ts(11,41): error TS2304: Cannot find
                                 ~~~~~~~
             } , (error: Error, files: {}[]) => {
     ~~~~~~~~~
-!!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '(stat: unknown, name: string) => boolean'.
+!!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '(stat: any, name: string) => boolean'.
                     files.forEach((file) => {
                         var fullPath = join(IDoNotExist);
                                             ~~~~~~~~~~~
diff --git a/tests/cases/fourslash/quickInfoOnMergedInterfacesWithIncrementalEdits.ts b/tests/cases/fourslash/quickInfoOnMergedInterfacesWithIncrementalEdits.ts
@@ -18,7 +18,7 @@ goTo.marker('1');
 verify.quickInfoIs("(property) B<T>.bar: string", undefined);
 edit.deleteAtCaret(1);
 edit.insert('z');
-verify.not.quickInfoExists();
+verify.quickInfoIs("any");
 verify.numberOfErrorsInCurrentFile(1);
 edit.backspace(1);
 edit.insert('a');
diff --git a/tests/cases/fourslash/quickInfoOnThis.ts b/tests/cases/fourslash/quickInfoOnThis.ts

Original file line number	Diff line number	Diff line change
`@@ -683,6 +683,7 @@ module ts {`
`683`	`683`	`UseTypeOfFunction = 0x00000002, // Write typeof instead of function type literal`
`684`	`684`	`NoTruncation = 0x00000004, // Don't truncate typeToString result`
`685`	`685`	`WriteArrowStyleSignature= 0x00000008, // Write arrow style signature`
	`686`	`+ WriteOwnNameForAnyLike = 0x00000010, // Write symbol's own name instead of 'any' for any like types (eg. unknown, __resolving__ etc)`
`686`	`687`	`}`
`687`	`688`
`688`	`689`	`export enum SymbolFormatFlags {`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class TypeWriterWalker {`
`86`	`86`	`column: lineAndCharacter.character,`
`87`	`87`	`syntaxKind: ts.SyntaxKind[node.kind],`
`88`	`88`	`sourceText: sourceText,`
`89`		`- type: this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.NoTruncation)`
	`89`	`+ type: this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.NoTruncation \| ts.TypeFormatFlags.WriteOwnNameForAnyLike)`
`90`	`90`	`});`
`91`	`91`	`}`
`92`	`92`