Skip to content

Commit 91e3a5c

Browse files
author
Arthur Ozga
committed
updated baselines
1 parent 19b0c51 commit 91e3a5c

12 files changed

+72
-74
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 TS2506: Only an ambient class can be merged with an interface.
2-
tests/cases/compiler/augmentedTypesClass2.ts(10,11): error TS2506: Only an ambient class can be merged with an interface.
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.
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 TS2506: Only an ambient class can be merged with an interface.
13+
!!! error TS2511: 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 TS2506: Only an ambient class can be merged with an interface.
21+
!!! error TS2511: 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 TS2506: Only an ambient class can be merged with an interface.
2-
tests/cases/compiler/augmentedTypesInterface.ts(16,7): error TS2506: Only an ambient class can be merged with an interface.
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.
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 TS2506: Only an ambient class can be merged with an interface.
21+
!!! error TS2511: Only an ambient class can be merged with an interface.
2222
foo(): void;
2323
}
2424

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

‎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 TS2506: Only an ambient class can be merged with an interface.
1+
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(1,7): error TS2511: 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 TS2506: Only an ambient class can be merged with an interface.
3+
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(2,11): error TS2511: 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 TS2506: Only an ambient class can be merged with an interface.
5+
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(5,11): error TS2511: 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 TS2506: Only an ambient class can be merged with an interface.
7+
tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts(9,15): error TS2511: 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 TS2506: Only an ambient class can be merged with an interface.
14+
!!! error TS2511: 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 TS2506: Only an ambient class can be merged with an interface.
19+
!!! error TS2511: 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 TS2506: Only an ambient class can be merged with an interface.
26+
!!! error TS2511: 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 TS2506: Only an ambient class can be merged with an interface.
34+
!!! error TS2511: 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 TS2506: Only an ambient class can be merged with an interface.
2-
tests/cases/compiler/clinterfaces.ts(3,15): error TS2506: Only an ambient class can be merged with an interface.
3-
tests/cases/compiler/clinterfaces.ts(4,15): error TS2506: Only an ambient class can be merged with an interface.
4-
tests/cases/compiler/clinterfaces.ts(5,11): error TS2506: Only an ambient class can be merged with an interface.
5-
tests/cases/compiler/clinterfaces.ts(8,11): error TS2506: Only an ambient class can be merged with an interface.
6-
tests/cases/compiler/clinterfaces.ts(12,7): error TS2506: Only an ambient class can be merged with an interface.
7-
tests/cases/compiler/clinterfaces.ts(16,7): error TS2506: Only an ambient class can be merged with an interface.
8-
tests/cases/compiler/clinterfaces.ts(20,11): error TS2506: Only an ambient class can be merged with an interface.
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.
99

1010

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

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

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

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

4545
interface Bar<T> {
4646
~~~
47-
!!! error TS2506: Only an ambient class can be merged with an interface.
47+
!!! error TS2511: 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 TS2506: Only an ambient class can be merged with an interface.
2-
tests/cases/compiler/declInput.ts(5,7): error TS2506: Only an ambient class can be merged with an interface.
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.
33

44

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

1010
}
1111

1212
class bar {
1313
~~~
14-
!!! error TS2506: Only an ambient class can be merged with an interface.
14+
!!! error TS2511: 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++; }

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts(2,22): error TS2506: Only an ambient class can be merged with an interface.
2-
tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts(5,18): error TS2506: Only an ambient class can be merged with an interface.
1+
tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts(2,22): error TS2511: Only an ambient class can be merged with an interface.
2+
tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts(5,18): error TS2511: Only an ambient class can be merged with an interface.
33
tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts(9,21): error TS2300: Duplicate identifier 'f'.
44
tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts(12,18): error TS2300: Duplicate identifier 'f'.
55
tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts(37,12): error TS2300: Duplicate identifier 'x'.
@@ -10,12 +10,12 @@ tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts(41,16): er
1010
module M {
1111
export interface I { }
1212
~
13-
!!! error TS2506: Only an ambient class can be merged with an interface.
13+
!!! error TS2511: Only an ambient class can be merged with an interface.
1414
}
1515
module M {
1616
export class I { } // error
1717
~
18-
!!! error TS2506: Only an ambient class can be merged with an interface.
18+
!!! error TS2511: Only an ambient class can be merged with an interface.
1919
}
2020

