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

package/dist/analyzer/checker.js

@@ -4309,7 +4309,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             }
             const overloads = types_1.OverloadedType.getOverloads(typeOfSymbol);
             const implementation = types_1.OverloadedType.getImplementation(typeOfSymbol);
-            this._validateOverloadFinalConsistency(overloads, implementation);
+            this._validateOverloadFinalOverride(overloads, implementation);
             this._validateOverloadAbstractConsistency(overloads, implementation);
         });
     }
@@ -4345,33 +4345,31 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             }
         });
     }
-    _validateOverloadFinalConsistency(overloads, implementation) {
-        // If there's an implementation, it will determine whether the
-        // function is @final.
-        if (implementation && (0, types_1.isFunction)(implementation)) {
-            // If one or more of the overloads is marked @final but the
-            // implementation is not, report an error.
-            if (!types_1.FunctionType.isFinal(implementation)) {
-                overloads.forEach((overload) => {
-                    if (types_1.FunctionType.isFinal(overload) && overload.shared.declaration?.node) {
-                        this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInconsistentOverload, localize_1.LocMessage.overloadFinalInconsistencyImpl().format({
-                            name: overload.shared.name,
-                        }), (0, declarationUtils_1.getNameNodeForDeclaration)(overload.shared.declaration) ?? overload.shared.declaration.node);
-                    }
-                });
-            }
-            return;
-        }
-        if (overloads.length > 0 && !types_1.FunctionType.isFinal(overloads[0])) {
-            overloads.slice(1).forEach((overload, index) => {
+    _validateOverloadFinalOverride(overloads, implementation) {
+        // If there's an implementation, the overloads are not allowed to be marked final or override.
+        if (implementation) {
+            overloads.forEach((overload) => {
                 if (types_1.FunctionType.isFinal(overload) && overload.shared.declaration?.node) {
-                    this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInconsistentOverload, localize_1.LocMessage.overloadFinalInconsistencyNoImpl().format({
-                        name: overload.shared.name,
-                        index: index + 2,
-                    }), (0, declarationUtils_1.getNameNodeForDeclaration)(overload.shared.declaration) ?? overload.shared.declaration.node);
+                    this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInconsistentOverload, localize_1.LocMessage.overloadFinalImpl(), (0, declarationUtils_1.getNameNodeForDeclaration)(overload.shared.declaration) ?? overload.shared.declaration.node);
+                }
+                if (types_1.FunctionType.isOverridden(overload) && overload.shared.declaration?.node) {
+                    this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInconsistentOverload, localize_1.LocMessage.overloadOverrideImpl(), (0, declarationUtils_1.getNameNodeForDeclaration)(overload.shared.declaration) ?? overload.shared.declaration.node);
                 }
             });
+            return;
         }
+        // If there's not an implementation, only the first overload can be marked final.
+        if (overloads.length === 0) {
+            return;
+        }
+        overloads.slice(1).forEach((overload, index) => {
+            if (types_1.FunctionType.isFinal(overload) && overload.shared.declaration?.node) {
+                this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInconsistentOverload, localize_1.LocMessage.overloadFinalNoImpl(), (0, declarationUtils_1.getNameNodeForDeclaration)(overload.shared.declaration) ?? overload.shared.declaration.node);
+            }
+            if (types_1.FunctionType.isOverridden(overload) && overload.shared.declaration?.node) {
+                this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInconsistentOverload, localize_1.LocMessage.overloadOverrideNoImpl(), (0, declarationUtils_1.getNameNodeForDeclaration)(overload.shared.declaration) ?? overload.shared.declaration.node);
+            }
+        });
     }
     // For a TypedDict class that derives from another TypedDict class
     // that is closed, verify that any new keys are compatible with the
@@ -4562,6 +4560,13 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             if (impl && (0, types_1.isFunction)(impl)) {
                 overrideFunction = impl;
             }
+            // If there is no implementation present, use the first overload.
+            if (!impl) {
+                const overloads = types_1.OverloadedType.getOverloads(overrideType);
+                if (overloads.length > 0) {
+                    overrideFunction = overloads[0];
+                }
+            }
         }
         else if ((0, types_1.isClassInstance)(overrideType) && types_1.ClassType.isPropertyClass(overrideType)) {
             if (overrideType.priv.fgetInfo) {