From 0bcbbbdd582cc44ee0d2a987ced8af1cb0e8349d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E7=92=90?= Date: Tue, 5 Jun 2018 18:42:21 +0800 Subject: [PATCH] disallow static field access --- src/compiler/checker.ts | 4 +- .../thisTypeAccessibility.errors.txt | 36 +++- .../reference/thisTypeAccessibility.js | 24 +++ .../reference/thisTypeAccessibility.symbols | 163 ++++++++++++------ .../reference/thisTypeAccessibility.types | 83 ++++++++- .../types/thisType/thisTypeAccessibility.ts | 12 ++ 6 files changed, 263 insertions(+), 59 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a9243186802..be8b11bf1f0 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -17109,7 +17109,7 @@ namespace ts { if (!enclosingClass) { let thisParameter: ParameterDeclaration | undefined; const thisContainer = getThisContainer(node, /* includeArrowFunctions */ false); - if (!thisContainer || !isFunctionLike(thisContainer) || !(thisParameter = getThisParameter(thisContainer)) || !thisParameter.type) { + if (flags & ModifierFlags.Static || !thisContainer || !isFunctionLike(thisContainer) || !(thisParameter = getThisParameter(thisContainer)) || !thisParameter.type) { error(errorNode, Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(getDeclaringClass(prop) || type)); return false; } @@ -17121,7 +17121,7 @@ namespace ts { if (flags & ModifierFlags.Static) { return true; } - if (type.flags & TypeFlags.TypeParameter) { + if (type.flags & TypeFlags.TypeParameter) { // get the original type -- represented as the type constraint of the 'this' type type = (type as TypeParameter).isThisType ? getConstraintOfTypeParameter(type)! : getBaseConstraintOfType(type)!; // TODO: GH#18217 Use a different variable that's allowed to be undefined } diff --git a/tests/baselines/reference/thisTypeAccessibility.errors.txt b/tests/baselines/reference/thisTypeAccessibility.errors.txt index bfdc297fa83..915d6f20b82 100644 --- a/tests/baselines/reference/thisTypeAccessibility.errors.txt +++ b/tests/baselines/reference/thisTypeAccessibility.errors.txt @@ -1,13 +1,22 @@ -tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(14,10): error TS2341: Property 'p' is private and only accessible within class 'MyClass'. -tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(20,10): error TS2341: Property 'p' is private and only accessible within class 'MyClass'. +tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(17,10): error TS2341: Property 'p' is private and only accessible within class 'MyClass'. +tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(20,13): error TS2341: Property 'sp' is private and only accessible within class 'MyClass'. +tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(21,13): error TS2445: Property 'spp' is protected and only accessible within class 'MyClass' and its subclasses. tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(26,10): error TS2341: Property 'p' is private and only accessible within class 'MyClass'. +tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(29,13): error TS2341: Property 'sp' is private and only accessible within class 'MyClass'. +tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(30,13): error TS2445: Property 'spp' is protected and only accessible within class 'MyClass' and its subclasses. +tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(35,10): error TS2341: Property 'p' is private and only accessible within class 'MyClass'. +tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(38,13): error TS2341: Property 'sp' is private and only accessible within class 'MyClass'. +tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(39,13): error TS2445: Property 'spp' is protected and only accessible within class 'MyClass' and its subclasses. -==== tests/cases/conformance/types/thisType/thisTypeAccessibility.ts (3 errors) ==== +==== tests/cases/conformance/types/thisType/thisTypeAccessibility.ts (9 errors) ==== class MyClass { private p: number = 123; protected pp: number = 123; public ppp: number = 123; + private static sp: number = 123; + protected static spp: number = 123; + public static sppp: number = 123; } interface MyClass { @@ -22,6 +31,13 @@ tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(26,10): error TS !!! error TS2341: Property 'p' is private and only accessible within class 'MyClass'. this.pp = p; this.ppp = p; + MyClass.sp = p; + ~~ +!!! error TS2341: Property 'sp' is private and only accessible within class 'MyClass'. + MyClass.spp = p; + ~~~ +!!! error TS2445: Property 'spp' is protected and only accessible within class 'MyClass' and its subclasses. + MyClass.sppp = p; } MyClass.prototype.extension2 = function (this: T, p: number) { @@ -30,6 +46,13 @@ tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(26,10): error TS !!! error TS2341: Property 'p' is private and only accessible within class 'MyClass'. this.pp = p; this.ppp = p; + MyClass.sp = p; + ~~ +!!! error TS2341: Property 'sp' is private and only accessible within class 'MyClass'. + MyClass.spp = p; + ~~~ +!!! error TS2445: Property 'spp' is protected and only accessible within class 'MyClass' and its subclasses. + MyClass.sppp = p; } function extension3 (this: T, p: number) { @@ -38,6 +61,13 @@ tests/cases/conformance/types/thisType/thisTypeAccessibility.ts(26,10): error TS !!! error TS2341: Property 'p' is private and only accessible within class 'MyClass'. this.pp = p; this.ppp = p; + MyClass.sp = p; + ~~ +!!! error TS2341: Property 'sp' is private and only accessible within class 'MyClass'. + MyClass.spp = p; + ~~~ +!!! error TS2445: Property 'spp' is protected and only accessible within class 'MyClass' and its subclasses. + MyClass.sppp = p; } MyClass.prototype.extension3 = extension3; diff --git a/tests/baselines/reference/thisTypeAccessibility.js b/tests/baselines/reference/thisTypeAccessibility.js index a2695d1d670..04340cebcd3 100644 --- a/tests/baselines/reference/thisTypeAccessibility.js +++ b/tests/baselines/reference/thisTypeAccessibility.js @@ -3,6 +3,9 @@ class MyClass { private p: number = 123; protected pp: number = 123; public ppp: number = 123; + private static sp: number = 123; + protected static spp: number = 123; + public static sppp: number = 123; } interface MyClass { @@ -15,18 +18,27 @@ MyClass.prototype.extension1 = function (this: MyClass, p: number) { this.p = p; this.pp = p; this.ppp = p; + MyClass.sp = p; + MyClass.spp = p; + MyClass.sppp = p; } MyClass.prototype.extension2 = function (this: T, p: number) { this.p = p; this.pp = p; this.ppp = p; + MyClass.sp = p; + MyClass.spp = p; + MyClass.sppp = p; } function extension3 (this: T, p: number) { this.p = p; this.pp = p; this.ppp = p; + MyClass.sp = p; + MyClass.spp = p; + MyClass.sppp = p; } MyClass.prototype.extension3 = extension3; @@ -39,21 +51,33 @@ var MyClass = /** @class */ (function () { this.pp = 123; this.ppp = 123; } + MyClass.sp = 123; + MyClass.spp = 123; + MyClass.sppp = 123; return MyClass; }()); MyClass.prototype.extension1 = function (p) { this.p = p; this.pp = p; this.ppp = p; + MyClass.sp = p; + MyClass.spp = p; + MyClass.sppp = p; }; MyClass.prototype.extension2 = function (p) { this.p = p; this.pp = p; this.ppp = p; + MyClass.sp = p; + MyClass.spp = p; + MyClass.sppp = p; }; function extension3(p) { this.p = p; this.pp = p; this.ppp = p; + MyClass.sp = p; + MyClass.spp = p; + MyClass.sppp = p; } MyClass.prototype.extension3 = extension3; diff --git a/tests/baselines/reference/thisTypeAccessibility.symbols b/tests/baselines/reference/thisTypeAccessibility.symbols index 0919d83f8e4..bbb62fa57bc 100644 --- a/tests/baselines/reference/thisTypeAccessibility.symbols +++ b/tests/baselines/reference/thisTypeAccessibility.symbols @@ -1,6 +1,6 @@ === tests/cases/conformance/types/thisType/thisTypeAccessibility.ts === class MyClass { ->MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 4, 1)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) private p: number = 123; >p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15)) @@ -10,116 +10,179 @@ class MyClass { public ppp: number = 123; >ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31)) + + private static sp: number = 123; +>sp : Symbol(MyClass.sp, Decl(thisTypeAccessibility.ts, 3, 29)) + + protected static spp: number = 123; +>spp : Symbol(MyClass.spp, Decl(thisTypeAccessibility.ts, 4, 36)) + + public static sppp: number = 123; +>sppp : Symbol(MyClass.sppp, Decl(thisTypeAccessibility.ts, 5, 39)) } interface MyClass { ->MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 4, 1)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) extension1(p: number): void; ->extension1 : Symbol(MyClass.extension1, Decl(thisTypeAccessibility.ts, 6, 19)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 7, 15)) +>extension1 : Symbol(MyClass.extension1, Decl(thisTypeAccessibility.ts, 9, 19)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 10, 15)) extension2(p: number): void; ->extension2 : Symbol(MyClass.extension2, Decl(thisTypeAccessibility.ts, 7, 32)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 8, 15)) +>extension2 : Symbol(MyClass.extension2, Decl(thisTypeAccessibility.ts, 10, 32)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 11, 15)) extension3(p: number): void; ->extension3 : Symbol(MyClass.extension3, Decl(thisTypeAccessibility.ts, 8, 32)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 9, 15)) +>extension3 : Symbol(MyClass.extension3, Decl(thisTypeAccessibility.ts, 11, 32)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 12, 15)) } MyClass.prototype.extension1 = function (this: MyClass, p: number) { ->MyClass.prototype.extension1 : Symbol(MyClass.extension1, Decl(thisTypeAccessibility.ts, 6, 19)) +>MyClass.prototype.extension1 : Symbol(MyClass.extension1, Decl(thisTypeAccessibility.ts, 9, 19)) >MyClass.prototype : Symbol(MyClass.prototype) ->MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 4, 1)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) >prototype : Symbol(MyClass.prototype) ->extension1 : Symbol(MyClass.extension1, Decl(thisTypeAccessibility.ts, 6, 19)) ->this : Symbol(this, Decl(thisTypeAccessibility.ts, 12, 41)) ->MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 4, 1)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 12, 55)) +>extension1 : Symbol(MyClass.extension1, Decl(thisTypeAccessibility.ts, 9, 19)) +>this : Symbol(this, Decl(thisTypeAccessibility.ts, 15, 41)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 15, 55)) this.p = p; >this.p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15)) ->this : Symbol(this, Decl(thisTypeAccessibility.ts, 12, 41)) +>this : Symbol(this, Decl(thisTypeAccessibility.ts, 15, 41)) >p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 12, 55)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 15, 55)) this.pp = p; >this.pp : Symbol(MyClass.pp, Decl(thisTypeAccessibility.ts, 1, 28)) ->this : Symbol(this, Decl(thisTypeAccessibility.ts, 12, 41)) +>this : Symbol(this, Decl(thisTypeAccessibility.ts, 15, 41)) >pp : Symbol(MyClass.pp, Decl(thisTypeAccessibility.ts, 1, 28)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 12, 55)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 15, 55)) this.ppp = p; >this.ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31)) ->this : Symbol(this, Decl(thisTypeAccessibility.ts, 12, 41)) +>this : Symbol(this, Decl(thisTypeAccessibility.ts, 15, 41)) >ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 12, 55)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 15, 55)) + + MyClass.sp = p; +>MyClass.sp : Symbol(MyClass.sp, Decl(thisTypeAccessibility.ts, 3, 29)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) +>sp : Symbol(MyClass.sp, Decl(thisTypeAccessibility.ts, 3, 29)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 15, 55)) + + MyClass.spp = p; +>MyClass.spp : Symbol(MyClass.spp, Decl(thisTypeAccessibility.ts, 4, 36)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) +>spp : Symbol(MyClass.spp, Decl(thisTypeAccessibility.ts, 4, 36)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 15, 55)) + + MyClass.sppp = p; +>MyClass.sppp : Symbol(MyClass.sppp, Decl(thisTypeAccessibility.ts, 5, 39)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) +>sppp : Symbol(MyClass.sppp, Decl(thisTypeAccessibility.ts, 5, 39)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 15, 55)) } MyClass.prototype.extension2 = function (this: T, p: number) { ->MyClass.prototype.extension2 : Symbol(MyClass.extension2, Decl(thisTypeAccessibility.ts, 7, 32)) +>MyClass.prototype.extension2 : Symbol(MyClass.extension2, Decl(thisTypeAccessibility.ts, 10, 32)) >MyClass.prototype : Symbol(MyClass.prototype) ->MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 4, 1)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) >prototype : Symbol(MyClass.prototype) ->extension2 : Symbol(MyClass.extension2, Decl(thisTypeAccessibility.ts, 7, 32)) ->T : Symbol(T, Decl(thisTypeAccessibility.ts, 18, 40)) ->MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 4, 1)) ->this : Symbol(this, Decl(thisTypeAccessibility.ts, 18, 60)) ->T : Symbol(T, Decl(thisTypeAccessibility.ts, 18, 40)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 18, 68)) +>extension2 : Symbol(MyClass.extension2, Decl(thisTypeAccessibility.ts, 10, 32)) +>T : Symbol(T, Decl(thisTypeAccessibility.ts, 24, 40)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) +>this : Symbol(this, Decl(thisTypeAccessibility.ts, 24, 60)) +>T : Symbol(T, Decl(thisTypeAccessibility.ts, 24, 40)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 68)) this.p = p; >this.p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15)) ->this : Symbol(this, Decl(thisTypeAccessibility.ts, 18, 60)) +>this : Symbol(this, Decl(thisTypeAccessibility.ts, 24, 60)) >p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 18, 68)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 68)) this.pp = p; >this.pp : Symbol(MyClass.pp, Decl(thisTypeAccessibility.ts, 1, 28)) ->this : Symbol(this, Decl(thisTypeAccessibility.ts, 18, 60)) +>this : Symbol(this, Decl(thisTypeAccessibility.ts, 24, 60)) >pp : Symbol(MyClass.pp, Decl(thisTypeAccessibility.ts, 1, 28)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 18, 68)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 68)) this.ppp = p; >this.ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31)) ->this : Symbol(this, Decl(thisTypeAccessibility.ts, 18, 60)) +>this : Symbol(this, Decl(thisTypeAccessibility.ts, 24, 60)) >ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 18, 68)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 68)) + + MyClass.sp = p; +>MyClass.sp : Symbol(MyClass.sp, Decl(thisTypeAccessibility.ts, 3, 29)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) +>sp : Symbol(MyClass.sp, Decl(thisTypeAccessibility.ts, 3, 29)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 68)) + + MyClass.spp = p; +>MyClass.spp : Symbol(MyClass.spp, Decl(thisTypeAccessibility.ts, 4, 36)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) +>spp : Symbol(MyClass.spp, Decl(thisTypeAccessibility.ts, 4, 36)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 68)) + + MyClass.sppp = p; +>MyClass.sppp : Symbol(MyClass.sppp, Decl(thisTypeAccessibility.ts, 5, 39)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) +>sppp : Symbol(MyClass.sppp, Decl(thisTypeAccessibility.ts, 5, 39)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 68)) } function extension3 (this: T, p: number) { ->extension3 : Symbol(extension3, Decl(thisTypeAccessibility.ts, 22, 1)) ->T : Symbol(T, Decl(thisTypeAccessibility.ts, 24, 20)) ->MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 4, 1)) ->this : Symbol(this, Decl(thisTypeAccessibility.ts, 24, 40)) ->T : Symbol(T, Decl(thisTypeAccessibility.ts, 24, 20)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 48)) +>extension3 : Symbol(extension3, Decl(thisTypeAccessibility.ts, 31, 1)) +>T : Symbol(T, Decl(thisTypeAccessibility.ts, 33, 20)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) +>this : Symbol(this, Decl(thisTypeAccessibility.ts, 33, 40)) +>T : Symbol(T, Decl(thisTypeAccessibility.ts, 33, 20)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 33, 48)) this.p = p; >this.p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15)) ->this : Symbol(this, Decl(thisTypeAccessibility.ts, 24, 40)) +>this : Symbol(this, Decl(thisTypeAccessibility.ts, 33, 40)) >p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 48)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 33, 48)) this.pp = p; >this.pp : Symbol(MyClass.pp, Decl(thisTypeAccessibility.ts, 1, 28)) ->this : Symbol(this, Decl(thisTypeAccessibility.ts, 24, 40)) +>this : Symbol(this, Decl(thisTypeAccessibility.ts, 33, 40)) >pp : Symbol(MyClass.pp, Decl(thisTypeAccessibility.ts, 1, 28)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 48)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 33, 48)) this.ppp = p; >this.ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31)) ->this : Symbol(this, Decl(thisTypeAccessibility.ts, 24, 40)) +>this : Symbol(this, Decl(thisTypeAccessibility.ts, 33, 40)) >ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31)) ->p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 48)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 33, 48)) + + MyClass.sp = p; +>MyClass.sp : Symbol(MyClass.sp, Decl(thisTypeAccessibility.ts, 3, 29)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) +>sp : Symbol(MyClass.sp, Decl(thisTypeAccessibility.ts, 3, 29)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 33, 48)) + + MyClass.spp = p; +>MyClass.spp : Symbol(MyClass.spp, Decl(thisTypeAccessibility.ts, 4, 36)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) +>spp : Symbol(MyClass.spp, Decl(thisTypeAccessibility.ts, 4, 36)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 33, 48)) + + MyClass.sppp = p; +>MyClass.sppp : Symbol(MyClass.sppp, Decl(thisTypeAccessibility.ts, 5, 39)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) +>sppp : Symbol(MyClass.sppp, Decl(thisTypeAccessibility.ts, 5, 39)) +>p : Symbol(p, Decl(thisTypeAccessibility.ts, 33, 48)) } MyClass.prototype.extension3 = extension3; ->MyClass.prototype.extension3 : Symbol(MyClass.extension3, Decl(thisTypeAccessibility.ts, 8, 32)) +>MyClass.prototype.extension3 : Symbol(MyClass.extension3, Decl(thisTypeAccessibility.ts, 11, 32)) >MyClass.prototype : Symbol(MyClass.prototype) ->MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 4, 1)) +>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 7, 1)) >prototype : Symbol(MyClass.prototype) ->extension3 : Symbol(MyClass.extension3, Decl(thisTypeAccessibility.ts, 8, 32)) ->extension3 : Symbol(extension3, Decl(thisTypeAccessibility.ts, 22, 1)) +>extension3 : Symbol(MyClass.extension3, Decl(thisTypeAccessibility.ts, 11, 32)) +>extension3 : Symbol(extension3, Decl(thisTypeAccessibility.ts, 31, 1)) diff --git a/tests/baselines/reference/thisTypeAccessibility.types b/tests/baselines/reference/thisTypeAccessibility.types index 3eb0f46f1b7..61e9434e4f0 100644 --- a/tests/baselines/reference/thisTypeAccessibility.types +++ b/tests/baselines/reference/thisTypeAccessibility.types @@ -12,6 +12,18 @@ class MyClass { public ppp: number = 123; >ppp : number +>123 : 123 + + private static sp: number = 123; +>sp : number +>123 : 123 + + protected static spp: number = 123; +>spp : number +>123 : 123 + + public static sppp: number = 123; +>sppp : number >123 : 123 } @@ -32,13 +44,13 @@ interface MyClass { } MyClass.prototype.extension1 = function (this: MyClass, p: number) { ->MyClass.prototype.extension1 = function (this: MyClass, p: number) { this.p = p; this.pp = p; this.ppp = p;} : (this: MyClass, p: number) => void +>MyClass.prototype.extension1 = function (this: MyClass, p: number) { this.p = p; this.pp = p; this.ppp = p; MyClass.sp = p; MyClass.spp = p; MyClass.sppp = p;} : (this: MyClass, p: number) => void >MyClass.prototype.extension1 : (p: number) => void >MyClass.prototype : MyClass >MyClass : typeof MyClass >prototype : MyClass >extension1 : (p: number) => void ->function (this: MyClass, p: number) { this.p = p; this.pp = p; this.ppp = p;} : (this: MyClass, p: number) => void +>function (this: MyClass, p: number) { this.p = p; this.pp = p; this.ppp = p; MyClass.sp = p; MyClass.spp = p; MyClass.sppp = p;} : (this: MyClass, p: number) => void >this : MyClass >MyClass : MyClass >p : number @@ -62,17 +74,38 @@ MyClass.prototype.extension1 = function (this: MyClass, p: number) { >this.ppp : number >this : MyClass >ppp : number +>p : number + + MyClass.sp = p; +>MyClass.sp = p : number +>MyClass.sp : number +>MyClass : typeof MyClass +>sp : number +>p : number + + MyClass.spp = p; +>MyClass.spp = p : number +>MyClass.spp : number +>MyClass : typeof MyClass +>spp : number +>p : number + + MyClass.sppp = p; +>MyClass.sppp = p : number +>MyClass.sppp : number +>MyClass : typeof MyClass +>sppp : number >p : number } MyClass.prototype.extension2 = function (this: T, p: number) { ->MyClass.prototype.extension2 = function (this: T, p: number) { this.p = p; this.pp = p; this.ppp = p;} : (this: T, p: number) => void +>MyClass.prototype.extension2 = function (this: T, p: number) { this.p = p; this.pp = p; this.ppp = p; MyClass.sp = p; MyClass.spp = p; MyClass.sppp = p;} : (this: T, p: number) => void >MyClass.prototype.extension2 : (p: number) => void >MyClass.prototype : MyClass >MyClass : typeof MyClass >prototype : MyClass >extension2 : (p: number) => void ->function (this: T, p: number) { this.p = p; this.pp = p; this.ppp = p;} : (this: T, p: number) => void +>function (this: T, p: number) { this.p = p; this.pp = p; this.ppp = p; MyClass.sp = p; MyClass.spp = p; MyClass.sppp = p;} : (this: T, p: number) => void >T : T >MyClass : MyClass >this : T @@ -98,6 +131,27 @@ MyClass.prototype.extension2 = function (this: T, p: number) >this.ppp : number >this : T >ppp : number +>p : number + + MyClass.sp = p; +>MyClass.sp = p : number +>MyClass.sp : number +>MyClass : typeof MyClass +>sp : number +>p : number + + MyClass.spp = p; +>MyClass.spp = p : number +>MyClass.spp : number +>MyClass : typeof MyClass +>spp : number +>p : number + + MyClass.sppp = p; +>MyClass.sppp = p : number +>MyClass.sppp : number +>MyClass : typeof MyClass +>sppp : number >p : number } @@ -128,6 +182,27 @@ function extension3 (this: T, p: number) { >this.ppp : number >this : T >ppp : number +>p : number + + MyClass.sp = p; +>MyClass.sp = p : number +>MyClass.sp : number +>MyClass : typeof MyClass +>sp : number +>p : number + + MyClass.spp = p; +>MyClass.spp = p : number +>MyClass.spp : number +>MyClass : typeof MyClass +>spp : number +>p : number + + MyClass.sppp = p; +>MyClass.sppp = p : number +>MyClass.sppp : number +>MyClass : typeof MyClass +>sppp : number >p : number } diff --git a/tests/cases/conformance/types/thisType/thisTypeAccessibility.ts b/tests/cases/conformance/types/thisType/thisTypeAccessibility.ts index 28d55222d5a..6cdc9e71225 100644 --- a/tests/cases/conformance/types/thisType/thisTypeAccessibility.ts +++ b/tests/cases/conformance/types/thisType/thisTypeAccessibility.ts @@ -2,6 +2,9 @@ class MyClass { private p: number = 123; protected pp: number = 123; public ppp: number = 123; + private static sp: number = 123; + protected static spp: number = 123; + public static sppp: number = 123; } interface MyClass { @@ -14,18 +17,27 @@ MyClass.prototype.extension1 = function (this: MyClass, p: number) { this.p = p; this.pp = p; this.ppp = p; + MyClass.sp = p; + MyClass.spp = p; + MyClass.sppp = p; } MyClass.prototype.extension2 = function (this: T, p: number) { this.p = p; this.pp = p; this.ppp = p; + MyClass.sp = p; + MyClass.spp = p; + MyClass.sppp = p; } function extension3 (this: T, p: number) { this.p = p; this.pp = p; this.ppp = p; + MyClass.sp = p; + MyClass.spp = p; + MyClass.sppp = p; } MyClass.prototype.extension3 = extension3;