isValidMethodAccess: use getTypeOfPropertyOfType instead of getTypeOfFuncClassEnumModule (microsoft#24488)

Andy · web-flow · commit 5e2c7ffce646 · 2018-05-30T09:12:24.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -17428,7 +17428,7 @@ namespace ts {
                 && (!(property.flags & SymbolFlags.Method) || isValidMethodAccess(property, type));
         }
         function isValidMethodAccess(method: Symbol, actualThisType: Type): boolean {
-            const propType = getTypeOfFuncClassEnumModule(method);
+            const propType = getTypeOfPropertyOfType(actualThisType, method.escapedName)!;
             const signatures = getSignaturesOfType(getNonNullableType(propType), SignatureKind.Call);
             Debug.assert(signatures.length !== 0);
             return signatures.some(sig => {
diff --git a/tests/cases/fourslash/completionsMethodWithThisParameter.ts b/tests/cases/fourslash/completionsMethodWithThisParameter.ts
@@ -4,6 +4,7 @@
 ////    value: T; // Make the type parameter actually matter
 ////    ms(this: A<string>) {}
 ////    mo(this: A<{}>) {}
+////    mt(this: A<T>) {}
 ////    mp<P>(this: A<P>) {}
 ////    mps<P extends string>(this: A<P>) {}
 ////}
@@ -13,5 +14,5 @@
 ////s./*s*/;
 ////n./*n*/;
 
-verify.completionsAt("s", ["value", "ms", "mo", "mp", "mps"]);
-verify.completionsAt("n", ["value", "mo", "mp"]);
+verify.completionsAt("s", ["value", "ms", "mo", "mt", "mp", "mps"]);
+verify.completionsAt("n", ["value", "mo", "mt", "mp"]);

Original file line number	Diff line number	Diff line change
`@@ -17428,7 +17428,7 @@ namespace ts {`
`17428`	`17428`	`&& (!(property.flags & SymbolFlags.Method) \|\| isValidMethodAccess(property, type));`
`17429`	`17429`	`}`
`17430`	`17430`	`function isValidMethodAccess(method: Symbol, actualThisType: Type): boolean {`
`17431`		`- const propType = getTypeOfFuncClassEnumModule(method);`
	`17431`	`+ const propType = getTypeOfPropertyOfType(actualThisType, method.escapedName)!;`
`17432`	`17432`	`const signatures = getSignaturesOfType(getNonNullableType(propType), SignatureKind.Call);`
`17433`	`17433`	`Debug.assert(signatures.length !== 0);`
`17434`	`17434`	`return signatures.some(sig => {`