Skip to content

Commit 3af3177

Browse files
author
Arthur Ozga
committed
update baselines
1 parent c06e5eb commit 3af3177

14 files changed

+147
-90
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
tests/cases/compiler/augmentedTypesClass2.ts(4,7): error TS2511: Only an ambient class can be merged with an interface.
2-
tests/cases/compiler/augmentedTypesClass2.ts(10,11): error TS2511: Only an ambient class can be merged with an interface.
1+
tests/cases/compiler/augmentedTypesClass2.ts(4,7): error TS2518: Only an ambient class can be merged with an interface.
2+
tests/cases/compiler/augmentedTypesClass2.ts(10,11): error TS2518: Only an ambient class can be merged with an interface.
33
tests/cases/compiler/augmentedTypesClass2.ts(16,7): error TS2300: Duplicate identifier 'c33'.
44
tests/cases/compiler/augmentedTypesClass2.ts(21,6): error TS2300: Duplicate identifier 'c33'.
55

@@ -10,15 +10,15 @@ tests/cases/compiler/augmentedTypesClass2.ts(21,6): error TS2300: Duplicate iden
1010
// class then interface
1111
class c11 { // error
1212
~~~
13-
!!! error TS2511: Only an ambient class can be merged with an interface.
13+
!!! error TS2518: Only an ambient class can be merged with an interface.
1414
foo() {
1515
return 1;
1616
}
1717
}
1818

1919
interface c11 { // error
2020
~~~
21-
!!! error TS2511: Only an ambient class can be merged with an interface.
21+
!!! error TS2518: Only an ambient class can be merged with an interface.
2222
bar(): void;
2323
}
2424

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
tests/cases/compiler/augmentedTypesInterface.ts(12,11): error TS2511: Only an ambient class can be merged with an interface.
2-
tests/cases/compiler/augmentedTypesInterface.ts(16,7): error TS2511: Only an ambient class can be merged with an interface.
1+
tests/cases/compiler/augmentedTypesInterface.ts(12,11): error TS2518: Only an ambient class can be merged with an interface.
2+
tests/cases/compiler/augmentedTypesInterface.ts(16,7): error TS2518: Only an ambient class can be merged with an interface.
33
tests/cases/compiler/augmentedTypesInterface.ts(23,11): error TS2300: Duplicate identifier 'i3'.
44
tests/cases/compiler/augmentedTypesInterface.ts(26,6): error TS2300: Duplicate identifier 'i3'.
55

@@ -18,13 +18,13 @@ tests/cases/compiler/augmentedTypesInterface.ts(26,6): error TS2300: Duplicate i
1818
// interface then class
1919
interface i2 { // error
2020
~~
21-
!!! error TS2511: Only an ambient class can be merged with an interface.
21+
!!! error TS2518: Only an ambient class can be merged with an interface.
2222
foo(): void;
2323
}
2424

