Baseline and harness changes

Author: JsonFreeman

src/harness/compilerRunner.ts

@@ -307,7 +307,7 @@ class CompilerBaselineRunner extends RunnerBase {
                         allFiles.forEach(file => {
                             var codeLines = file.content.split('\n');
                             walker.getTypes(file.unitName).forEach(result => {
-                                var formattedLine = result.identifierName + " : " + result.type;
+                                var formattedLine = result.identifierName.replace(/\r?\n/g, "") + " : " + result.type;
                                 if (!typeMap[file.unitName]) {
                                     typeMap[file.unitName] = {};
                                 }

src/harness/typeWriter.ts

@@ -28,7 +28,7 @@ class TypeWriterWalker {
             // TODO: Ideally we should log all expressions, but to compare to the
             // old typeWriter baselines, suppress tokens
             case ts.SyntaxKind.ThisKeyword:
-            case ts.SyntaxKind.RegularExpressionLiteral:
+         //   case ts.SyntaxKind.RegularExpressionLiteral:
             case ts.SyntaxKind.ArrayLiteral:
             case ts.SyntaxKind.ObjectLiteral:
             case ts.SyntaxKind.PropertyAccess:
@@ -87,7 +87,7 @@ class TypeWriterWalker {
             column: lineAndCharacter.character,
             syntaxKind: ts.SyntaxKind[node.kind],
             identifierName: sourceText,
-            type: isUnknownType ? sourceText : this.checker.typeToString(type)
+            type: isUnknownType ? sourceText : this.checker.typeToString(type, undefined, ts.TypeFormatFlags.UseTypeOfFunction)
         });
     }
 

tests/baselines/reference/parserX_ArrowFunction1.errors.txt renamed to tests/baselines/reference/ArrowFunction1.errors.txt

@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction1.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction1.ts (1 errors) ====
     var v = (a: ) => {
                 ~
 !!! Type expected.

tests/baselines/reference/parserX_ArrowFunction2.errors.txt renamed to tests/baselines/reference/ArrowFunction2.errors.txt

@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction2.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction2.ts (2 errors) ====
     var v = (a: b,) => {
                  ~
 !!! Trailing comma not allowed.

tests/baselines/reference/parserX_ArrowFunction3.errors.txt renamed to tests/baselines/reference/ArrowFunction3.errors.txt

@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction3.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction3.ts (3 errors) ====
     var v = (a): => {
                ~
 !!! ',' expected.

tests/baselines/reference/ArrowFunction4.js

@@ -0,0 +1,8 @@
+//// [ArrowFunction4.ts]
+var v = (a, b) => {
+   
+};
+
+//// [ArrowFunction4.js]
+var v = function (a, b) {
+};

tests/baselines/reference/parserX_ArrowFunction4.types renamed to tests/baselines/reference/ArrowFunction4.types

@@ -1,9 +1,7 @@
-=== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4.ts ===
+=== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction4.ts ===
 var v = (a, b) => {
 >v : (a: any, b: any) => void
->(a, b) => {
-   
-} : (a: any, b: any) => void
+>(a, b) => {   } : (a: any, b: any) => void
 >a : any
 >b : any
 

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types

@@ -7,7 +7,7 @@ class Point {
 >y : number
 
     static Origin(): Point { return { x: 0, y: 0 }; }
->Origin : () => Point
+>Origin : typeof Origin
 >Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
@@ -18,7 +18,7 @@ module Point {
 >Point : typeof Point
 
     function Origin() { return ""; }// not an error, since not exported
->Origin : () => string
+>Origin : typeof Origin
 }
 
 
@@ -33,7 +33,7 @@ module A {
 >y : number
 
         static Origin(): Point { return { x: 0, y: 0 }; }
->Origin : () => Point
+>Origin : typeof Origin
 >Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
@@ -44,6 +44,6 @@ module A {
 >Point : typeof Point
 
         function Origin() { return ""; }// not an error since not exported
->Origin : () => string
+>Origin : typeof Origin
     }
 }

tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types

@@ -47,7 +47,7 @@ module A {
 >TPoint : TPoint
 
         static fromorigin2d(p: Point): Line<Point>{
->fromorigin2d : (p: Point) => Line<Point>
+>fromorigin2d : typeof fromorigin2d
 >p : Point
 >Point : Point
 >Line : Line<TPoint>

tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types

@@ -23,7 +23,7 @@ module A {
     }
 
     export function fromOrigin(p: Point): Line {
->fromOrigin : (p: Point) => Line
+>fromOrigin : typeof fromOrigin
 >p : Point
 >Point : Point
 >Line : Line