Skip to content

Constructor Visibility #6885

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
mhegazy merged 18 commits into from
Feb 17, 2016
Merged

Constructor Visibility #6885

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f869b41
Added private and protected modifiers to constructors
AbubakerB Feb 3, 2016
c351ffc
Added and updated tests for constructor visibility
AbubakerB Feb 3, 2016
bbf92ce
Added constructor visibility in the declaration emitter
AbubakerB Feb 4, 2016
3d529a8
Update baselines
AbubakerB Feb 4, 2016
4200051
Addressed PR feedback.
AbubakerB Feb 4, 2016
4c93eb2
Accept baselines
AbubakerB Feb 4, 2016
5ce0202
Refactored visibility text on modifier grammar check
AbubakerB Feb 4, 2016
16b54e0
Addressed PR. Diagnostic messages
AbubakerB Feb 4, 2016
037b657
Accept baselines
AbubakerB Feb 4, 2016
a6a5a22
Addressed PR
AbubakerB Feb 5, 2016
d0843e1
Merge branch 'ts-master' into constructorAccessibility
AbubakerB Feb 12, 2016
8ef9599
Allow extending and instantiating a private or protected class within…
AbubakerB Feb 13, 2016
ec7e80e
Added tests and accept baselines
AbubakerB Feb 13, 2016
91ea83c
Addressed PR
AbubakerB Feb 13, 2016
208830e
Updated tests and accepted baseline
AbubakerB Feb 13, 2016
2d7a0f4
Merge branch 'master' into constructorAccessibility
AbubakerB Feb 14, 2016
ba8b168
Included previously ignored baseline .js file and slight refactoring
AbubakerB Feb 14, 2016
de23e2f
Merge branch 'master' into constructorAccessibility
AbubakerB Feb 16, 2016
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
Accept baselines
  • Loading branch information
@AbubakerB
AbubakerB committed Feb 4, 2016
commit 4c93eb2e98703ae86c81721d28b03babdf24bc61
37 changes: 6 additions & 31 deletions tests/baselines/reference/classConstructorAccessibility3.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,11 @@ tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessib
Cannot assign a 'protected' constructor type to a 'public' constructor type.
tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts(22,1): error TS2322: Type 'typeof Qux' is not assignable to type 'typeof Foo'.
Cannot assign a 'private' constructor type to a 'public' constructor type.
tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts(26,1): error TS2322: Type 'typeof Foo' is not assignable to type 'typeof Baz'.
Cannot assign a 'public' constructor type to a 'protected' constructor type.
tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts(27,1): error TS2322: Type 'typeof Bar' is not assignable to type 'typeof Baz'.
Cannot assign a 'public' constructor type to a 'protected' constructor type.
tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts(28,1): error TS2322: Type 'typeof Qux' is not assignable to type 'typeof Baz'.
Cannot assign a 'private' constructor type to a 'protected' constructor type.
tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts(32,1): error TS2322: Type 'typeof Foo' is not assignable to type 'typeof Qux'.
Cannot assign a 'public' constructor type to a 'private' constructor type.
tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts(33,1): error TS2322: Type 'typeof Bar' is not assignable to type 'typeof Qux'.
Cannot assign a 'public' constructor type to a 'private' constructor type.
tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts(34,1): error TS2322: Type 'typeof Baz' is not assignable to type 'typeof Qux'.
Cannot assign a 'protected' constructor type to a 'private' constructor type.


==== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts (8 errors) ====
==== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts (3 errors) ====

class Foo {
constructor(public x: number) { }
Expand Down Expand Up @@ -48,30 +38,15 @@ tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessib

// b is protected
let b = Baz;
b = Foo; // error Foo is public
~
!!! error TS2322: Type 'typeof Foo' is not assignable to type 'typeof Baz'.
!!! error TS2322: Cannot assign a 'public' constructor type to a 'protected' constructor type.
b = Bar; // error Baz is public
~
!!! error TS2322: Type 'typeof Bar' is not assignable to type 'typeof Baz'.
!!! error TS2322: Cannot assign a 'public' constructor type to a 'protected' constructor type.
b = Foo;
b = Bar;
b = Qux; // error Qux is private
~
!!! error TS2322: Type 'typeof Qux' is not assignable to type 'typeof Baz'.
!!! error TS2322: Cannot assign a 'private' constructor type to a 'protected' constructor type.

// c is private
let c = Qux;
c = Foo; // error Foo is public
~
!!! error TS2322: Type 'typeof Foo' is not assignable to type 'typeof Qux'.
!!! error TS2322: Cannot assign a 'public' constructor type to a 'private' constructor type.
c = Bar; // error Bar is public
~
!!! error TS2322: Type 'typeof Bar' is not assignable to type 'typeof Qux'.
!!! error TS2322: Cannot assign a 'public' constructor type to a 'private' constructor type.
c = Baz; // error Baz is protected
~
!!! error TS2322: Type 'typeof Baz' is not assignable to type 'typeof Qux'.
!!! error TS2322: Cannot assign a 'protected' constructor type to a 'private' constructor type.
c = Foo;
c = Bar;
c = Baz;
20 changes: 10 additions & 10 deletions tests/baselines/reference/classConstructorAccessibility3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ a = Qux; // error Qux is private

// b is protected
let b = Baz;
b = Foo; // error Foo is public
b = Bar; // error Baz is public
b = Foo;
b = Bar;
b = Qux; // error Qux is private

// c is private
let c = Qux;
c = Foo; // error Foo is public
c = Bar; // error Bar is public
c = Baz; // error Baz is protected
c = Foo;
c = Bar;
c = Baz;

//// [classConstructorAccessibility3.js]
var Foo = (function () {
Expand Down Expand Up @@ -66,14 +66,14 @@ a = Baz; // error Baz is protected
a = Qux; // error Qux is private
// b is protected
var b = Baz;
b = Foo; // error Foo is public
b = Bar; // error Baz is public
b = Foo;
b = Bar;
b = Qux; // error Qux is private
// c is private
var c = Qux;
c = Foo; // error Foo is public
c = Bar; // error Bar is public
c = Baz; // error Baz is protected
c = Foo;
c = Bar;
c = Baz;


//// [classConstructorAccessibility3.d.ts]
Expand Down
10 changes: 5 additions & 5 deletions tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ a = Qux; // error Qux is private

// b is protected
let b = Baz;
b = Foo; // error Foo is public
b = Bar; // error Baz is public
b = Foo;
b = Bar;
b = Qux; // error Qux is private

// c is private
let c = Qux;
c = Foo; // error Foo is public
c = Bar; // error Bar is public
c = Baz; // error Baz is protected
c = Foo;
c = Bar;
c = Baz;