Print pure namespaces as unknown

Author: JsonFreeman

src/compiler/checker.ts

@@ -6916,18 +6916,6 @@ module ts {
                 return getDeclaredTypeOfSymbol(symbol);
             }
 
-            if (node.kind === SyntaxKind.ModuleDeclaration ||
-                node.kind === SyntaxKind.ImportDeclaration) {
-                return unknownType;
-            }
-
-            if (node.parent.kind === SyntaxKind.ModuleDeclaration ||
-                node.parent.kind === SyntaxKind.ImportDeclaration) {
-                if ((<Declaration>node.parent).name === node) {
-                    return unknownType;
-                }
-            }
-
             if (isDeclaration(node)) {
                 // In this case, we call getSymbolOfNode instead of getSymbolInfo because it is a declaration
                 var symbol = getSymbolOfNode(node);

src/harness/typeWriter.ts

@@ -29,7 +29,6 @@ class TypeWriterWalker {
             // old typeWriter baselines, suppress tokens
             case ts.SyntaxKind.ThisKeyword:
             case ts.SyntaxKind.SuperKeyword:
-         //   case ts.SyntaxKind.RegularExpressionLiteral:
             case ts.SyntaxKind.ArrayLiteral:
             case ts.SyntaxKind.ObjectLiteral:
             case ts.SyntaxKind.PropertyAccess:
@@ -79,10 +78,7 @@ class TypeWriterWalker {
         var lineAndCharacter = this.currentSourceFile.getLineAndCharacterFromPosition(actualPos);
         var sourceText = ts.getSourceTextOfNodeFromSourceText(this.currentSourceFile.text, node);
         var isUnknownType = (<ts.IntrinsicType>type).intrinsicName === "unknown";
-        if (isUnknownType) {
-            var symbol = this.checker.getSymbolInfo(node);
-        }
-        else {
+        if (!isUnknownType) {
             var writeArrayAsGenericType = node.kind === ts.SyntaxKind.Identifier && (<ts.Identifier>node).text === "Array" ? ts.TypeFormatFlags.WriteArrayAsGenericType : 0;
         }
 
@@ -94,9 +90,7 @@ class TypeWriterWalker {
             column: lineAndCharacter.character,
             syntaxKind: ts.SyntaxKind[node.kind],
             sourceText: sourceText,
-            type: isUnknownType
-                ? this.checker.symbolToString(symbol, node.parent, ts.SymbolFlags.Value | ts.SymbolFlags.Type | ts.SymbolFlags.Namespace | ts.SymbolFlags.Import)
-                : this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.UseTypeOfFunction | writeArrayAsGenericType)
+            type: this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.UseTypeOfFunction | writeArrayAsGenericType)
         });
     }
 

tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module Point {
->Point : Point
+>Point : typeof Point
 
     export var Origin: { x: number; y: number; }
 >Origin : { x: number; y: number; }

tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types

@@ -1,9 +1,9 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module A {
->A : A
+>A : typeof A
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         export var Origin: {
 >Origin : { x: number; y: number; }
@@ -19,7 +19,7 @@ declare module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/class.d.ts ===
 declare module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point

tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types

@@ -1,9 +1,9 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module A {
->A : A
+>A : typeof A
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         export var Origin: {
 >Origin : { x: number; y: number; }
@@ -19,7 +19,7 @@ declare module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/classPoint.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point

tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module Point {
->Point : Point
+>Point : typeof Point
 
     export var Origin: { x: number; y: number; }
 >Origin : { x: number; y: number; }

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types

@@ -15,15 +15,15 @@ class Point {
 }
 
 module Point {
->Point : Point
+>Point : typeof Point
 
     function Origin() { return ""; }// not an error, since not exported
 >Origin : typeof Origin
 }
 
 
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
@@ -41,7 +41,7 @@ module A {
     }
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         function Origin() { return ""; }// not an error since not exported
 >Origin : typeof Origin

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types

@@ -15,15 +15,15 @@ class Point {
 }
 
 module Point {
->Point : Point
+>Point : typeof Point
 
     var Origin = ""; // not an error, since not exported
 >Origin : string
 }
 
 
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
@@ -41,7 +41,7 @@ module A {
     }
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         var Origin = ""; // not an error since not exported
 >Origin : string

tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types

@@ -8,7 +8,7 @@ enum enumdule {
 }
 
 module enumdule {
->enumdule : enumdule
+>enumdule : typeof enumdule
 
     export class Point {
 >Point : Point

tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types

@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts ===
 module A {
->A : A
+>A : typeof A
 
     interface Point {
 >Point : Point