Skip to content

Commit 8b411ef

Browse files
address CR feedback
1 parent 186ce38 commit 8b411ef

File tree

6 files changed

+20
-12
lines changed

6 files changed

+20
-12
lines changed

tests/baselines/reference/nonPrimitiveAssignError.errors.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(5,1): error TS2322: Type 'object' is not assignable to type '{ foo: string; }'.
22
Property 'foo' is missing in type 'object'.
3-
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(11,1): error TS2322: Type 'number' is not assignable to type 'object'.
4-
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(12,1): error TS2322: Type 'true' is not assignable to type 'object'.
5-
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(13,1): error TS2322: Type 'string' is not assignable to type 'object'.
6-
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(15,1): error TS2322: Type 'object' is not assignable to type 'number'.
7-
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(16,1): error TS2322: Type 'object' is not assignable to type 'boolean'.
8-
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(17,1): error TS2322: Type 'object' is not assignable to type 'string'.
3+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(13,1): error TS2322: Type 'number' is not assignable to type 'object'.
4+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(14,1): error TS2322: Type 'true' is not assignable to type 'object'.
5+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(15,1): error TS2322: Type 'string' is not assignable to type 'object'.
6+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(17,1): error TS2322: Type 'object' is not assignable to type 'number'.
7+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(18,1): error TS2322: Type 'object' is not assignable to type 'boolean'.
8+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(19,1): error TS2322: Type 'object' is not assignable to type 'string'.
99

1010

1111
==== tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts (7 errors) ====
@@ -17,6 +17,8 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(17,1): err
1717
~
1818
!!! error TS2322: Type 'object' is not assignable to type '{ foo: string; }'.
1919
!!! error TS2322: Property 'foo' is missing in type 'object'.
20+
a = x;
21+
a = y;
2022

2123
var n = 123;
2224
var b = true;

tests/baselines/reference/nonPrimitiveAssignError.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ var y = {foo: "bar"};
44
var a: object;
55
x = a;
66
y = a; // expect error
7+
a = x;
8+
a = y;
79

810
var n = 123;
911
var b = true;
@@ -32,6 +34,8 @@ var y = { foo: "bar" };
3234
var a;
3335
x = a;
3436
y = a; // expect error
37+
a = x;
38+
a = y;
3539
var n = 123;
3640
var b = true;
3741
var s = "fooo";

tests/baselines/reference/nonPriimitiveInFunction.errors.txt renamed to tests/baselines/reference/nonPrimitiveInFunction.errors.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
tests/cases/conformance/types/nonPrimitive/nonPriimitiveInFunction.ts(12,12): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'object'.
2-
tests/cases/conformance/types/nonPrimitive/nonPriimitiveInFunction.ts(13,1): error TS2322: Type 'object' is not assignable to type 'boolean'.
3-
tests/cases/conformance/types/nonPrimitive/nonPriimitiveInFunction.ts(17,12): error TS2322: Type 'number' is not assignable to type 'object'.
1+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts(12,12): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'object'.
2+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts(13,1): error TS2322: Type 'object' is not assignable to type 'boolean'.
3+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts(17,12): error TS2322: Type 'number' is not assignable to type 'object'.
44

55

6-
==== tests/cases/conformance/types/nonPrimitive/nonPriimitiveInFunction.ts (3 errors) ====
6+
==== tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts (3 errors) ====
77
function takeObject(o: object) {}
88
function returnObject(): object {
99
return {};

tests/baselines/reference/nonPriimitiveInFunction.js renamed to tests/baselines/reference/nonPrimitiveInFunction.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//// [nonPriimitiveInFunction.ts]
1+
//// [nonPrimitiveInFunction.ts]
22
function takeObject(o: object) {}
33
function returnObject(): object {
44
return {};
@@ -19,7 +19,7 @@ function returnError(): object {
1919
}
2020

2121

22-
//// [nonPriimitiveInFunction.js]
22+
//// [nonPrimitiveInFunction.js]
2323
function takeObject(o) { }
2424
function returnObject() {
2525
return {};

tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ var y = {foo: "bar"};
33
var a: object;
44
x = a;
55
y = a; // expect error
6+
a = x;
7+
a = y;
68

79
var n = 123;
810
var b = true;

0 commit comments

Comments
 (0)