Simplify typewriter code.

Author: CyrusNajmabadi

src/harness/typeWriter.ts

@@ -29,68 +29,13 @@ class TypeWriterWalker {
     }
 
     private visitNode(node: ts.Node): void {
-        switch (node.kind) {
-            // Should always log expressions that are not tokens
-            // Also, always log the "this" keyword
-            // TODO: Ideally we should log all expressions, but to compare to the
-            // old typeWriter baselines, suppress tokens
-            case ts.SyntaxKind.ThisKeyword:
-            case ts.SyntaxKind.SuperKeyword:
-            case ts.SyntaxKind.ArrayLiteralExpression:
-            case ts.SyntaxKind.ObjectLiteralExpression:
-            case ts.SyntaxKind.ElementAccessExpression:
-            case ts.SyntaxKind.CallExpression:
-            case ts.SyntaxKind.NewExpression:
-            case ts.SyntaxKind.TypeAssertionExpression:
-            case ts.SyntaxKind.ParenthesizedExpression:
-            case ts.SyntaxKind.FunctionExpression:
-            case ts.SyntaxKind.ArrowFunction:
-            case ts.SyntaxKind.TypeOfExpression:
-            case ts.SyntaxKind.VoidExpression:
-            case ts.SyntaxKind.DeleteExpression:
-            case ts.SyntaxKind.PrefixUnaryExpression:
-            case ts.SyntaxKind.PostfixUnaryExpression:
-            case ts.SyntaxKind.BinaryExpression:
-            case ts.SyntaxKind.ConditionalExpression:
-            case ts.SyntaxKind.SpreadElementExpression:
-                this.log(node, this.getTypeOfNode(node));
-                break;
-
-            case ts.SyntaxKind.PropertyAccessExpression:
-                for (var current = node; current.kind === ts.SyntaxKind.PropertyAccessExpression; current = current.parent) {
-                }
-                if (current.kind !== ts.SyntaxKind.HeritageClauseElement) {
-                    this.log(node, this.getTypeOfNode(node));
-                }
-                break;
-
-            // Should not change expression status (maybe expressions)
-            // TODO: Again, ideally should log number and string literals too,
-            // but to be consistent with the old typeWriter, just log identifiers
-            case ts.SyntaxKind.Identifier:
-                var identifier = <ts.Identifier>node;
-                if (!this.isLabel(identifier)) {
-                    var type = this.getTypeOfNode(identifier);
-                    this.log(node, type);
-                }
-                break;
+        if (ts.isExpression(node) || node.kind === ts.SyntaxKind.Identifier) {
+            this.log(node, this.getTypeOfNode(node));
         }
 
         ts.forEachChild(node, child => this.visitNode(child));
     }
 
-    private isLabel(identifier: ts.Identifier): boolean {
-        var parent = identifier.parent;
-        switch (parent.kind) {
-            case ts.SyntaxKind.ContinueStatement:
-            case ts.SyntaxKind.BreakStatement:
-                return (<ts.BreakOrContinueStatement>parent).label === identifier;
-            case ts.SyntaxKind.LabeledStatement:
-                return (<ts.LabeledStatement>parent).label === identifier;
-        }
-        return false;
-    }
-
     private log(node: ts.Node, type: ts.Type): void {
         var actualPos = ts.skipTrivia(this.currentSourceFile.text, node.pos);
         var lineAndCharacter = this.currentSourceFile.getLineAndCharacterOfPosition(actualPos);

tests/baselines/reference/APISample_compile.types

@@ -85,21 +85,25 @@ export function compile(fileNames: string[], options: ts.CompilerOptions): void
 >diagnostic.messageText : string | ts.DiagnosticMessageChain
 >diagnostic : ts.Diagnostic
 >messageText : string | ts.DiagnosticMessageChain
+>'\n' : string
 
         console.log(`${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`);
 >console.log(`${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`) : any
 >console.log : any
 >console : any
 >log : any
+>`${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}` : string
 >diagnostic.file.fileName : string
 >diagnostic.file : ts.SourceFile
 >diagnostic : ts.Diagnostic
 >file : ts.SourceFile
 >fileName : string
 >line + 1 : number
 >line : number
+>1 : number
 >character + 1 : number
 >character : number
+>1 : number
 >message : string
 
     });
@@ -110,12 +114,15 @@ export function compile(fileNames: string[], options: ts.CompilerOptions): void
 >emitResult.emitSkipped : boolean
 >emitResult : ts.EmitResult
 >emitSkipped : boolean
+>1 : number
+>0 : number
 
     console.log(`Process exiting with code '${exitCode}'.`);
 >console.log(`Process exiting with code '${exitCode}'.`) : any
 >console.log : any
 >console : any
 >log : any
+>`Process exiting with code '${exitCode}'.` : string
 >exitCode : number
 
     process.exit(exitCode);
@@ -135,11 +142,14 @@ compile(process.argv.slice(2), {
 >process : any
 >argv : any
 >slice : any
+>2 : number
 >{    noEmitOnError: true, noImplicitAny: true,    target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS} : { [x: string]: boolean | ts.ScriptTarget | ts.ModuleKind; noEmitOnError: boolean; noImplicitAny: boolean; target: ts.ScriptTarget; module: ts.ModuleKind; }
 
     noEmitOnError: true, noImplicitAny: true,
 >noEmitOnError : boolean
+>true : boolean
 >noImplicitAny : boolean
+>true : boolean
 
     target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS
 >target : ts.ScriptTarget

tests/baselines/reference/APISample_linter.types

@@ -89,6 +89,7 @@ export function delint(sourceFile: ts.SourceFile) {
 >report(node, "A looping statement's contents should be wrapped in a block body.") : void
 >report : (node: ts.Node, message: string) => void
 >node : ts.Node
+>"A looping statement's contents should be wrapped in a block body." : string
                 }
                 break;
 
@@ -126,6 +127,7 @@ export function delint(sourceFile: ts.SourceFile) {
 >ifStatement.thenStatement : ts.Statement
 >ifStatement : ts.IfStatement
 >thenStatement : ts.Statement
+>"An if statement's contents should be wrapped in a block body." : string
                 }
                 if (ifStatement.elseStatement &&
 >ifStatement.elseStatement &&                    ifStatement.elseStatement.kind !== ts.SyntaxKind.Block &&                    ifStatement.elseStatement.kind !== ts.SyntaxKind.IfStatement : boolean
@@ -166,6 +168,7 @@ export function delint(sourceFile: ts.SourceFile) {
 >ifStatement.elseStatement : ts.Statement
 >ifStatement : ts.IfStatement
 >elseStatement : ts.Statement
+>"An else statement's contents should be wrapped in a block body." : string
                 }
                 break;
 
@@ -209,6 +212,7 @@ export function delint(sourceFile: ts.SourceFile) {
 >report(node, "Use '===' and '!=='.") : void
 >report : (node: ts.Node, message: string) => void
 >node : ts.Node
+>"Use '===' and '!=='." : string
                 }
                 break;
         }
@@ -246,13 +250,16 @@ export function delint(sourceFile: ts.SourceFile) {
 >console.log : any
 >console : any
 >log : any
+>`${sourceFile.fileName} (${line + 1},${character + 1}): ${message}` : string
 >sourceFile.fileName : string
 >sourceFile : ts.SourceFile
 >fileName : string
 >line + 1 : number
 >line : number
+>1 : number
 >character + 1 : number
 >character : number
+>1 : number
 >message : string
     }
 }
@@ -265,6 +272,7 @@ const fileNames = process.argv.slice(2);
 >process : any
 >argv : any
 >slice : any
+>2 : number
 
 fileNames.forEach(fileName => {
 >fileNames.forEach(fileName => {    // Parse a file    let sourceFile = ts.createSourceFile(fileName, readFileSync(fileName).toString(), ts.ScriptTarget.ES6, /*setParentNodes */ true);    // delint it    delint(sourceFile);}) : any
@@ -293,6 +301,7 @@ fileNames.forEach(fileName => {
 >ts : typeof ts
 >ScriptTarget : typeof ts.ScriptTarget
 >ES6 : ts.ScriptTarget
+>true : boolean
 
     // delint it
     delint(sourceFile);

tests/baselines/reference/APISample_transform.types

@@ -14,6 +14,7 @@ import * as ts from "typescript";
 
 const source = "let x: string  = 'string'";
 >source : string
+>"let x: string  = 'string'" : string
 
 let result = ts.transpile(source, { module: ts.ModuleKind.CommonJS });
 >result : string

tests/baselines/reference/APISample_watcher.types

@@ -51,6 +51,7 @@ function watch(rootFileNames: string[], options: ts.CompilerOptions) {
 >fileName : string
 >{ version: 0 } : { version: number; }
 >version : number
+>0 : number
 
     });
 
@@ -181,7 +182,9 @@ function watch(rootFileNames: string[], options: ts.CompilerOptions) {
             { persistent: true, interval: 250 },
 >{ persistent: true, interval: 250 } : { persistent: boolean; interval: number; }
 >persistent : boolean
+>true : boolean
 >interval : number
+>250 : number
 
             (curr, prev) => {
 >(curr, prev) => {                // Check timestamp                if (+curr.mtime <= +prev.mtime) {                    return;                }                // Update the version to signal a change in the file                files[fileName].version++;                // write the changes to disk                emitFile(fileName);            } : (curr: any, prev: any) => void
@@ -244,6 +247,7 @@ function watch(rootFileNames: string[], options: ts.CompilerOptions) {
 >console.log : any
 >console : any
 >log : any
+>`Emitting ${fileName}` : string
 >fileName : string
         }
         else {
@@ -252,6 +256,7 @@ function watch(rootFileNames: string[], options: ts.CompilerOptions) {
 >console.log : any
 >console : any
 >log : any
+>`Emitting ${fileName} failed` : string
 >fileName : string
 
             logErrors(fileName);
@@ -281,6 +286,7 @@ function watch(rootFileNames: string[], options: ts.CompilerOptions) {
 >o.text : string
 >o : ts.OutputFile
 >text : string
+>"utf8" : string
 
         });
     }
@@ -333,6 +339,7 @@ function watch(rootFileNames: string[], options: ts.CompilerOptions) {
 >diagnostic.messageText : string | ts.DiagnosticMessageChain
 >diagnostic : ts.Diagnostic
 >messageText : string | ts.DiagnosticMessageChain
+>"\n" : string
 
             if (diagnostic.file) {
 >diagnostic.file : ts.SourceFile
@@ -357,15 +364,18 @@ function watch(rootFileNames: string[], options: ts.CompilerOptions) {
 >console.log : any
 >console : any
 >log : any
+>`  Error ${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}` : string
 >diagnostic.file.fileName : string
 >diagnostic.file : ts.SourceFile
 >diagnostic : ts.Diagnostic
 >file : ts.SourceFile
 >fileName : string
 >line + 1 : number
 >line : number
+>1 : number
 >character + 1 : number
 >character : number
+>1 : number
 >message : string
             }
             else {
@@ -374,6 +384,7 @@ function watch(rootFileNames: string[], options: ts.CompilerOptions) {
 >console.log : any
 >console : any
 >log : any
+>`  Error: ${message}` : string
 >message : string
             }
         });
@@ -403,6 +414,7 @@ const currentDirectoryFiles = fs.readdirSync(process.cwd()).
 >fileName.length : any
 >fileName : any
 >length : any
+>3 : number
 >fileName.substr(fileName.length - 3, 3) === ".ts" : boolean
 >fileName.substr(fileName.length - 3, 3) : any
 >fileName.substr : any
@@ -412,6 +424,9 @@ const currentDirectoryFiles = fs.readdirSync(process.cwd()).
 >fileName.length : any
 >fileName : any
 >length : any
+>3 : number
+>3 : number
+>".ts" : string
 
 // Start the watcher
 watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS });

tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types

@@ -56,4 +56,6 @@ var p = new A.Point(0, 0); // unexpected error here, bug 840000
 >A.Point : typeof A.Point
 >A : typeof A
 >Point : typeof A.Point
+>0 : number
+>0 : number
 

tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types

@@ -50,4 +50,6 @@ var p = new A.Point(0, 0); // unexpected error here, bug 840000
 >A.Point : typeof A.Point
 >A : typeof A
 >Point : typeof A.Point
+>0 : number
+>0 : number
 

tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types

@@ -15,7 +15,9 @@ function Point() {
     return { x: 0, y: 0 };
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
+>0 : number
 >y : number
+>0 : number
 }
 
 === tests/cases/conformance/internalModules/DeclarationMerging/test.ts ===

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types

@@ -11,14 +11,17 @@ class Point {
 >Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
+>0 : number
 >y : number
+>0 : number
 }
 
 module Point {
 >Point : typeof Point
 
     function Origin() { return ""; }// not an error, since not exported
 >Origin : () => string
+>"" : string
 }
 
 
@@ -37,13 +40,16 @@ module A {
 >Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
+>0 : number
 >y : number
+>0 : number
     }
 
     export module Point {
 >Point : typeof Point
 
         function Origin() { return ""; }// not an error since not exported
 >Origin : () => string
+>"" : string
     }
 }

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types

@@ -11,14 +11,17 @@ class Point {
 >Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
+>0 : number
 >y : number
+>0 : number
 }
 
 module Point {
 >Point : typeof Point
 
     var Origin = ""; // not an error, since not exported
 >Origin : string
+>"" : string
 }
 
 
@@ -37,13 +40,16 @@ module A {
 >Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
+>0 : number
 >y : number
+>0 : number
     }
 
     export module Point {
 >Point : typeof Point
 
         var Origin = ""; // not an error since not exported
 >Origin : string
+>"" : string
     }
 }