@zzzen/pyright-internal 1.2.0-dev.20250105 → 1.2.0-dev.20250119

package/dist/analyzer/checker.js

@@ -4128,25 +4128,11 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         const overriddenDecl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(overriddenClassAndSymbol.symbol);
         if ((0, types_1.isFunction)(overriddenType) || (0, types_1.isOverloaded)(overriddenType)) {
             const diagAddendum = new diagnostic_1.DiagnosticAddendum();
-            let overrideFunction;
-            if ((0, types_1.isFunction)(overrideType)) {
-                overrideFunction = overrideType;
-            }
-            else if ((0, types_1.isOverloaded)(overrideType)) {
-                // Use the last overload.
-                const impl = types_1.OverloadedType.getImplementation(overrideType);
-                // If the last overload isn't an implementation, skip the check for this symbol.
-                if (!impl || !(0, types_1.isFunction)(impl)) {
-                    return;
-                }
-                overrideFunction = impl;
-            }
-            if (overrideFunction) {
-                if (!this._evaluator.validateOverrideMethod(overriddenType, overrideFunction, 
+            if ((0, types_1.isFunction)(overrideType) || (0, types_1.isOverloaded)(overrideType)) {
+                if (!this._evaluator.validateOverrideMethod(overriddenType, overrideType, 
                 /* baseClass */ undefined, diagAddendum, 
                 /* enforceParamNameMatch */ true)) {
-                    const decl = overrideFunction.shared.declaration;
-                    if (decl && decl.type === 5 /* DeclarationType.Function */) {
+                    if (overrideDecl && overrideDecl.type === 5 /* DeclarationType.Function */) {
                         diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportIncompatibleMethodOverride, localize_1.LocMessage.baseClassMethodTypeIncompatible().format({
                             classType: childClassType.shared.name,
                             name: memberName,
@@ -4613,10 +4599,11 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         }
         const baseClass = baseClassAndSymbol.classType;
         const childClassSelf = types_1.ClassType.cloneAsInstance((0, typeUtils_1.selfSpecializeClass)(childClassType, { useBoundTypeVars: true }));
-        const baseType = (0, typeUtils_1.partiallySpecializeType)(this._evaluator.getEffectiveTypeOfSymbol(baseClassAndSymbol.symbol), baseClass, this._evaluator.getTypeClassType(), childClassSelf);
+        let baseType = (0, typeUtils_1.partiallySpecializeType)(this._evaluator.getEffectiveTypeOfSymbol(baseClassAndSymbol.symbol), baseClass, this._evaluator.getTypeClassType(), childClassSelf);
         overrideType = (0, typeUtils_1.partiallySpecializeType)(overrideType, childClassType, this._evaluator.getTypeClassType(), childClassSelf);
         if (childClassType.shared.typeVarScopeId) {
             overrideType = (0, typeUtils_1.makeTypeVarsBound)(overrideType, [childClassType.shared.typeVarScopeId]);
+            baseType = (0, typeUtils_1.makeTypeVarsBound)(baseType, [childClassType.shared.typeVarScopeId]);
         }
         if ((0, types_1.isFunction)(baseType) || (0, types_1.isOverloaded)(baseType)) {
             const diagAddendum = new diagnostic_1.DiagnosticAddendum();