allow access protected member in this parameter context

src/compiler/checker.ts

@@ -17101,14 +17101,21 @@ namespace ts {
 
             // Find the first enclosing class that has the declaring classes of the protected constituents
             // of the property as base classes
-            const enclosingClass = forEachEnclosingClass(node, enclosingDeclaration => {
+            let enclosingClass = forEachEnclosingClass(node, enclosingDeclaration => {
                 const enclosingClass = <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingDeclaration)!);
                 return isClassDerivedFromDeclaringClasses(enclosingClass, prop) ? enclosingClass : undefined;
             });
             // A protected property is accessible if the property is within the declaring class or classes derived from it
             if (!enclosingClass) {
-                error(errorNode, Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(getDeclaringClass(prop) || type));
-                return false;
+                let thisParameter: ParameterDeclaration | undefined;
+                const thisContainer = getThisContainer(node, /* includeArrowFunctions */ false);
+                if (!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;
+                }
+
+                const thisType = getTypeFromTypeNode(thisParameter.type);
+                enclosingClass = ((thisType.flags & TypeFlags.TypeParameter) ? getConstraintFromTypeParameter(<TypeParameter>thisType) : thisType) as InterfaceType;
             }
             // No further restrictions for static properties
             if (flags & ModifierFlags.Static) {

tests/baselines/reference/thisTypeAccessibility.errors.txt

@@ -0,0 +1,44 @@
+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(26,10): error TS2341: Property 'p' is private and only accessible within class 'MyClass'.
+
+
+==== tests/cases/conformance/types/thisType/thisTypeAccessibility.ts (3 errors) ====
+    class MyClass {
+        private p: number = 123;
+        protected pp: number = 123;
+        public ppp: number = 123;
+    }
+    
+    interface MyClass {
+        extension1(p: number): void;
+        extension2(p: number): void;
+        extension3(p: number): void;
+    }
+    
+    MyClass.prototype.extension1 = function (this: MyClass, p: number) { 
+        this.p = p;
+             ~
+!!! error TS2341: Property 'p' is private and only accessible within class 'MyClass'.
+        this.pp = p;
+        this.ppp = p;
+    }
+    
+    MyClass.prototype.extension2 = function<T extends MyClass> (this: T, p: number) { 
+        this.p = p;
+             ~
+!!! error TS2341: Property 'p' is private and only accessible within class 'MyClass'.
+        this.pp = p;
+        this.ppp = p;
+    }
+    
+    function extension3<T extends MyClass> (this: T, p: number) { 
+        this.p = p;
+             ~
+!!! error TS2341: Property 'p' is private and only accessible within class 'MyClass'.
+        this.pp = p;
+        this.ppp = p;
+    }
+    
+    MyClass.prototype.extension3 = extension3;
+    

tests/baselines/reference/thisTypeAccessibility.js

@@ -0,0 +1,59 @@
+//// [thisTypeAccessibility.ts]
+class MyClass {
+    private p: number = 123;
+    protected pp: number = 123;
+    public ppp: number = 123;
+}
+
+interface MyClass {
+    extension1(p: number): void;
+    extension2(p: number): void;
+    extension3(p: number): void;
+}
+
+MyClass.prototype.extension1 = function (this: MyClass, p: number) { 
+    this.p = p;
+    this.pp = p;
+    this.ppp = p;
+}
+
+MyClass.prototype.extension2 = function<T extends MyClass> (this: T, p: number) { 
+    this.p = p;
+    this.pp = p;
+    this.ppp = p;
+}
+
+function extension3<T extends MyClass> (this: T, p: number) { 
+    this.p = p;
+    this.pp = p;
+    this.ppp = p;
+}
+
+MyClass.prototype.extension3 = extension3;
+
+
+//// [thisTypeAccessibility.js]
+var MyClass = /** @class */ (function () {
+    function MyClass() {
+        this.p = 123;
+        this.pp = 123;
+        this.ppp = 123;
+    }
+    return MyClass;
+}());
+MyClass.prototype.extension1 = function (p) {
+    this.p = p;
+    this.pp = p;
+    this.ppp = p;
+};
+MyClass.prototype.extension2 = function (p) {
+    this.p = p;
+    this.pp = p;
+    this.ppp = p;
+};
+function extension3(p) {
+    this.p = p;
+    this.pp = p;
+    this.ppp = p;
+}
+MyClass.prototype.extension3 = extension3;

tests/baselines/reference/thisTypeAccessibility.symbols

@@ -0,0 +1,125 @@
+=== tests/cases/conformance/types/thisType/thisTypeAccessibility.ts ===
+class MyClass {
+>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 4, 1))
+
+    private p: number = 123;
+>p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15))
+
+    protected pp: number = 123;
+>pp : Symbol(MyClass.pp, Decl(thisTypeAccessibility.ts, 1, 28))
+
+    public ppp: number = 123;
+>ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31))
+}
+
+interface MyClass {
+>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 4, 1))
+
+    extension1(p: number): void;
+>extension1 : Symbol(MyClass.extension1, Decl(thisTypeAccessibility.ts, 6, 19))
+>p : Symbol(p, Decl(thisTypeAccessibility.ts, 7, 15))
+
+    extension2(p: number): void;
+>extension2 : Symbol(MyClass.extension2, Decl(thisTypeAccessibility.ts, 7, 32))
+>p : Symbol(p, Decl(thisTypeAccessibility.ts, 8, 15))
+
+    extension3(p: number): void;
+>extension3 : Symbol(MyClass.extension3, Decl(thisTypeAccessibility.ts, 8, 32))
+>p : Symbol(p, Decl(thisTypeAccessibility.ts, 9, 15))
+}
+
+MyClass.prototype.extension1 = function (this: MyClass, p: number) { 
+>MyClass.prototype.extension1 : Symbol(MyClass.extension1, Decl(thisTypeAccessibility.ts, 6, 19))
+>MyClass.prototype : Symbol(MyClass.prototype)
+>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 4, 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))
+
+    this.p = p;
+>this.p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15))
+>this : Symbol(this, Decl(thisTypeAccessibility.ts, 12, 41))
+>p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15))
+>p : Symbol(p, Decl(thisTypeAccessibility.ts, 12, 55))
+
+    this.pp = p;
+>this.pp : Symbol(MyClass.pp, Decl(thisTypeAccessibility.ts, 1, 28))
+>this : Symbol(this, Decl(thisTypeAccessibility.ts, 12, 41))
+>pp : Symbol(MyClass.pp, Decl(thisTypeAccessibility.ts, 1, 28))
+>p : Symbol(p, Decl(thisTypeAccessibility.ts, 12, 55))
+
+    this.ppp = p;
+>this.ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31))
+>this : Symbol(this, Decl(thisTypeAccessibility.ts, 12, 41))
+>ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31))
+>p : Symbol(p, Decl(thisTypeAccessibility.ts, 12, 55))
+}
+
+MyClass.prototype.extension2 = function<T extends MyClass> (this: T, p: number) { 
+>MyClass.prototype.extension2 : Symbol(MyClass.extension2, Decl(thisTypeAccessibility.ts, 7, 32))
+>MyClass.prototype : Symbol(MyClass.prototype)
+>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 4, 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))
+
+    this.p = p;
+>this.p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15))
+>this : Symbol(this, Decl(thisTypeAccessibility.ts, 18, 60))
+>p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15))
+>p : Symbol(p, Decl(thisTypeAccessibility.ts, 18, 68))
+
+    this.pp = p;
+>this.pp : Symbol(MyClass.pp, Decl(thisTypeAccessibility.ts, 1, 28))
+>this : Symbol(this, Decl(thisTypeAccessibility.ts, 18, 60))
+>pp : Symbol(MyClass.pp, Decl(thisTypeAccessibility.ts, 1, 28))
+>p : Symbol(p, Decl(thisTypeAccessibility.ts, 18, 68))
+
+    this.ppp = p;
+>this.ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31))
+>this : Symbol(this, Decl(thisTypeAccessibility.ts, 18, 60))
+>ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31))
+>p : Symbol(p, Decl(thisTypeAccessibility.ts, 18, 68))
+}
+
+function extension3<T extends MyClass> (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))
+
+    this.p = p;
+>this.p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15))
+>this : Symbol(this, Decl(thisTypeAccessibility.ts, 24, 40))
+>p : Symbol(MyClass.p, Decl(thisTypeAccessibility.ts, 0, 15))
+>p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 48))
+
+    this.pp = p;
+>this.pp : Symbol(MyClass.pp, Decl(thisTypeAccessibility.ts, 1, 28))
+>this : Symbol(this, Decl(thisTypeAccessibility.ts, 24, 40))
+>pp : Symbol(MyClass.pp, Decl(thisTypeAccessibility.ts, 1, 28))
+>p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 48))
+
+    this.ppp = p;
+>this.ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31))
+>this : Symbol(this, Decl(thisTypeAccessibility.ts, 24, 40))
+>ppp : Symbol(MyClass.ppp, Decl(thisTypeAccessibility.ts, 2, 31))
+>p : Symbol(p, Decl(thisTypeAccessibility.ts, 24, 48))
+}
+
+MyClass.prototype.extension3 = extension3;
+>MyClass.prototype.extension3 : Symbol(MyClass.extension3, Decl(thisTypeAccessibility.ts, 8, 32))
+>MyClass.prototype : Symbol(MyClass.prototype)
+>MyClass : Symbol(MyClass, Decl(thisTypeAccessibility.ts, 0, 0), Decl(thisTypeAccessibility.ts, 4, 1))
+>prototype : Symbol(MyClass.prototype)
+>extension3 : Symbol(MyClass.extension3, Decl(thisTypeAccessibility.ts, 8, 32))
+>extension3 : Symbol(extension3, Decl(thisTypeAccessibility.ts, 22, 1))
+