2121
module M {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
tests/cases/compiler/file1.ts(2,11): error TS2506: Only an ambient class can be merged with an interface.
2-
tests/cases/compiler/file1.ts(3,7): error TS2506: Only an ambient class can be merged with an interface.
1+
tests/cases/compiler/file1.ts(2,11): error TS2511: Only an ambient class can be merged with an interface.
2+
tests/cases/compiler/file1.ts(3,7): error TS2511: Only an ambient class can be merged with an interface.
33
tests/cases/compiler/file1.ts(4,7): error TS2300: Duplicate identifier 'C2'.
44
tests/cases/compiler/file1.ts(5,10): error TS2300: Duplicate identifier 'f'.
55
tests/cases/compiler/file1.ts(9,12): error TS2300: Duplicate identifier 'x'.
6-
tests/cases/compiler/file2.ts(1,7): error TS2506: Only an ambient class can be merged with an interface.
7-
tests/cases/compiler/file2.ts(2,11): error TS2506: Only an ambient class can be merged with an interface.
6+
tests/cases/compiler/file2.ts(1,7): error TS2511: Only an ambient class can be merged with an interface.
7+
tests/cases/compiler/file2.ts(2,11): error TS2511: Only an ambient class can be merged with an interface.
88
tests/cases/compiler/file2.ts(3,10): error TS2300: Duplicate identifier 'C2'.
99
tests/cases/compiler/file2.ts(4,7): error TS2300: Duplicate identifier 'f'.
1010
tests/cases/compiler/file2.ts(7,8): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
@@ -15,10 +15,10 @@ tests/cases/compiler/file2.ts(8,16): error TS2300: Duplicate identifier 'x'.
1515

1616
interface I { }
1717
~
18-
!!! error TS2506: Only an ambient class can be merged with an interface.
18+
!!! error TS2511: Only an ambient class can be merged with an interface.
1919
class C1 { }
2020
~~
21-
!!! error TS2506: Only an ambient class can be merged with an interface.
21+
!!! error TS2511: Only an ambient class can be merged with an interface.
2222
class C2 { }
2323
~~
2424
!!! error TS2300: Duplicate identifier 'C2'.
@@ -42,10 +42,10 @@ tests/cases/compiler/file2.ts(8,16): error TS2300: Duplicate identifier 'x'.
4242
==== tests/cases/compiler/file2.ts (6 errors) ====
4343
class I { } // error -- cannot merge interface with non-ambient class
4444
~
45-
!!! error TS2506: Only an ambient class can be merged with an interface.
45+
!!! error TS2511: Only an ambient class can be merged with an interface.
4646
interface C1 { } // error -- cannot merge interface with non-ambient class
4747
~~
48-
!!! error TS2506: Only an ambient class can be merged with an interface.
48+
!!! error TS2511: Only an ambient class can be merged with an interface.
4949
function C2() { } // error -- cannot merge function with non-ambient class
5050
~~
5151
!!! error TS2300: Duplicate identifier 'C2'.

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

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

44

55
==== tests/cases/compiler/interfaceDeclaration2.ts (2 errors) ====
@@ -8,10 +8,10 @@ tests/cases/compiler/interfaceDeclaration2.ts(5,7): error TS2506: Only an ambien
88

99
interface I2 { }
1010
~~
11-
!!! error TS2506: Only an ambient class can be merged with an interface.
11+
!!! error TS2511: Only an ambient class can be merged with an interface.
1212
class I2 { }
1313
~~
14-
!!! error TS2506: Only an ambient class can be merged with an interface.
14+
!!! error TS2511: Only an ambient class can be merged with an interface.
1515

1616
interface I3 { }
1717
function I3() { }

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
tests/cases/conformance/classes/classDeclarations/file1.ts(11,7): error TS2506: Only an ambient class can be merged with an interface.
2-
tests/cases/conformance/classes/classDeclarations/file1.ts(13,11): error TS2506: Only an ambient class can be merged with an interface.
3-
tests/cases/conformance/classes/classDeclarations/file1.ts(15,11): error TS2506: Only an ambient class can be merged with an interface.
4-
tests/cases/conformance/classes/classDeclarations/file1.ts(17,7): error TS2506: Only an ambient class can be merged with an interface.
1+
tests/cases/conformance/classes/classDeclarations/file1.ts(11,7): error TS2511: Only an ambient class can be merged with an interface.
2+
tests/cases/conformance/classes/classDeclarations/file1.ts(13,11): error TS2511: Only an ambient class can be merged with an interface.
3+
tests/cases/conformance/classes/classDeclarations/file1.ts(15,11): error TS2511: Only an ambient class can be merged with an interface.
4+
tests/cases/conformance/classes/classDeclarations/file1.ts(17,7): error TS2511: Only an ambient class can be merged with an interface.
55

66

77
==== tests/cases/conformance/classes/classDeclarations/file1.ts (4 errors) ====
@@ -17,19 +17,19 @@ tests/cases/conformance/classes/classDeclarations/file1.ts(17,7): error TS2506:
1717

1818
class C3 { } // error -- cannot merge non-ambient class and interface
1919
~~
20-
!!! error TS2506: Only an ambient class can be merged with an interface.
20+
!!! error TS2511: Only an ambient class can be merged with an interface.
2121

2222
interface C3 { } // error -- cannot merge non-ambient class and interface
2323
~~
24-
!!! error TS2506: Only an ambient class can be merged with an interface.
24+
!!! error TS2511: Only an ambient class can be merged with an interface.
2525

2626
interface C4 { } // error -- cannot merge non-ambient class and interface
2727
~~
28-
!!! error TS2506: Only an ambient class can be merged with an interface.
28+
!!! error TS2511: Only an ambient class can be merged with an interface.
2929

3030
class C4 { } // error -- cannot merge non-ambient class and interface
3131
~~
32-
!!! error TS2506: Only an ambient class can be merged with an interface.
32+
!!! error TS2511: Only an ambient class can be merged with an interface.
3333

3434
interface C5 {
3535
x1: number;

0 commit comments

Comments
 (0)