Skip to content

Commit 5ef426c

Browse files
author
Arthur Ozga
committed
new baselines
1 parent 015c2c1 commit 5ef426c

File tree

3 files changed

+78
-46
lines changed

3 files changed

+78
-46
lines changed

tests/baselines/reference/classAndInterfaceMerge.d.errors.txt

Lines changed: 0 additions & 46 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
=== tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts ===
2+
3+
interface C { }
4+
>C : Symbol(C, Decl(classAndInterfaceMerge.d.ts, 0, 0), Decl(classAndInterfaceMerge.d.ts, 1, 15), Decl(classAndInterfaceMerge.d.ts, 3, 19), Decl(classAndInterfaceMerge.d.ts, 5, 15))
5+
6+
declare class C { }
7+
>C : Symbol(C, Decl(classAndInterfaceMerge.d.ts, 0, 0), Decl(classAndInterfaceMerge.d.ts, 1, 15), Decl(classAndInterfaceMerge.d.ts, 3, 19), Decl(classAndInterfaceMerge.d.ts, 5, 15))
8+
9+
interface C { }
10+
>C : Symbol(C, Decl(classAndInterfaceMerge.d.ts, 0, 0), Decl(classAndInterfaceMerge.d.ts, 1, 15), Decl(classAndInterfaceMerge.d.ts, 3, 19), Decl(classAndInterfaceMerge.d.ts, 5, 15))
11+
12+
interface C { }
13+
>C : Symbol(C, Decl(classAndInterfaceMerge.d.ts, 0, 0), Decl(classAndInterfaceMerge.d.ts, 1, 15), Decl(classAndInterfaceMerge.d.ts, 3, 19), Decl(classAndInterfaceMerge.d.ts, 5, 15))
14+
15+
declare module M {
16+
>M : Symbol(M, Decl(classAndInterfaceMerge.d.ts, 7, 15), Decl(classAndInterfaceMerge.d.ts, 20, 1))
17+
18+
interface C1 { }
19+
>C1 : Symbol(C1, Decl(classAndInterfaceMerge.d.ts, 9, 18), Decl(classAndInterfaceMerge.d.ts, 11, 20), Decl(classAndInterfaceMerge.d.ts, 13, 16), Decl(classAndInterfaceMerge.d.ts, 15, 20))
20+
21+
class C1 { }
22+
>C1 : Symbol(C1, Decl(classAndInterfaceMerge.d.ts, 9, 18), Decl(classAndInterfaceMerge.d.ts, 11, 20), Decl(classAndInterfaceMerge.d.ts, 13, 16), Decl(classAndInterfaceMerge.d.ts, 15, 20))
23+
24+
interface C1 { }
25+
>C1 : Symbol(C1, Decl(classAndInterfaceMerge.d.ts, 9, 18), Decl(classAndInterfaceMerge.d.ts, 11, 20), Decl(classAndInterfaceMerge.d.ts, 13, 16), Decl(classAndInterfaceMerge.d.ts, 15, 20))
26+
27+
interface C1 { }
28+
>C1 : Symbol(C1, Decl(classAndInterfaceMerge.d.ts, 9, 18), Decl(classAndInterfaceMerge.d.ts, 11, 20), Decl(classAndInterfaceMerge.d.ts, 13, 16), Decl(classAndInterfaceMerge.d.ts, 15, 20))
29+
30+
export class C2 { }
31+
>C2 : Symbol(C2, Decl(classAndInterfaceMerge.d.ts, 17, 20), Decl(classAndInterfaceMerge.d.ts, 22, 18))
32+
}
33+
34+
declare module M {
35+
>M : Symbol(M, Decl(classAndInterfaceMerge.d.ts, 7, 15), Decl(classAndInterfaceMerge.d.ts, 20, 1))
36+
37+
export interface C2 { }
38+
>C2 : Symbol(C2, Decl(classAndInterfaceMerge.d.ts, 17, 20), Decl(classAndInterfaceMerge.d.ts, 22, 18))
39+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
=== tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts ===
2+
3+
interface C { }
4+
>C : C
5+
6+
declare class C { }
7+
>C : C
8+
9+
interface C { }
10+
>C : C
11+
12+
interface C { }
13+
>C : C
14+
15+
declare module M {
16+
>M : typeof M
17+
18+
interface C1 { }
19+
>C1 : C1
20+
21+
class C1 { }
22+
>C1 : C1
23+
24+
interface C1 { }
25+
>C1 : C1
26+
27+
interface C1 { }
28+
>C1 : C1
29+
30+
export class C2 { }
31+
>C2 : C2
32+
}
33+
34+
declare module M {
35+
>M : typeof M
36+
37+
export interface C2 { }
38+
>C2 : C2
39+
}

0 commit comments

Comments
 (0)