tests/baselines/reference/thisTypeAccessibility.types

@@ -0,0 +1,142 @@
+=== tests/cases/conformance/types/thisType/thisTypeAccessibility.ts ===
+class MyClass {
+>MyClass : MyClass
+
+    private p: number = 123;
+>p : number
+>123 : 123
+
+    protected pp: number = 123;
+>pp : number
+>123 : 123
+
+    public ppp: number = 123;
+>ppp : number
+>123 : 123
+}
+
+interface MyClass {
+>MyClass : MyClass
+
+    extension1(p: number): void;
+>extension1 : (p: number) => void
+>p : number
+
+    extension2(p: number): void;
+>extension2 : (p: number) => void
+>p : number
+
+    extension3(p: number): void;
+>extension3 : (p: number) => void
+>p : number
+}
+
+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 : (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
+>this : MyClass
+>MyClass : MyClass
+>p : number
+
+    this.p = p;
+>this.p = p : number
+>this.p : number
+>this : MyClass
+>p : number
+>p : number
+
+    this.pp = p;
+>this.pp = p : number
+>this.pp : number
+>this : MyClass
+>pp : number
+>p : number
+
+    this.ppp = p;
+>this.ppp = p : number
+>this.ppp : number
+>this : MyClass
+>ppp : number
+>p : number
+}
+
+MyClass.prototype.extension2 = function<T extends MyClass> (this: T, p: number) { 
+>MyClass.prototype.extension2 = function<T extends MyClass> (this: T, p: number) {     this.p = p;    this.pp = p;    this.ppp = p;} : <T extends MyClass>(this: T, p: number) => void
+>MyClass.prototype.extension2 : (p: number) => void
+>MyClass.prototype : MyClass
+>MyClass : typeof MyClass
+>prototype : MyClass
+>extension2 : (p: number) => void
+>function<T extends MyClass> (this: T, p: number) {     this.p = p;    this.pp = p;    this.ppp = p;} : <T extends MyClass>(this: T, p: number) => void
+>T : T
+>MyClass : MyClass
+>this : T
+>T : T
+>p : number
+
+    this.p = p;
+>this.p = p : number
+>this.p : number
+>this : T
+>p : number
+>p : number
+
+    this.pp = p;
+>this.pp = p : number
+>this.pp : number
+>this : T
+>pp : number
+>p : number
+
+    this.ppp = p;
+>this.ppp = p : number
+>this.ppp : number
+>this : T
+>ppp : number
+>p : number
+}
+
+function extension3<T extends MyClass> (this: T, p: number) { 
+>extension3 : <T extends MyClass>(this: T, p: number) => void
+>T : T
+>MyClass : MyClass
+>this : T
+>T : T
+>p : number
+
+    this.p = p;
+>this.p = p : number
+>this.p : number
+>this : T
+>p : number
+>p : number
+
+    this.pp = p;
+>this.pp = p : number
+>this.pp : number
+>this : T
+>pp : number
+>p : number
+
+    this.ppp = p;
+>this.ppp = p : number
+>this.ppp : number
+>this : T
+>ppp : number
+>p : number
+}
+
+MyClass.prototype.extension3 = extension3;
+>MyClass.prototype.extension3 = extension3 : <T extends MyClass>(this: T, p: number) => void
+>MyClass.prototype.extension3 : (p: number) => void
+>MyClass.prototype : MyClass
+>MyClass : typeof MyClass
+>prototype : MyClass
+>extension3 : (p: number) => void
+>extension3 : <T extends MyClass>(this: T, p: number) => void
+

tests/cases/conformance/types/thisType/thisTypeAccessibility.ts

@@ -0,0 +1,31 @@
+class MyClass {
+    private p: number = 123;
+    protected pp: number = 123;
+    public ppp: number = 123;
+}
+
+interface MyClass {
+    extension1(p: number): void;
+    extension2(p: number): void;
+    extension3(p: number): void;
+}
+
+MyClass.prototype.extension1 = function (this: MyClass, p: number) { 
+    this.p = p;
+    this.pp = p;
+    this.ppp = p;
+}
+
+MyClass.prototype.extension2 = function<T extends MyClass> (this: T, p: number) { 
+    this.p = p;
+    this.pp = p;
+    this.ppp = p;
+}
+
+function extension3<T extends MyClass> (this: T, p: number) { 
+    this.p = p;
+    this.pp = p;
+    this.ppp = p;
+}
+
+MyClass.prototype.extension3 = extension3;