@zzzen/pyright-internal 1.2.0-dev.20250330 → 1.2.0-dev.20250413

package/dist/analyzer/checker.js

@@ -1241,7 +1241,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         let isCoroutine = true;
         (0, typeUtils_1.doForEachSubtype)(exprTypeResult.type, (subtype) => {
             subtype = this._evaluator.makeTopLevelTypeVarsConcrete(subtype);
-            if (!(0, types_1.isFunction)(subtype) && !(0, types_1.isOverloaded)(subtype)) {
+            if (!(0, types_1.isFunctionOrOverloaded)(subtype)) {
                 isExprFunction = false;
             }
             if (!(0, types_1.isClassInstance)(subtype) || !types_1.ClassType.isBuiltIn(subtype, ['Coroutine', 'CoroutineType'])) {
@@ -2831,6 +2831,12 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                         diag.addMessage(localize_1.LocAddendum.annotatedNotAllowed());
                         isSupported = false;
                     }
+                    else if (subtype.props?.specialForm &&
+                        (0, types_1.isInstantiableClass)(subtype.props.specialForm) &&
+                        types_1.ClassType.isBuiltIn(subtype.props.specialForm, 'Literal')) {
+                        diag.addMessage(localize_1.LocAddendum.literalNotAllowed());
+                        isSupported = false;
+                    }
                     break;
                 case 4 /* TypeCategory.Function */:
                     if (!types_1.TypeBase.isInstantiable(subtype) || subtype.priv.isCallableWithTypeArgs) {
@@ -3930,7 +3936,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             return;
         }
         let newMemberType = newMethodResult.type;
-        if (!(0, types_1.isFunction)(newMemberType) && !(0, types_1.isOverloaded)(newMemberType)) {
+        if (!(0, types_1.isFunctionOrOverloaded)(newMemberType)) {
             return;
         }
         if ((0, types_1.isOverloaded)(newMemberType)) {
@@ -3941,7 +3947,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             }
         }
         let initMemberType = initMethodResult.type;
-        if (!(0, types_1.isFunction)(initMemberType) && !(0, types_1.isOverloaded)(initMemberType)) {
+        if (!(0, types_1.isFunctionOrOverloaded)(initMemberType)) {
             return;
         }
         if ((0, types_1.isOverloaded)(initMemberType)) {
@@ -4129,9 +4135,9 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         let diag;
         const overrideDecl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(overrideClassAndSymbol.symbol);
         const overriddenDecl = (0, symbolUtils_1.getLastTypedDeclarationForSymbol)(overriddenClassAndSymbol.symbol);
-        if ((0, types_1.isFunction)(overriddenType) || (0, types_1.isOverloaded)(overriddenType)) {
+        if ((0, types_1.isFunctionOrOverloaded)(overriddenType)) {
             const diagAddendum = new diagnostic_1.DiagnosticAddendum();
-            if ((0, types_1.isFunction)(overrideType) || (0, types_1.isOverloaded)(overrideType)) {
+            if ((0, types_1.isFunctionOrOverloaded)(overrideType)) {
                 if (!this._evaluator.validateOverrideMethod(overriddenType, overrideType, 
                 /* baseClass */ undefined, diagAddendum, 
                 /* enforceParamNameMatch */ true)) {
@@ -4606,15 +4612,20 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             return;
         }
         const baseClass = baseClassAndSymbol.classType;
-        const baseClassSelf = types_1.ClassType.cloneAsInstance((0, typeUtils_1.selfSpecializeClass)(baseClass, { useBoundTypeVars: true }));
         const childClassSelf = types_1.ClassType.cloneAsInstance((0, typeUtils_1.selfSpecializeClass)(childClassType, { useBoundTypeVars: true }));
+        // The "Self" value for the base class depends on whether it's a
+        // protocol or not. It's not clear from the typing spec whether
+        // this is the correct behavior.
+        const baseClassSelf = types_1.ClassType.isProtocolClass(baseClass)
+            ? childClassSelf
+            : types_1.ClassType.cloneAsInstance((0, typeUtils_1.selfSpecializeClass)(baseClass, { useBoundTypeVars: true }));
         let baseType = (0, typeUtils_1.partiallySpecializeType)(this._evaluator.getEffectiveTypeOfSymbol(baseClassAndSymbol.symbol), baseClass, this._evaluator.getTypeClassType(), baseClassSelf);
         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)) {
+        if ((0, types_1.isFunctionOrOverloaded)(baseType)) {
             const diagAddendum = new diagnostic_1.DiagnosticAddendum();
             // Determine whether this is an attempt to override a method marked @final.
             if (this._isFinalFunction(memberName, baseType)) {
@@ -4639,7 +4650,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 types_1.ClassType.isTypedDictClass(childClassType)) {
                 return;
             }
-            if ((0, types_1.isFunction)(overrideType) || (0, types_1.isOverloaded)(overrideType)) {
+            if ((0, types_1.isFunctionOrOverloaded)(overrideType)) {
                 // Don't enforce parameter names for dundered methods. Many of them
                 // are misnamed in typeshed stubs, so this would result in many
                 // false positives.