Skip to content

Commit 7cf4d9a

Browse files
uhyouhyo
committed
accept baseline again
1 parent 4947b7f commit 7cf4d9a

File tree

4 files changed

+48
-48
lines changed

4 files changed

+48
-48
lines changed

‎src/testRunner/parallel/host.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ namespace Harness.Parallel.Host {
147147
}
148148

149149
cursor.hide();
150-
readline.moveCursor(process.stdout, -process.stdout.columns, -this._lineCount);
150+
readline.moveCursor(process.stdout, -process.stdout.columns!, -this._lineCount);
151151
let lineCount = 0;
152152
const numProgressBars = this._progressBars.length;
153153
for (let i = 0; i < numProgressBars; i++) {
@@ -156,7 +156,7 @@ namespace Harness.Parallel.Host {
156156
process.stdout.write(this._progressBars[i].text + os.EOL);
157157
}
158158
else {
159-
readline.moveCursor(process.stdout, -process.stdout.columns, +1);
159+
readline.moveCursor(process.stdout, -process.stdout.columns!, +1);
160160
}
161161

162162
lineCount++;

‎tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.errors.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
tests/cases/conformance/jsx/inline/index.tsx(5,1): error TS2741: Property '__predomBrand' is missing in type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' but required in type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
22
tests/cases/conformance/jsx/inline/index.tsx(21,40): error TS2322: Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
3-
tests/cases/conformance/jsx/inline/index.tsx(21,41): error TS2774: 'MyClass' cannot be used as a JSX component.
3+
tests/cases/conformance/jsx/inline/index.tsx(21,41): error TS2782: 'MyClass' cannot be used as a JSX component.
44
Its instance type 'MyClass' is not a valid JSX element.
55
Property '__domBrand' is missing in type 'MyClass' but required in type 'ElementClass'.
66
tests/cases/conformance/jsx/inline/index.tsx(21,63): error TS2322: Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
7-
tests/cases/conformance/jsx/inline/index.tsx(21,64): error TS2774: 'MyClass' cannot be used as a JSX component.
7+
tests/cases/conformance/jsx/inline/index.tsx(21,64): error TS2782: 'MyClass' cannot be used as a JSX component.
88
Its instance type 'MyClass' is not a valid JSX element.
99
tests/cases/conformance/jsx/inline/index.tsx(24,42): error TS2741: Property '__domBrand' is missing in type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element' but required in type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element'.
1010
tests/cases/conformance/jsx/inline/index.tsx(24,48): error TS2322: Type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element'.
@@ -98,15 +98,15 @@ tests/cases/conformance/jsx/inline/index.tsx(24,48): error TS2322: Type 'import(
9898
~~~~~~~~~~~~~~~~~~~~~~~
9999
!!! error TS2322: Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
100100
~~~~~~~
101-
!!! error TS2774: 'MyClass' cannot be used as a JSX component.
102-
!!! error TS2774: Its instance type 'MyClass' is not a valid JSX element.
103-
!!! error TS2774: Property '__domBrand' is missing in type 'MyClass' but required in type 'ElementClass'.
101+
!!! error TS2782: 'MyClass' cannot be used as a JSX component.
102+
!!! error TS2782: Its instance type 'MyClass' is not a valid JSX element.
103+
!!! error TS2782: Property '__domBrand' is missing in type 'MyClass' but required in type 'ElementClass'.
104104
!!! related TS2728 tests/cases/conformance/jsx/inline/renderer.d.ts:7:13: '__domBrand' is declared here.
105105
~~~~~~~~~~~~~~~~~~~~~~~
106106
!!! error TS2322: Type 'import("tests/cases/conformance/jsx/inline/renderer").dom.JSX.Element' is not assignable to type 'import("tests/cases/conformance/jsx/inline/renderer2").predom.JSX.Element'.
107107
~~~~~~~
108-
!!! error TS2774: 'MyClass' cannot be used as a JSX component.
109-
!!! error TS2774: Its instance type 'MyClass' is not a valid JSX element.
108+
!!! error TS2782: 'MyClass' cannot be used as a JSX component.
109+
!!! error TS2782: Its instance type 'MyClass' is not a valid JSX element.
110110

111111
// Should fail, nondom isn't allowed as children of dom
112112
const _brokenTree2 = <DOMSFC x={1} y={2}>{tree}{tree}</DOMSFC>

‎tests/baselines/reference/jsxComponentTypeErrors.errors.txt

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
tests/cases/compiler/jsxComponentTypeErrors.tsx(16,11): error TS2774: 'this' cannot be used as a JSX component.
1+
tests/cases/compiler/jsxComponentTypeErrors.tsx(16,11): error TS2782: 'this' cannot be used as a JSX component.
22
Its return type '{ type: "foo" | undefined; }' is not a valid JSX element.
33
Types of property 'type' are incompatible.
44
Type '"foo" | undefined' is not assignable to type '"element"'.
55
Type 'undefined' is not assignable to type '"element"'.
6-
tests/cases/compiler/jsxComponentTypeErrors.tsx(25,16): error TS2774: 'FunctionComponent' cannot be used as a JSX component.
6+
tests/cases/compiler/jsxComponentTypeErrors.tsx(25,16): error TS2782: 'FunctionComponent' cannot be used as a JSX component.
77
Its return type '{ type: "abc" | undefined; }' is not a valid JSX element.
88
Types of property 'type' are incompatible.
99
Type '"abc" | undefined' is not assignable to type '"element"'.
1010
Type 'undefined' is not assignable to type '"element"'.
11-
tests/cases/compiler/jsxComponentTypeErrors.tsx(26,16): error TS2774: 'FunctionComponent' cannot be used as a JSX component.
11+
tests/cases/compiler/jsxComponentTypeErrors.tsx(26,16): error TS2782: 'FunctionComponent' cannot be used as a JSX component.
1212
Its return type '{ type: "abc" | undefined; }' is not a valid JSX element.
13-
tests/cases/compiler/jsxComponentTypeErrors.tsx(27,16): error TS2774: 'ClassComponent' cannot be used as a JSX component.
13+
tests/cases/compiler/jsxComponentTypeErrors.tsx(27,16): error TS2782: 'ClassComponent' cannot be used as a JSX component.
1414
Its instance type 'ClassComponent' is not a valid JSX element.
1515
Types of property 'type' are incompatible.
1616
Type 'string' is not assignable to type '"element-class"'.
17-
tests/cases/compiler/jsxComponentTypeErrors.tsx(28,16): error TS2774: 'MixedComponent' cannot be used as a JSX component.
17+
tests/cases/compiler/jsxComponentTypeErrors.tsx(28,16): error TS2782: 'MixedComponent' cannot be used as a JSX component.
1818
Its element type 'ClassComponent | { type: string | undefined; }' is not a valid JSX element.
1919
Type 'ClassComponent' is not assignable to type 'Element | ElementClass | null'.
2020
Type 'ClassComponent' is not assignable to type 'ElementClass'.
21-
tests/cases/compiler/jsxComponentTypeErrors.tsx(37,16): error TS2774: 'obj.MemberFunctionComponent' cannot be used as a JSX component.
21+
tests/cases/compiler/jsxComponentTypeErrors.tsx(37,16): error TS2782: 'obj.MemberFunctionComponent' cannot be used as a JSX component.
2222
Its return type '{}' is not a valid JSX element.
2323
Property 'type' is missing in type '{}' but required in type 'Element'.
24-
tests/cases/compiler/jsxComponentTypeErrors.tsx(38,16): error TS2774: 'obj. MemberClassComponent' cannot be used as a JSX component.
24+
tests/cases/compiler/jsxComponentTypeErrors.tsx(38,16): error TS2782: 'obj. MemberClassComponent' cannot be used as a JSX component.
2525
Its instance type 'MemberClassComponent' is not a valid JSX element.
2626
Property 'type' is missing in type 'MemberClassComponent' but required in type 'ElementClass'.
2727

@@ -44,11 +44,11 @@ tests/cases/compiler/jsxComponentTypeErrors.tsx(38,16): error TS2774: 'obj. Memb
4444
FunctionComponent.useThis = function() {
4545
return <this type="foo" />;
4646
~~~~
47-
!!! error TS2774: 'this' cannot be used as a JSX component.
48-
!!! error TS2774: Its return type '{ type: "foo" | undefined; }' is not a valid JSX element.
49-
!!! error TS2774: Types of property 'type' are incompatible.
50-
!!! error TS2774: Type '"foo" | undefined' is not assignable to type '"element"'.
51-
!!! error TS2774: Type 'undefined' is not assignable to type '"element"'.
47+
!!! error TS2782: 'this' cannot be used as a JSX component.
48+
!!! error TS2782: Its return type '{ type: "foo" | undefined; }' is not a valid JSX element.
49+
!!! error TS2782: Types of property 'type' are incompatible.
50+
!!! error TS2782: Type '"foo" | undefined' is not assignable to type '"element"'.
51+
!!! error TS2782: Type 'undefined' is not assignable to type '"element"'.
5252
}
5353

5454
class ClassComponent {
@@ -59,27 +59,27 @@ tests/cases/compiler/jsxComponentTypeErrors.tsx(38,16): error TS2774: 'obj. Memb
5959

6060
const elem1 = <FunctionComponent type="abc" />;
6161
~~~~~~~~~~~~~~~~~
62-
!!! error TS2774: 'FunctionComponent' cannot be used as a JSX component.
63-
!!! error TS2774: Its return type '{ type: "abc" | undefined; }' is not a valid JSX element.
64-
!!! error TS2774: Types of property 'type' are incompatible.
65-
!!! error TS2774: Type '"abc" | undefined' is not assignable to type '"element"'.
66-
!!! error TS2774: Type 'undefined' is not assignable to type '"element"'.
62+
!!! error TS2782: 'FunctionComponent' cannot be used as a JSX component.
63+
!!! error TS2782: Its return type '{ type: "abc" | undefined; }' is not a valid JSX element.
64+
!!! error TS2782: Types of property 'type' are incompatible.
65+
!!! error TS2782: Type '"abc" | undefined' is not assignable to type '"element"'.
66+
!!! error TS2782: Type 'undefined' is not assignable to type '"element"'.
6767
const elem2 = <FunctionComponent<"abc"> />;
6868
~~~~~~~~~~~~~~~~~
69-
!!! error TS2774: 'FunctionComponent' cannot be used as a JSX component.
70-
!!! error TS2774: Its return type '{ type: "abc" | undefined; }' is not a valid JSX element.
69+
!!! error TS2782: 'FunctionComponent' cannot be used as a JSX component.
70+
!!! error TS2782: Its return type '{ type: "abc" | undefined; }' is not a valid JSX element.
7171
const elem3 = <ClassComponent />;
7272
~~~~~~~~~~~~~~
73-
!!! error TS2774: 'ClassComponent' cannot be used as a JSX component.
74-
!!! error TS2774: Its instance type 'ClassComponent' is not a valid JSX element.
75-
!!! error TS2774: Types of property 'type' are incompatible.
76-
!!! error TS2774: Type 'string' is not assignable to type '"element-class"'.
73+
!!! error TS2782: 'ClassComponent' cannot be used as a JSX component.
74+
!!! error TS2782: Its instance type 'ClassComponent' is not a valid JSX element.
75+
!!! error TS2782: Types of property 'type' are incompatible.
76+
!!! error TS2782: Type 'string' is not assignable to type '"element-class"'.
7777
const elem4 = <MixedComponent />;
7878
~~~~~~~~~~~~~~
79-
!!! error TS2774: 'MixedComponent' cannot be used as a JSX component.
80-
!!! error TS2774: Its element type 'ClassComponent | { type: string | undefined; }' is not a valid JSX element.
81-
!!! error TS2774: Type 'ClassComponent' is not assignable to type 'Element | ElementClass | null'.
82-
!!! error TS2774: Type 'ClassComponent' is not assignable to type 'ElementClass'.
79+
!!! error TS2782: 'MixedComponent' cannot be used as a JSX component.
80+
!!! error TS2782: Its element type 'ClassComponent | { type: string | undefined; }' is not a valid JSX element.
81+
!!! error TS2782: Type 'ClassComponent' is not assignable to type 'Element | ElementClass | null'.
82+
!!! error TS2782: Type 'ClassComponent' is not assignable to type 'ElementClass'.
8383

8484
const obj = {
8585
MemberFunctionComponent() {
@@ -90,14 +90,14 @@ tests/cases/compiler/jsxComponentTypeErrors.tsx(38,16): error TS2774: 'obj. Memb
9090

9191
const elem5 = <obj.MemberFunctionComponent />;
9292
~~~~~~~~~~~~~~~~~~~~~~~~~~~
93-
!!! error TS2774: 'obj.MemberFunctionComponent' cannot be used as a JSX component.
94-
!!! error TS2774: Its return type '{}' is not a valid JSX element.
95-
!!! error TS2774: Property 'type' is missing in type '{}' but required in type 'Element'.
93+
!!! error TS2782: 'obj.MemberFunctionComponent' cannot be used as a JSX component.
94+
!!! error TS2782: Its return type '{}' is not a valid JSX element.
95+
!!! error TS2782: Property 'type' is missing in type '{}' but required in type 'Element'.
9696
!!! related TS2728 tests/cases/compiler/jsxComponentTypeErrors.tsx:3:5: 'type' is declared here.
9797
const elem6 = <obj. MemberClassComponent />;
9898
~~~~~~~~~~~~~~~~~~~~~~~~~
99-
!!! error TS2774: 'obj. MemberClassComponent' cannot be used as a JSX component.
100-
!!! error TS2774: Its instance type 'MemberClassComponent' is not a valid JSX element.
101-
!!! error TS2774: Property 'type' is missing in type 'MemberClassComponent' but required in type 'ElementClass'.
99+
!!! error TS2782: 'obj. MemberClassComponent' cannot be used as a JSX component.
100+
!!! error TS2782: Its instance type 'MemberClassComponent' is not a valid JSX element.
101+
!!! error TS2782: Property 'type' is missing in type 'MemberClassComponent' but required in type 'ElementClass'.
102102
!!! related TS2728 tests/cases/compiler/jsxComponentTypeErrors.tsx:6:5: 'type' is declared here.
103103

‎tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.errors.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
tests/cases/conformance/jsx/file.tsx(9,14): error TS2774: 'Foo' cannot be used as a JSX component.
1+
tests/cases/conformance/jsx/file.tsx(9,14): error TS2782: 'Foo' cannot be used as a JSX component.
22
Its return type 'undefined' is not a valid JSX element.
3-
tests/cases/conformance/jsx/file.tsx(10,12): error TS2774: 'Greet' cannot be used as a JSX component.
3+
tests/cases/conformance/jsx/file.tsx(10,12): error TS2782: 'Greet' cannot be used as a JSX component.
44
Its return type 'undefined' is not a valid JSX element.
55

66

@@ -15,9 +15,9 @@ tests/cases/conformance/jsx/file.tsx(10,12): error TS2774: 'Greet' cannot be use
1515
// Error
1616
const foo = <Foo />;
1717
~~~
18-
!!! error TS2774: 'Foo' cannot be used as a JSX component.
19-
!!! error TS2774: Its return type 'undefined' is not a valid JSX element.
18+
!!! error TS2782: 'Foo' cannot be used as a JSX component.
19+
!!! error TS2782: Its return type 'undefined' is not a valid JSX element.
2020
const G = <Greet />;
2121
~~~~~
22-
!!! error TS2774: 'Greet' cannot be used as a JSX component.
23-
!!! error TS2774: Its return type 'undefined' is not a valid JSX element.
22+
!!! error TS2782: 'Greet' cannot be used as a JSX component.
23+
!!! error TS2782: Its return type 'undefined' is not a valid JSX element.

0 commit comments

Comments
 (0)