Skip to content

Merged Declarations for Classes and Interfaces #3333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aozgaa merged 37 commits into from
Jul 2, 2015
Merged

Merged Declarations for Classes and Interfaces #3333

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
813d227
classInterface: changed excludes flags
May 27, 2015
18abf47
Revert "classInterface: changed excludes flags"
Jun 1, 2015
05500f4
Added merged declarations for ambient class/interfaces
Jun 1, 2015
6b8d033
Merge branch 'master' into mergedDeclarationClassInterface
Jun 1, 2015
6c98c67
added conformance tests
Jun 1, 2015
b864df2
New Baselines for class-interface merging
Jun 1, 2015
ed46bc3
Fixed intendation typo
Jun 1, 2015
d25b910
fixed indentation
Jun 1, 2015
1f74b13
fixed style, added comment
Jun 2, 2015
2d77cbd
cleaner hasNonAmbientClass
Jun 2, 2015
edc4611
removed comma
Jun 2, 2015
a50ab3e
Remove checking in declareSymbol
Jun 2, 2015
90e1955
merge compatiblity now performed in checker.ts
Jun 2, 2015
c629c3f
deleted redundant tests
Jun 2, 2015
e4bc29e
Updated tests
Jun 2, 2015
b293da4
updated baselines
Jun 2, 2015
936aea8
fixed merge conflict
Jun 2, 2015
0917582
removed extra newlines
Jun 2, 2015
fa06f3e
fixed merge conflict.
Jun 2, 2015
fa9b6fc
fixed loops, merged baseline
Jun 3, 2015
9e1ab92
merged with master
Jun 3, 2015
f3278e2
fixed a grammatical issue
Jun 3, 2015
2b899f1
simplified check
Jun 3, 2015
29c9286
Updated error message
Jun 3, 2015
d000e01
updated baselines to reflect new error message
Jun 3, 2015
143890b
New test
Jun 3, 2015
323ce24
new baselines got mergeClassInterfaceAndModule
Jun 3, 2015
365ea3d
Check for ambient context instead of ambient flag
Jun 3, 2015
015c2c1
Merge branch 'master' into mergedDeclarationClassInterface
Jun 3, 2015
5ef426c
new baselines
Jun 3, 2015
3a3479d
New Test and Baseline
Jun 4, 2015
19b0c51
merged master
Jun 17, 2015
91e3a5c
updated baselines
Jun 18, 2015
851c7e4
fixed comment, spacing
Jun 18, 2015
4878cce
merged with master
Jul 2, 2015
c06e5eb
Update test
Jul 2, 2015
3af3177
update baselines
Jul 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
new baselines
  • Loading branch information
Arthur Ozga committed Jun 3, 2015
commit 5ef426ca02eb15605caa1aff6c4eccf70ffe06ad
46 changes: 0 additions & 46 deletions tests/baselines/reference/classAndInterfaceMerge.d.errors.txt
View file
Open in desktop

This file was deleted.

39 changes: 39 additions & 0 deletions tests/baselines/reference/classAndInterfaceMerge.d.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 39 additions & 0 deletions tests/baselines/reference/classAndInterfaceMerge.d.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}