Skip to content

Commit 323ce24

Browse files
author
Arthur Ozga
committed
new baselines got mergeClassInterfaceAndModule
1 parent 143890b commit 323ce24

File tree

3 files changed

+95
-0
lines changed

3 files changed

+95
-0
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//// [mergeClassInterfaceAndModule.ts]
2+
3+
interface C1 {}
4+
declare class C1 {}
5+
module C1 {}
6+
7+
declare class C2 {}
8+
interface C2 {}
9+
module C2 {}
10+
11+
declare class C3 {}
12+
module C3 {}
13+
interface C3 {}
14+
15+
module C4 {}
16+
declare class C4 {} // error -- class declaration must preceed module declaration
17+
interface C4 {}
18+
19+
//// [mergeClassInterfaceAndModule.js]
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
=== tests/cases/conformance/classes/classDeclarations/mergeClassInterfaceAndModule.ts ===
2+
3+
interface C1 {}
4+
>C1 : Symbol(C1, Decl(mergeClassInterfaceAndModule.ts, 0, 0), Decl(mergeClassInterfaceAndModule.ts, 1, 15), Decl(mergeClassInterfaceAndModule.ts, 2, 19))
5+
6+
declare class C1 {}
7+
>C1 : Symbol(C1, Decl(mergeClassInterfaceAndModule.ts, 0, 0), Decl(mergeClassInterfaceAndModule.ts, 1, 15), Decl(mergeClassInterfaceAndModule.ts, 2, 19))
8+
9+
module C1 {}
10+
>C1 : Symbol(C1, Decl(mergeClassInterfaceAndModule.ts, 0, 0), Decl(mergeClassInterfaceAndModule.ts, 1, 15), Decl(mergeClassInterfaceAndModule.ts, 2, 19))
11+
12+
declare class C2 {}
13+
>C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 3, 12), Decl(mergeClassInterfaceAndModule.ts, 5, 19), Decl(mergeClassInterfaceAndModule.ts, 6, 15))
14+
15+
interface C2 {}
16+
>C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 3, 12), Decl(mergeClassInterfaceAndModule.ts, 5, 19), Decl(mergeClassInterfaceAndModule.ts, 6, 15))
17+
18+
module C2 {}
19+
>C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 3, 12), Decl(mergeClassInterfaceAndModule.ts, 5, 19), Decl(mergeClassInterfaceAndModule.ts, 6, 15))
20+
21+
declare class C3 {}
22+
>C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 7, 12), Decl(mergeClassInterfaceAndModule.ts, 9, 19), Decl(mergeClassInterfaceAndModule.ts, 10, 12))
23+
24+
module C3 {}
25+
>C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 7, 12), Decl(mergeClassInterfaceAndModule.ts, 9, 19), Decl(mergeClassInterfaceAndModule.ts, 10, 12))
26+
27+
interface C3 {}
28+
>C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 7, 12), Decl(mergeClassInterfaceAndModule.ts, 9, 19), Decl(mergeClassInterfaceAndModule.ts, 10, 12))
29+
30+
module C4 {}
31+
>C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 11, 15), Decl(mergeClassInterfaceAndModule.ts, 13, 12), Decl(mergeClassInterfaceAndModule.ts, 14, 19))
32+
33+
declare class C4 {} // error -- class declaration must preceed module declaration
34+
>C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 11, 15), Decl(mergeClassInterfaceAndModule.ts, 13, 12), Decl(mergeClassInterfaceAndModule.ts, 14, 19))
35+
36+
interface C4 {}
37+
>C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 11, 15), Decl(mergeClassInterfaceAndModule.ts, 13, 12), Decl(mergeClassInterfaceAndModule.ts, 14, 19))
38+
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
=== tests/cases/conformance/classes/classDeclarations/mergeClassInterfaceAndModule.ts ===
2+
3+
interface C1 {}
4+
>C1 : C1
5+
6+
declare class C1 {}
7+
>C1 : C1
8+
9+
module C1 {}
10+
>C1 : typeof C1
11+
12+
declare class C2 {}
13+
>C2 : C2
14+
15+
interface C2 {}
16+
>C2 : C2
17+
18+
module C2 {}
19+
>C2 : typeof C2
20+
21+
declare class C3 {}
22+
>C3 : C3
23+
24+
module C3 {}
25+
>C3 : typeof C3
26+
27+
interface C3 {}
28+
>C3 : C3
29+
30+
module C4 {}
31+
>C4 : typeof C4
32+
33+
declare class C4 {} // error -- class declaration must preceed module declaration
34+
>C4 : C4
35+
36+
interface C4 {}
37+
>C4 : C4
38+

0 commit comments

Comments
 (0)