2525
class i2 { // error
2626
~~
27-
!!! error TS2511: Only an ambient class can be merged with an interface.
27+
!!! error TS2518: Only an ambient class can be merged with an interface.
2828
bar() {
2929
return 1;
3030
}

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

Lines changed: 54 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
1-
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(7,16): error TS2300: Duplicate identifier 'CI'.
2-
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(8,11): error TS2300: Duplicate identifier 'CI'.
3-
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(10,11): error TS2300: Duplicate identifier 'IC'.
4-
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(11,16): error TS2300: Duplicate identifier 'IC'.
1+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(7,16): error TS2518: Only an ambient class can be merged with an interface.
2+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(8,11): error TS2518: Only an ambient class can be merged with an interface.
3+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(10,11): error TS2518: Only an ambient class can be merged with an interface.
4+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(11,16): error TS2518: Only an ambient class can be merged with an interface.
55
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(13,16): error TS2300: Duplicate identifier 'CC1'.
66
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(14,7): error TS2300: Duplicate identifier 'CC1'.
77
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(16,7): error TS2300: Duplicate identifier 'CC2'.
88
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(17,16): error TS2300: Duplicate identifier 'CC2'.
9-
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(19,1): error TS2511: Cannot create an instance of the abstract class 'CM'.
10-
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(20,1): error TS2511: Cannot create an instance of the abstract class 'MC'.
11-
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(21,1): error TS2511: Cannot create an instance of the abstract class 'CI'.
12-
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(22,5): error TS2304: Cannot find name 'IC'.
13-
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(23,1): error TS2511: Cannot create an instance of the abstract class 'CC1'.
9+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(25,24): error TS2300: Duplicate identifier 'DCC1'.
10+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(26,15): error TS2300: Duplicate identifier 'DCC1'.
11+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(28,15): error TS2300: Duplicate identifier 'DCC2'.
12+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(29,24): error TS2300: Duplicate identifier 'DCC2'.
13+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(31,1): error TS2511: Cannot create an instance of the abstract class 'CM'.
14+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(32,1): error TS2511: Cannot create an instance of the abstract class 'MC'.
15+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(33,1): error TS2511: Cannot create an instance of the abstract class 'CI'.
16+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(34,1): error TS2511: Cannot create an instance of the abstract class 'IC'.
17+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(35,1): error TS2511: Cannot create an instance of the abstract class 'CC1'.
18+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(37,1): error TS2511: Cannot create an instance of the abstract class 'DCI'.
19+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(38,1): error TS2511: Cannot create an instance of the abstract class 'DIC'.
20+
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts(39,1): error TS2511: Cannot create an instance of the abstract class 'DCC1'.
1421

1522

16-
==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts (13 errors) ====
23+
==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts (20 errors) ====
1724
abstract class CM {}
1825
module CM {}
1926

@@ -22,17 +29,17 @@ tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbst
2229

2330
abstract class CI {}
2431
~~
25-
!!! error TS2300: Duplicate identifier 'CI'.
32+
!!! error TS2518: Only an ambient class can be merged with an interface.
2633
interface CI {}
2734
~~
28-
!!! error TS2300: Duplicate identifier 'CI'.
35+
!!! error TS2518: Only an ambient class can be merged with an interface.
2936

3037
interface IC {}
3138
~~
32-
!!! error TS2300: Duplicate identifier 'IC'.
39+
!!! error TS2518: Only an ambient class can be merged with an interface.
3340
abstract class IC {}
3441
~~
35-
!!! error TS2300: Duplicate identifier 'IC'.
42+
!!! error TS2518: Only an ambient class can be merged with an interface.
3643

3744
abstract class CC1 {}
3845
~~~
@@ -48,6 +55,26 @@ tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbst
4855
~~~
4956
!!! error TS2300: Duplicate identifier 'CC2'.
5057

58+
declare abstract class DCI {}
59+
interface DCI {}
60+
61+
interface DIC {}
62+
declare abstract class DIC {}
63+
64+
declare abstract class DCC1 {}
65+
~~~~
66+
!!! error TS2300: Duplicate identifier 'DCC1'.
67+
declare class DCC1 {}
68+
~~~~
69+
!!! error TS2300: Duplicate identifier 'DCC1'.
70+
71+
declare class DCC2 {}
72+
~~~~
73+
!!! error TS2300: Duplicate identifier 'DCC2'.
74+
declare abstract class DCC2 {}
75+
~~~~
76+
!!! error TS2300: Duplicate identifier 'DCC2'.
77+
5178
new CM;
5279
~~~~~~
5380
!!! error TS2511: Cannot create an instance of the abstract class 'CM'.
@@ -58,9 +85,19 @@ tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbst
5885
~~~~~~
5986
!!! error TS2511: Cannot create an instance of the abstract class 'CI'.
6087
new IC;
61-
~~
62-
!!! error TS2304: Cannot find name 'IC'.
88+
~~~~~~
89+
!!! error TS2511: Cannot create an instance of the abstract class 'IC'.
6390
new CC1;
6491
~~~~~~~
6592
!!! error TS2511: Cannot create an instance of the abstract class 'CC1'.
66-
new CC2;
93+
new CC2;
94+
new DCI;
95+
~~~~~~~
96+
!!! error TS2511: Cannot create an instance of the abstract class 'DCI'.
97+
new DIC;
98+
~~~~~~~
99+
!!! error TS2511: Cannot create an instance of the abstract class 'DIC'.
100+
new DCC1;
101+
~~~~~~~~
102+
!!! error TS2511: Cannot create an instance of the abstract class 'DCC1'.
103+
new DCC2;

‎tests/baselines/reference/classAbstractMergedDeclaration.js

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,28 @@ class CC1 {}
1717
class CC2 {}
1818
abstract class CC2 {}
1919

20+
declare abstract class DCI {}
21+
interface DCI {}
22+
23+
interface DIC {}
24+
declare abstract class DIC {}
25+
26+
declare abstract class DCC1 {}
27+
declare class DCC1 {}
28+
29+
declare class DCC2 {}
30+
declare abstract class DCC2 {}
31+
2032
new CM;
2133
new MC;
2234
new CI;
2335
new IC;
2436
new CC1;
25-
new CC2;
37+
new CC2;
38+
new DCI;
39+
new DIC;
40+
new DCC1;
41+
new DCC2;
2642

2743
//// [classAbstractMergedDeclaration.js]
2844
var CM = (function () {
@@ -71,3 +87,7 @@ new CI;
7187
new IC;
7288
new CC1;
7389
new CC2;
90+
new DCI;
91+
new DIC;
92+
new DCC1;
93+
new DCC2;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(1,7): error TS2511: Only an ambient class can be merged with an interface.
1+
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(1,7): error TS2518: Only an ambient class can be merged with an interface.
22
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(1,11): error TS2300: Duplicate identifier 'foo'.
3-
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(2,11): error TS2511: Only an ambient class can be merged with an interface.
3+
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(2,11): error TS2518: Only an ambient class can be merged with an interface.
44
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(2,15): error TS2300: Duplicate identifier 'foo'.
5-
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(5,11): error TS2511: Only an ambient class can be merged with an interface.
5+
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(5,11): error TS2518: Only an ambient class can be merged with an interface.
66
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(6,9): error TS2300: Duplicate identifier 'bar'.
7-
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(9,15): error TS2511: Only an ambient class can be merged with an interface.
7+
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(9,15): error TS2518: Only an ambient class can be merged with an interface.
88
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(10,9): error TS2300: Duplicate identifier 'bar'.
99

1010

1111
==== tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts (8 errors) ====
1212
class C { foo: string; }
1313
~
14-
!!! error TS2511: Only an ambient class can be merged with an interface.
14+
!!! error TS2518: Only an ambient class can be merged with an interface.
1515
~~~
1616
!!! error TS2300: Duplicate identifier 'foo'.
1717
interface C { foo: string; } // error
1818
~
19-
!!! error TS2511: Only an ambient class can be merged with an interface.
19+
!!! error TS2518: Only an ambient class can be merged with an interface.
2020
~~~
2121
!!! error TS2300: Duplicate identifier 'foo'.
2222

2323
module M {
2424
class D {
2525
~
26-
!!! error TS2511: Only an ambient class can be merged with an interface.
26+
!!! error TS2518: Only an ambient class can be merged with an interface.
2727
bar: string;
2828
~~~
2929
!!! error TS2300: Duplicate identifier 'bar'.
3030
}
3131

3232
interface D { // error
3333
~
34-
!!! error TS2511: Only an ambient class can be merged with an interface.
34+
!!! error TS2518: Only an ambient class can be merged with an interface.
3535
bar: string;
3636
~~~
3737
!!! error TS2300: Duplicate identifier 'bar'.

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
tests/cases/compiler/clinterfaces.ts(2,11): error TS2511: Only an ambient class can be merged with an interface.
2-
tests/cases/compiler/clinterfaces.ts(3,15): error TS2511: Only an ambient class can be merged with an interface.
3-
tests/cases/compiler/clinterfaces.ts(4,15): error TS2511: Only an ambient class can be merged with an interface.
4-
tests/cases/compiler/clinterfaces.ts(5,11): error TS2511: Only an ambient class can be merged with an interface.
5-
tests/cases/compiler/clinterfaces.ts(8,11): error TS2511: Only an ambient class can be merged with an interface.
6-
tests/cases/compiler/clinterfaces.ts(12,7): error TS2511: Only an ambient class can be merged with an interface.
7-
tests/cases/compiler/clinterfaces.ts(16,7): error TS2511: Only an ambient class can be merged with an interface.
8-
tests/cases/compiler/clinterfaces.ts(20,11): error TS2511: Only an ambient class can be merged with an interface.
1+
tests/cases/compiler/clinterfaces.ts(2,11): error TS2518: Only an ambient class can be merged with an interface.
2+
tests/cases/compiler/clinterfaces.ts(3,15): error TS2518: Only an ambient class can be merged with an interface.
3+
tests/cases/compiler/clinterfaces.ts(4,15): error TS2518: Only an ambient class can be merged with an interface.
4+
tests/cases/compiler/clinterfaces.ts(5,11): error TS2518: Only an ambient class can be merged with an interface.
5+
tests/cases/compiler/clinterfaces.ts(8,11): error TS2518: Only an ambient class can be merged with an interface.
6+
tests/cases/compiler/clinterfaces.ts(12,7): error TS2518: Only an ambient class can be merged with an interface.
7+
tests/cases/compiler/clinterfaces.ts(16,7): error TS2518: Only an ambient class can be merged with an interface.
8+
tests/cases/compiler/clinterfaces.ts(20,11): error TS2518: Only an ambient class can be merged with an interface.
99

1010

1111
==== tests/cases/compiler/clinterfaces.ts (8 errors) ====
1212
module M {
1313
class C { }
1414
~
15-
!!! error TS2511: Only an ambient class can be merged with an interface.
15+
!!! error TS2518: Only an ambient class can be merged with an interface.
1616
interface C { }
1717
~
18-
!!! error TS2511: Only an ambient class can be merged with an interface.
18+
!!! error TS2518: Only an ambient class can be merged with an interface.
1919
interface D { }
2020
~
21-
!!! error TS2511: Only an ambient class can be merged with an interface.
21+
!!! error TS2518: Only an ambient class can be merged with an interface.
2222
class D { }
2323
~
24-
!!! error TS2511: Only an ambient class can be merged with an interface.
24+
!!! error TS2518: Only an ambient class can be merged with an interface.
2525
}
2626

2727
interface Foo<T> {
2828
~~~
29-
!!! error TS2511: Only an ambient class can be merged with an interface.
29+
!!! error TS2518: Only an ambient class can be merged with an interface.
3030
a: string;
3131
}
3232

3333
class Foo<T>{
3434
~~~
35-
!!! error TS2511: Only an ambient class can be merged with an interface.
35+
!!! error TS2518: Only an ambient class can be merged with an interface.
3636
b: number;
3737
}
3838

3939
class Bar<T>{
4040
~~~
41-
!!! error TS2511: Only an ambient class can be merged with an interface.
41+
!!! error TS2518: Only an ambient class can be merged with an interface.
4242
b: number;
4343
}
4444

4545
interface Bar<T> {
4646
~~~
47-
!!! error TS2511: Only an ambient class can be merged with an interface.
47+
!!! error TS2518: Only an ambient class can be merged with an interface.
4848
a: string;
4949
}
5050

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
tests/cases/compiler/declInput.ts(1,11): error TS2511: Only an ambient class can be merged with an interface.
2-
tests/cases/compiler/declInput.ts(5,7): error TS2511: Only an ambient class can be merged with an interface.
1+
tests/cases/compiler/declInput.ts(1,11): error TS2518: Only an ambient class can be merged with an interface.
2+
tests/cases/compiler/declInput.ts(5,7): error TS2518: Only an ambient class can be merged with an interface.
33

44

55
==== tests/cases/compiler/declInput.ts (2 errors) ====
66
interface bar {
77
~~~
8-
!!! error TS2511: Only an ambient class can be merged with an interface.
8+
!!! error TS2518: Only an ambient class can be merged with an interface.
99

1010
}
1111

1212
class bar {
1313
~~~
14-
!!! error TS2511: Only an ambient class can be merged with an interface.
14+
!!! error TS2518: Only an ambient class can be merged with an interface.
1515
public f() { return ''; }
1616
public g() { return {a: <bar>null, b: undefined, c: void 4 }; }
1717
public h(x = 4, y = null, z = '') { x++; }

0 commit comments

Comments
 (0)