Fixed inherited JSDoc lookup on static properties of classes with symbol-less base types

src/compiler/checker.ts

@@ -1621,6 +1621,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             return getSymbolsOfParameterPropertyDeclaration(parameter, escapeLeadingUnderscores(parameterName));
         },
         getDeclaredTypeOfSymbol,
+        getBaseConstructorTypeOfClass,
         getPropertiesOfType,
         getPropertyOfType: (type, name) => getPropertyOfType(type, escapeLeadingUnderscores(name)),
         getPrivateIdentifierPropertyOfType: (leftType: Type, name: string, location: Node) => {

src/compiler/types.ts

@@ -5055,6 +5055,7 @@ export interface TypeChecker {
     getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
     getTypeOfSymbol(symbol: Symbol): Type;
     getDeclaredTypeOfSymbol(symbol: Symbol): Type;
+    /** @internal */ getBaseConstructorTypeOfClass(type: InterfaceType): Type;
     getPropertiesOfType(type: Type): Symbol[];
     getPropertyOfType(type: Type, propertyName: string): Symbol | undefined;
     getPrivateIdentifierPropertyOfType(leftType: Type, name: string, location: Node): Symbol | undefined;

src/services/services.ts

@@ -1051,11 +1051,16 @@ function findBaseOfDeclaration<T>(checker: TypeChecker, declaration: Declaration
     const classOrInterfaceDeclaration = declaration.parent?.kind === SyntaxKind.Constructor ? declaration.parent.parent : declaration.parent;
     if (!classOrInterfaceDeclaration) return;
 
-    const isStaticMember = hasStaticModifier(declaration);
+    if (hasStaticModifier(declaration)) {
+        const classType = checker.getTypeAtLocation(classOrInterfaceDeclaration);
+        Debug.assert(classType.isClassOrInterface());
+        const staticBaseType = checker.getBaseConstructorTypeOfClass(classType);
+        const symbol = checker.getPropertyOfType(staticBaseType, declaration.symbol.name);
+        return symbol ? cb(symbol) : undefined;
+    }
     return firstDefined(getAllSuperTypeNodes(classOrInterfaceDeclaration), superTypeNode => {
         const baseType = checker.getTypeAtLocation(superTypeNode);
-        const type = isStaticMember && baseType.symbol ? checker.getTypeOfSymbol(baseType.symbol) : baseType;
-        const symbol = checker.getPropertyOfType(type, declaration.symbol.name);
+        const symbol = checker.getPropertyOfType(baseType, declaration.symbol.name);
         return symbol ? cb(symbol) : undefined;
     });
 }

tests/cases/fourslash/quickInfoJsDocNoStaticVsInstanceMethodMixup1.ts

@@ -0,0 +1,26 @@
+///<reference path="fourslash.ts" />
+
+//// declare class BaseClass {
+////   /** some documentation for instance method */
+////   method(): string;
+//// }
+////
+//// type AnyConstructor = abstract new (...args: any[]) => object;
+////
+//// function Mix<T extends AnyConstructor>(BaseClass: T) {
+////   abstract class MixinClass extends BaseClass {
+////     constructor(...args: any[]) {
+////       super(...args);
+////     }
+////   }
+////
+////   return MixinClass;
+//// }
+////
+//// declare class Mixed extends Mix(BaseClass) {
+////   static method(): string;
+//// }
+////
+//// Mixed.method/*1*/;
+
+verify.quickInfoAt("1", "(method) Mixed.method(): string", undefined);

tests/cases/fourslash/quickInfoJsDocOverridesWithMixin1.ts

@@ -0,0 +1,35 @@
+///<reference path="fourslash.ts" />
+
+//// declare class BaseClass {
+////   /** some documentation for static method */
+////   static staticMethod(): number;
+////
+////   /** some documentation for instance method */
+////   instanceMethod(): string;
+//// }
+////
+//// type AnyConstructor = abstract new (...args: any[]) => object;
+////
+//// function Mix<T extends AnyConstructor>(BaseClass: T) {
+////   abstract class MixinClass extends BaseClass {
+////     constructor(...args: any[]) {
+////       super(...args);
+////     }
+////   }
+////
+////   return MixinClass;
+//// }
+////
+//// declare class Mixed extends Mix(BaseClass) {
+////   static staticMethod(): number;
+////
+////   instanceMethod(): string;
+//// }
+////
+//// Mixed.staticMethod/*1*/;
+////
+//// const m = new Mixed();
+//// m.instanceMethod/*2*/;
+
+verify.quickInfoAt("1", "(method) Mixed.staticMethod(): number", "some documentation for static method");
+verify.quickInfoAt("2", "(method) Mixed.instanceMethod(): string", "some documentation for instance method");