Accepted baselines.

microsoft · DanielRosenwasser · Nov 10, 2015 · Sep 11, 2015 · Oct 1, 2015 · Oct 1, 2015
commit 84786d82c14e3fae0f86d22e6fc635ecbac9dab8
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.errors.txt b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.errors.txt
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js
@@ -38,7 +38,6 @@ var Shapes;
         function Point(x, y) {
             this.x = x;
             this.y = y;
-            this.con = "hello";
         }
         // Instance member
         Point.prototype.getDist = function () { return Math.sqrt(this.x * this.x + this.y * this.y); };

diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols
@@ -0,0 +1,67 @@
+=== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts ===
+// Interface
+interface IPoint {
+>IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 0, 0))
+
+    getDist(): number;
+>getDist : Symbol(getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 1, 18))
+}
+
+// Module
+module Shapes {
+>Shapes : Symbol(Shapes, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 3, 1))
+
+    // Class
+    export class Point implements IPoint {
+>Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+>IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 0, 0))
+
+        public con: "hello";
+>con : Symbol(con, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 9, 42))
+
+        // Constructor
+        constructor (public x: number, public y: number) { }
+>x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+
+        // Instance member
+        getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); }
+>getDist : Symbol(getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 60))
+>Math.sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, 620, 27))
+>Math : Symbol(Math, Decl(lib.d.ts, 522, 1), Decl(lib.d.ts, 633, 11))
+>sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, 620, 27))
+>this.x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+>x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>this.x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+>x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>this.y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+>y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+>this.y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+>y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+
+        // Static member
+        static origin = new Point(0, 0);
+>origin : Symbol(Point.origin, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 16, 74))
+>Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+    }
+
+}
+
+// Local variables
+var p: IPoint = new Shapes.Point(3, 4);
+>p : Symbol(p, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 25, 3))
+>IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 0, 0))
+>Shapes.Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+>Shapes : Symbol(Shapes, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 3, 1))
+>Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
+
+var dist = p.getDist();
+>dist : Symbol(dist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 26, 3))
+>p.getDist : Symbol(IPoint.getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 1, 18))
+>p : Symbol(p, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 25, 3))
+>getDist : Symbol(IPoint.getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 1, 18))
+
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types
@@ -0,0 +1,78 @@
+=== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts ===
+// Interface
+interface IPoint {
+>IPoint : IPoint
+
+    getDist(): number;
+>getDist : () => number
+}
+
+// Module
+module Shapes {
+>Shapes : typeof Shapes
+
+    // Class
+    export class Point implements IPoint {
+>Point : Point
+>IPoint : IPoint
+
+        public con: "hello";
+>con : "hello"
+
+        // Constructor
+        constructor (public x: number, public y: number) { }
+>x : number
+>y : number
+
+        // Instance member
+        getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); }
+>getDist : () => number
+>Math.sqrt(this.x * this.x + this.y * this.y) : number
+>Math.sqrt : (x: number) => number
+>Math : Math
+>sqrt : (x: number) => number
+>this.x * this.x + this.y * this.y : number
+>this.x * this.x : number
+>this.x : number
+>this : Point
+>x : number
+>this.x : number
+>this : Point
+>x : number
+>this.y * this.y : number
+>this.y : number
+>this : Point
+>y : number
+>this.y : number
+>this : Point
+>y : number
+
+        // Static member
+        static origin = new Point(0, 0);
+>origin : Point
+>new Point(0, 0) : Point
+>Point : typeof Point
+>0 : number
+>0 : number
+    }
+
+}
+
+// Local variables
+var p: IPoint = new Shapes.Point(3, 4);
+>p : IPoint
+>IPoint : IPoint
+>new Shapes.Point(3, 4) : Shapes.Point
+>Shapes.Point : typeof Shapes.Point
+>Shapes : typeof Shapes
+>Point : typeof Shapes.Point
+>3 : number
+>4 : number
+
+var dist = p.getDist();
+>dist : number
+>p.getDist() : number
+>p.getDist : () => number
+>p : IPoint
+>getDist : () => number
+
diff --git a/tests/baselines/reference/stringLiteralType.errors.txt b/tests/baselines/reference/stringLiteralType.errors.txt
diff --git a/tests/baselines/reference/stringLiteralType.js b/tests/baselines/reference/stringLiteralType.js
@@ -7,6 +7,6 @@ function f(x: any) {
 }
 
 //// [stringLiteralType.js]
-var x = 'hi';
+var x;
 function f(x) {
 }
