diff --git a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt index 093445570fe..bb62d494d74 100644 --- a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt +++ b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt @@ -1,11 +1,11 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(5,1): error TS2322: Type 'object' is not assignable to type '{ foo: string; }'. Property 'foo' is missing in type 'object'. -tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(11,1): error TS2322: Type 'number' is not assignable to type 'object'. -tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(12,1): error TS2322: Type 'true' is not assignable to type 'object'. -tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(13,1): error TS2322: Type 'string' is not assignable to type 'object'. -tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(15,1): error TS2322: Type 'object' is not assignable to type 'number'. -tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(16,1): error TS2322: Type 'object' is not assignable to type 'boolean'. -tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(17,1): error TS2322: Type 'object' is not assignable to type 'string'. +tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(13,1): error TS2322: Type 'number' is not assignable to type 'object'. +tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(14,1): error TS2322: Type 'true' is not assignable to type 'object'. +tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(15,1): error TS2322: Type 'string' is not assignable to type 'object'. +tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(17,1): error TS2322: Type 'object' is not assignable to type 'number'. +tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(18,1): error TS2322: Type 'object' is not assignable to type 'boolean'. +tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(19,1): error TS2322: Type 'object' is not assignable to type 'string'. ==== tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts (7 errors) ==== @@ -17,6 +17,8 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(17,1): err ~ !!! error TS2322: Type 'object' is not assignable to type '{ foo: string; }'. !!! error TS2322: Property 'foo' is missing in type 'object'. + a = x; + a = y; var n = 123; var b = true; diff --git a/tests/baselines/reference/nonPrimitiveAssignError.js b/tests/baselines/reference/nonPrimitiveAssignError.js index e7bb56746ca..c37836a91c6 100644 --- a/tests/baselines/reference/nonPrimitiveAssignError.js +++ b/tests/baselines/reference/nonPrimitiveAssignError.js @@ -4,6 +4,8 @@ var y = {foo: "bar"}; var a: object; x = a; y = a; // expect error +a = x; +a = y; var n = 123; var b = true; @@ -32,6 +34,8 @@ var y = { foo: "bar" }; var a; x = a; y = a; // expect error +a = x; +a = y; var n = 123; var b = true; var s = "fooo"; diff --git a/tests/baselines/reference/nonPriimitiveInFunction.errors.txt b/tests/baselines/reference/nonPrimitiveInFunction.errors.txt similarity index 55% rename from tests/baselines/reference/nonPriimitiveInFunction.errors.txt rename to tests/baselines/reference/nonPrimitiveInFunction.errors.txt index 4b244cfcd04..5ca231b61c8 100644 --- a/tests/baselines/reference/nonPriimitiveInFunction.errors.txt +++ b/tests/baselines/reference/nonPrimitiveInFunction.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/types/nonPrimitive/nonPriimitiveInFunction.ts(12,12): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'object'. -tests/cases/conformance/types/nonPrimitive/nonPriimitiveInFunction.ts(13,1): error TS2322: Type 'object' is not assignable to type 'boolean'. -tests/cases/conformance/types/nonPrimitive/nonPriimitiveInFunction.ts(17,12): error TS2322: Type 'number' is not assignable to type 'object'. +tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts(12,12): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'object'. +tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts(13,1): error TS2322: Type 'object' is not assignable to type 'boolean'. +tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts(17,12): error TS2322: Type 'number' is not assignable to type 'object'. -==== tests/cases/conformance/types/nonPrimitive/nonPriimitiveInFunction.ts (3 errors) ==== +==== tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts (3 errors) ==== function takeObject(o: object) {} function returnObject(): object { return {}; diff --git a/tests/baselines/reference/nonPriimitiveInFunction.js b/tests/baselines/reference/nonPrimitiveInFunction.js similarity index 88% rename from tests/baselines/reference/nonPriimitiveInFunction.js rename to tests/baselines/reference/nonPrimitiveInFunction.js index a534ea7c84e..a67b68542dd 100644 --- a/tests/baselines/reference/nonPriimitiveInFunction.js +++ b/tests/baselines/reference/nonPrimitiveInFunction.js @@ -1,4 +1,4 @@ -//// [nonPriimitiveInFunction.ts] +//// [nonPrimitiveInFunction.ts] function takeObject(o: object) {} function returnObject(): object { return {}; @@ -19,7 +19,7 @@ function returnError(): object { } -//// [nonPriimitiveInFunction.js] +//// [nonPrimitiveInFunction.js] function takeObject(o) { } function returnObject() { return {}; diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts index 8fe8c8a3ebb..83801652865 100644 --- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts +++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts @@ -3,6 +3,8 @@ var y = {foo: "bar"}; var a: object; x = a; y = a; // expect error +a = x; +a = y; var n = 123; var b = true; diff --git a/tests/cases/conformance/types/nonPrimitive/nonPriimitiveInFunction.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts similarity index 100% rename from tests/cases/conformance/types/nonPrimitive/nonPriimitiveInFunction.ts rename to tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts