maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

new baselines

Browse source
This commit is contained in:
Arthur Ozga 2015-06-03 16:11:19 -07:00
parent 015c2c1ab2
commit 5ef426ca02
3 changed files with 78 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
tests/baselines/reference/classAndInterfaceMerge.d.errors.txt
View file

@ -1,46 +0,0 @@
tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts(12,15): error TS2506: Only an ambient class can be merged with an interface.
tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts(14,11): error TS2506: Only an ambient class can be merged with an interface.
tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts(16,15): error TS2506: Only an ambient class can be merged with an interface.
tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts(18,15): error TS2506: Only an ambient class can be merged with an interface.
tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts(20,18): error TS2506: Only an ambient class can be merged with an interface.
tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts(24,22): error TS2506: Only an ambient class can be merged with an interface.
==== tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts (6 errors) ====
interface C { }
declare class C { }
interface C { }
interface C { }
declare module M {
interface C1 { }
~~
!!! error TS2506: Only an ambient class can be merged with an interface.
class C1 { }
~~
!!! error TS2506: Only an ambient class can be merged with an interface.
interface C1 { }
~~
!!! error TS2506: Only an ambient class can be merged with an interface.
interface C1 { }
~~
!!! error TS2506: Only an ambient class can be merged with an interface.
export class C2 { }
~~
!!! error TS2506: Only an ambient class can be merged with an interface.
}
declare module M {
export interface C2 { }
~~
!!! error TS2506: Only an ambient class can be merged with an interface.
}

39
tests/baselines/reference/classAndInterfaceMerge.d.symbols Normal file
View file

@ -0,0 +1,39 @@
=== tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts ===
interface C { }
>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))
declare class C { }
>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))
interface C { }
>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))
interface C { }
>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))
declare module M {
>M : Symbol(M, Decl(classAndInterfaceMerge.d.ts, 7, 15), Decl(classAndInterfaceMerge.d.ts, 20, 1))
interface C1 { }
>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))
class C1 { }
>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))
interface C1 { }
>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))
interface C1 { }
>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))
export class C2 { }
>C2 : Symbol(C2, Decl(classAndInterfaceMerge.d.ts, 17, 20), Decl(classAndInterfaceMerge.d.ts, 22, 18))
}
declare module M {
>M : Symbol(M, Decl(classAndInterfaceMerge.d.ts, 7, 15), Decl(classAndInterfaceMerge.d.ts, 20, 1))
export interface C2 { }
>C2 : Symbol(C2, Decl(classAndInterfaceMerge.d.ts, 17, 20), Decl(classAndInterfaceMerge.d.ts, 22, 18))
}

39
tests/baselines/reference/classAndInterfaceMerge.d.types Normal file
View file

@ -0,0 +1,39 @@
=== tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts ===
interface C { }
>C : C
declare class C { }
>C : C
interface C { }
>C : C
interface C { }
>C : C
declare module M {
>M : typeof M
interface C1 { }
>C1 : C1
class C1 { }
>C1 : C1
interface C1 { }
>C1 : C1
interface C1 { }
>C1 : C1
export class C2 { }
>C2 : C2
}
declare module M {
>M : typeof M
export interface C2 { }
>C2 : C2
}