diff --git a/tests/baselines/reference/stringLiteralType.symbols b/tests/baselines/reference/stringLiteralType.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts ===
+var x: 'hi';
+>x : Symbol(x, Decl(stringLiteralType.ts, 0, 3))
+
+function f(x: 'hi');
+>f : Symbol(f, Decl(stringLiteralType.ts, 0, 12), Decl(stringLiteralType.ts, 2, 20), Decl(stringLiteralType.ts, 3, 22))
+>x : Symbol(x, Decl(stringLiteralType.ts, 2, 11))
+
+function f(x: string);
+>f : Symbol(f, Decl(stringLiteralType.ts, 0, 12), Decl(stringLiteralType.ts, 2, 20), Decl(stringLiteralType.ts, 3, 22))
+>x : Symbol(x, Decl(stringLiteralType.ts, 3, 11))
+
+function f(x: any) {
+>f : Symbol(f, Decl(stringLiteralType.ts, 0, 12), Decl(stringLiteralType.ts, 2, 20), Decl(stringLiteralType.ts, 3, 22))
+>x : Symbol(x, Decl(stringLiteralType.ts, 4, 11))
+}
diff --git a/tests/baselines/reference/stringLiteralType.types b/tests/baselines/reference/stringLiteralType.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/types/primitives/stringLiteral/stringLiteralType.ts ===
+var x: 'hi';
+>x : 'hi'
+
+function f(x: 'hi');
+>f : { (x: 'hi'): any; (x: string): any; }
+>x : 'hi'
+
+function f(x: string);
+>f : { (x: 'hi'): any; (x: string): any; }
+>x : string
+
+function f(x: any) {
+>f : { (x: 'hi'): any; (x: string): any; }
+>x : any
+}
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt b/tests/baselines/reference/stringLiteralTypesAsTags01.errors.txt
@@ -1,50 +1,27 @@
-tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(2,12): error TS4081: Exported type alias 'Kind' has or is using private name ''.
-tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(2,13): error TS1110: Type expected.
-tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(2,13): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(2,19): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(9,10): error TS4033: Property 'kind' of exported interface has or is using private name ''.
-tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(9,11): error TS1110: Type expected.
-tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(14,10): error TS4033: Property 'kind' of exported interface has or is using private name ''.
-tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(14,11): error TS1110: Type expected.
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(18,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(19,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(20,10): error TS2394: Overload signature is not compatible with function implementation.
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(22,21): error TS2304: Cannot find name 'is'.
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(25,5): error TS2322: Type '{ kind: string; a: number; }' is not assignable to type 'A'.
-  Property '"A"' is missing in type '{ kind: string; a: number; }'.
+  Types of property 'kind' are incompatible.
+    Type 'string' is not assignable to type '"A"'.
 
 
-==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts (13 errors) ====
+==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts (5 errors) ====
 
     type Kind = "A" | "B"
-
-!!! error TS4081: Exported type alias 'Kind' has or is using private name ''.
-                ~~~
-!!! error TS1110: Type expected.
-                ~~~
-!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-                      ~~~
-!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 
     interface Entity {
         kind: Kind;
     }
 
     interface A extends Entity {
         kind: "A";
-
-!!! error TS4033: Property 'kind' of exported interface has or is using private name ''.
-              ~~~
-!!! error TS1110: Type expected.
         a: number;
     }
 
     interface B extends Entity {
         kind: "B";
-
-!!! error TS4033: Property 'kind' of exported interface has or is using private name ''.
-              ~~~
-!!! error TS1110: Type expected.
         b: string;
     }
 
@@ -66,7 +43,8 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags01.ts(25,5):
     let x: A = {
         ~
 !!! error TS2322: Type '{ kind: string; a: number; }' is not assignable to type 'A'.
-!!! error TS2322:   Property '"A"' is missing in type '{ kind: string; a: number; }'.
+!!! error TS2322:   Types of property 'kind' are incompatible.
+!!! error TS2322:     Type 'string' is not assignable to type '"A"'.
         kind: "A",
         a: 100,
     }

diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.js b/tests/baselines/reference/stringLiteralTypesAsTags01.js
@@ -43,7 +43,6 @@ else {
 }
 
 //// [stringLiteralTypesAsTags01.js]
-"A" | "B";
 function hasKind(entity, kind) {
     return kind === is;
 }
@@ -63,3 +62,22 @@ if (!hasKind(x, "B")) {
 else {
     var d = x;
 }
+
+
+//// [stringLiteralTypesAsTags01.d.ts]
+declare type Kind = "A" | "B";
+interface Entity {
+    kind: Kind;
+}
+interface A extends Entity {
+    kind: "A";
+    a: number;
+}
+interface B extends Entity {
+    kind: "B";
+    b: string;
+}
+declare function hasKind(entity: Entity, kind: "A"): entity is A;
+declare function hasKind(entity: Entity, kind: "B"): entity is B;
+declare function hasKind(entity: Entity, kind: Kind): entity is Entity;
+declare let x: A;