@zzzen/pyright-internal 1.2.0-dev.20230820 → 1.2.0-dev.20230903

package/dist/analyzer/typeEvaluator.js

@@ -683,6 +683,26 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         return typeResult;
     }
+    // Reports the case where a function or class has been decorated with
+    // @type_check_only and is used in a value expression.
+    function reportUseOfTypeCheckOnly(type, node) {
+        let isTypeCheckingOnly = false;
+        let name = '';
+        if ((0, types_1.isInstantiableClass)(type) && !type.includeSubclasses) {
+            isTypeCheckingOnly = types_1.ClassType.isTypeCheckOnly(type);
+            name = type.details.name;
+        }
+        else if ((0, types_1.isFunction)(type)) {
+            isTypeCheckingOnly = types_1.FunctionType.isTypeCheckOnly(type);
+            name = type.details.name;
+        }
+        if (isTypeCheckingOnly) {
+            const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
+            if (!fileInfo.isStubFile) {
+                addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeCheckOnly().format({ name }), node);
+            }
+        }
+    }
     function reportInvalidUseOfPep695TypeAlias(type, node) {
         var _a;
         // PEP 695 type aliases cannot be used as instantiable classes.
@@ -866,13 +886,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     function getTypeOfString(node) {
         const isBytes = (node.token.flags & 32 /* Bytes */) !== 0;
         let typeResult;
+        let isIncomplete = false;
         // Don't create a literal type if it's an f-string.
         if (node.nodeType === 27 /* FormatString */) {
             let isLiteralString = true;
             // If all of the format expressions are of type LiteralString, then
             // the resulting formatted string is also LiteralString.
             node.fieldExpressions.forEach((expr) => {
-                const exprType = getTypeOfExpression(expr).type;
+                const exprTypeResult = getTypeOfExpression(expr);
+                const exprType = exprTypeResult.type;
+                if (exprTypeResult.isIncomplete) {
+                    isIncomplete = true;
+                }
                 (0, typeUtils_1.doForEachSubtype)(exprType, (exprSubtype) => {
                     if (!(0, types_1.isClassInstance)(exprSubtype)) {
                         isLiteralString = false;
@@ -890,18 +915,20 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if (!isBytes && isLiteralString) {
                 const literalStringType = getTypingType(node, 'LiteralString');
                 if (literalStringType && (0, types_1.isInstantiableClass)(literalStringType)) {
-                    typeResult = { type: types_1.ClassType.cloneAsInstance(literalStringType) };
+                    typeResult = { type: types_1.ClassType.cloneAsInstance(literalStringType), isIncomplete };
                 }
             }
             if (!typeResult) {
                 typeResult = {
                     type: getBuiltInObject(node, isBytes ? 'bytes' : 'str'),
+                    isIncomplete,
                 };
             }
         }
         else {
             typeResult = {
                 type: cloneBuiltinObjectWithLiteral(node, isBytes ? 'bytes' : 'str', node.value),
+                isIncomplete,
             };
         }
         return typeResult;
@@ -1234,11 +1261,30 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         let memberInfo;
         const classDiag = diag ? new diagnostic_1.DiagnosticAddendum() : undefined;
         const metaclassDiag = diag ? new diagnostic_1.DiagnosticAddendum() : undefined;
+        let considerMetaclassOnly = (memberAccessFlags & 32 /* ConsiderMetaclassOnly */) !== 0;
         if (types_1.ClassType.isPartiallyEvaluated(classType)) {
             addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.classDefinitionCycle().format({ name: classType.details.name }), errorNode);
             return { type: types_1.UnknownType.create() };
         }
-        if ((memberAccessFlags & 32 /* ConsiderMetaclassOnly */) === 0) {
+        const metaclass = classType.details.effectiveMetaclass;
+        // Look up the attribute in the metaclass first. If the member is a descriptor
+        // (an object with a __get__ method) and the access is a 'get', the Python runtime
+        // uses this metaclass descriptor to satisfy the lookup. Skip this costly lookup
+        // in the common case where the metaclass is 'type' since we know that `type` doesn't
+        // have any attributes that are descriptors.
+        if (usage.method === 'get' &&
+            metaclass &&
+            (0, types_1.isInstantiableClass)(metaclass) &&
+            !types_1.ClassType.isBuiltIn(metaclass, 'type') &&
+            !types_1.ClassType.isSameGenericClass(metaclass, classType)) {
+            const metaclassMemberInfo = getTypeOfClassMemberName(errorNode, metaclass, 
+            /* isAccessedThroughObject */ false, memberName, usage, metaclassDiag, memberAccessFlags, classType);
+            if (metaclassMemberInfo && (0, typeUtils_1.isDescriptorInstance)(metaclassMemberInfo.type)) {
+                considerMetaclassOnly = true;
+            }
+        }
+        // Look up the attribute in the class object.
+        if (!memberInfo && !considerMetaclassOnly) {
             memberInfo = getTypeOfClassMemberName(errorNode, classType, 
             /* isAccessedThroughObject */ false, memberName, usage, classDiag, memberAccessFlags | 1 /* AccessClassMembersOnly */, bindToType);
         }
@@ -2920,6 +2966,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
             }
         }
+        if ((flags & 256 /* ExpectingTypeAnnotation */) === 0) {
+            reportUseOfTypeCheckOnly(type, node);
+        }
         if ((flags & 16777216 /* DisallowPep695TypeAlias */) !== 0) {
             if (reportInvalidUseOfPep695TypeAlias(type, node)) {
                 type = types_1.UnknownType.create();
@@ -3389,7 +3438,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                     return { type: types_1.UnknownType.create(isIncomplete), isIncomplete };
                 }
-                if (flags & 256 /* ExpectingTypeAnnotation */) {
+                if ((flags & 256 /* ExpectingTypeAnnotation */) !== 0) {
                     if (!isIncomplete) {
                         addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeVarNoMember().format({
                             type: printType(baseType),
@@ -3613,6 +3662,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // additional reportUnknownMemberType diagnostics.
             type = isFunctionRule ? types_1.AnyType.create() : types_1.UnknownType.create();
         }
+        if ((flags & 256 /* ExpectingTypeAnnotation */) === 0) {
+            reportUseOfTypeCheckOnly(type, node.memberName);
+        }
         // Should we specialize the class?
         if ((flags & 2 /* DoNotSpecialize */) === 0) {
             if ((0, types_1.isInstantiableClass)(type) && !type.typeArguments) {
@@ -3705,13 +3757,24 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
             }
             if (!type) {
+                let selfClass = classType;
                 // Determine whether to replace Self variables with a specific
                 // class. Avoid doing this if there's a "bindToType" specified
                 // because that case is used for super() calls where we want
                 // to leave the Self type generic (not specialized). We'll also
                 // skip this for __new__ methods because they are not bound
                 // to the class but rather assume the type of the cls argument.
-                const selfClass = !!bindToType || memberName === '__new__' ? undefined : classType;
+                if (bindToType) {
+                    if ((0, types_1.isTypeVar)(bindToType) && bindToType.details.isSynthesizedSelf) {
+                        selfClass = bindToType;
+                    }
+                    else {
+                        selfClass = undefined;
+                    }
+                }
+                else if (memberName === '__new__') {
+                    selfClass = undefined;
+                }
                 const typeResult = getTypeOfMemberInternal(memberInfo, selfClass);
                 if (typeResult) {
                     type = typeResult.type;
@@ -3886,14 +3949,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         ];
                         if (usage.method === 'get') {
                             // Provide "owner" argument.
-                            // Use Any rather than None for the owner argument if accessing through an object.
-                            // None is more correct, but it doesn't really matter, and many descriptor classes
-                            // incorrectly annotate the owner parameter. Rather than create a bunch of noise,
-                            // we'll use Any here.
                             argList.push({
                                 argumentCategory: 0 /* Simple */,
                                 typeResult: {
-                                    type: isAccessedThroughObject ? types_1.AnyType.create() : baseTypeClass,
+                                    type: baseTypeClass,
                                 },
                             });
                         }
@@ -4251,14 +4310,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     function getTypeOfIndex(node, flags = 0 /* None */) {
         const baseTypeResult = getTypeOfExpression(node.baseExpression, flags | 2 /* IndexBaseDefaults */);
         // If this is meant to be a type and the base expression is a string expression,
-        // emit an error because this will generate a runtime exception in Python versions
-        // less than 3.10.
+        // emit an error because this is an illegal annotation form and will generate a
+        // runtime exception.
         if (flags & 128 /* ExpectingInstantiableType */) {
             if (node.baseExpression.nodeType === 48 /* StringList */) {
-                const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
-                if (!fileInfo.isStubFile && fileInfo.executionEnvironment.pythonVersion < pythonVersion_1.PythonVersion.V3_10) {
-                    addError(localize_1.Localizer.Diagnostic.stringNotSubscriptable(), node.baseExpression);
-                }
+                addError(localize_1.Localizer.Diagnostic.stringNotSubscriptable(), node.baseExpression);
             }
         }
         // Check for builtin classes that will generate runtime exceptions if subscripted.
@@ -4608,7 +4664,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     const itemMethodType = getTypeOfClassMember(node, concreteSubtype, getIndexAccessMagicMethodName(usage), 
                     /* usage */ undefined, 
                     /* diag */ undefined, 64 /* SkipAttributeAccessOverride */ | 32 /* ConsiderMetaclassOnly */);
-                    if (flags & 256 /* ExpectingTypeAnnotation */) {
+                    if ((flags & 256 /* ExpectingTypeAnnotation */) !== 0) {
                         // If the class doesn't derive from Generic, a type argument should not be allowed.
                         addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeArgsExpectingNone().format({
                             name: printType(types_1.ClassType.cloneAsInstance(concreteSubtype)),
@@ -4660,9 +4716,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // Inlined TypedDicts are supported only for 'dict' (and not for 'Dict').
                 // This feature is currently experimental.
                 const supportsTypedDictTypeArg = AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.enableExperimentalFeatures &&
-                    (0, types_1.isInstantiableClass)(concreteSubtype) &&
-                    types_1.ClassType.isBuiltIn(concreteSubtype, 'dict') &&
-                    !concreteSubtype.aliasName;
+                    types_1.ClassType.isBuiltIn(concreteSubtype, ['dict', 'TypedDict']) &&
+                    !types_1.ClassType.isBuiltIn(concreteSubtype, 'Dict');
                 let typeArgs = getTypeArgs(node, flags, {
                     isAnnotatedClass,
                     hasCustomClassGetItem: hasCustomClassGetItem || !isGenericClass,
@@ -5633,7 +5688,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (node.arguments.length > 2) {
             addError(localize_1.Localizer.Diagnostic.superCallArgCount(), node.arguments[2]);
         }
-        const enclosingClass = ParseTreeUtils.getEnclosingClass(node);
+        const enclosingFunction = ParseTreeUtils.getEnclosingFunction(node);
+        const enclosingClass = enclosingFunction
+            ? ParseTreeUtils.getEnclosingClass(enclosingFunction, /* stopAtFunction */ true)
+            : undefined;
         const enclosingClassType = enclosingClass ? (_a = getTypeOfClass(enclosingClass)) === null || _a === void 0 ? void 0 : _a.classType : undefined;
         // Determine which class the "super" call is applied to. If
         // there is no first argument, then the class is implicit.
@@ -5804,13 +5862,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         return argParamCopy;
                     });
                 }
-                // Clone the typeVarContext so we don't modify the original. If this is
-                // not the first time through the loop, clone the type var context
-                // from the previous successful match.
-                const typeVarContextToClone = matchedOverloads.length > 0
-                    ? matchedOverloads[matchedOverloads.length - 1].typeVarContext.clone()
-                    : typeVarContext;
-                const effectiveTypeVarContext = (_a = typeVarContextToClone === null || typeVarContextToClone === void 0 ? void 0 : typeVarContextToClone.clone()) !== null && _a !== void 0 ? _a : new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(overload));
+                // Clone the typeVarContext so we don't modify the original.
+                const effectiveTypeVarContext = (_a = typeVarContext === null || typeVarContext === void 0 ? void 0 : typeVarContext.clone()) !== null && _a !== void 0 ? _a : new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(overload));
                 effectiveTypeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeIds)(overload));
                 effectiveTypeVarContext.unlock();
                 // Use speculative mode so we don't output any diagnostics or
@@ -6557,7 +6610,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         var _a, _b;
         const memberType = (_a = getTypeOfObjectMember(errorNode, expandedCallType, '__call__', 
         /* usage */ undefined, 
-        /* diag */ undefined, 64 /* SkipAttributeAccessOverride */)) === null || _a === void 0 ? void 0 : _a.type;
+        /* diag */ undefined, 64 /* SkipAttributeAccessOverride */ | 1 /* AccessClassMembersOnly */)) === null || _a === void 0 ? void 0 : _a.type;
         if (!memberType) {
             addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.objectNotCallable().format({
                 type: printType(expandedCallType),
@@ -7960,6 +8013,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 const argsParam = paramSpecParams.find((paramInfo) => paramInfo.category === 1 /* ArgsList */);
                 const kwargsParam = paramSpecParams.find((paramInfo) => paramInfo.category === 2 /* KwargsDict */);
                 const signatureTracker = new typeUtils_1.UniqueSignatureTracker();
+                const nestedArgList = [];
                 argList.forEach((arg) => {
                     var _a;
                     if (arg.argumentCategory === 0 /* Simple */) {
@@ -7989,6 +8043,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             else if (argsParam) {
                                 paramType = argsParam.type;
                             }
+                            else if (paramSpecType.details.paramSpec) {
+                                nestedArgList.push(arg);
+                            }
                             else {
                                 addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, paramSpecParams.length === 1
                                     ? localize_1.Localizer.Diagnostic.argPositionalExpectedOne()
@@ -8034,6 +8091,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         }
                     }
                 });
+                // Handle recursive ParamSpecs.
+                if (paramSpecType.details.paramSpec) {
+                    const boundTypeForParamSpec = srcTypeVarContext
+                        .getPrimarySignature()
+                        .getParamSpecType(paramSpecType.details.paramSpec);
+                    if (boundTypeForParamSpec) {
+                        const paramSpecArgResult = validateFunctionArgumentsForParamSpec(errorNode, nestedArgList, paramSpecType.details.paramSpec, srcTypeVarContext, conditionFilter);
+                        if (paramSpecArgResult.argumentErrors) {
+                            reportedArgError = true;
+                        }
+                    }
+                }
             });
         }
         // Report any missing parameters.
@@ -8071,10 +8140,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         let isCompatible = true;
         const functionName = typeResult === null || typeResult === void 0 ? void 0 : typeResult.type.details.name;
         let skippedBareTypeVarExpectedType = false;
+        let skipSolveTypeVars = false;
         if (argParam.argument.valueExpression) {
             let expectedType;
-            const isBareTypeVarExpectedType = (0, types_1.isTypeVar)(argParam.paramType) && argParam.paramType.scopeId === (typeResult === null || typeResult === void 0 ? void 0 : typeResult.type.details.typeVarScopeId);
-            if (!options.skipBareTypeVarExpectedType || !isBareTypeVarExpectedType) {
+            // Is the expected type a "bare" in-scope TypeVar or a union of bare in-scope TypeVars?
+            let isExpectedTypeBareTypeVar = true;
+            (0, typeUtils_1.doForEachSubtype)(argParam.paramType, (subtype) => {
+                if (!(0, types_1.isTypeVar)(subtype) || subtype.scopeId !== (typeResult === null || typeResult === void 0 ? void 0 : typeResult.type.details.typeVarScopeId)) {
+                    isExpectedTypeBareTypeVar = false;
+                }
+            });
+            if (!options.skipBareTypeVarExpectedType || !isExpectedTypeBareTypeVar) {
                 expectedType = argParam.paramType;
                 // If the parameter type is a function with a ParamSpec, don't apply
                 // the solved TypeVars if the typeVarContext has more than one signature.
@@ -8090,6 +8166,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
             else {
                 skippedBareTypeVarExpectedType = true;
+                // If the expected type is a union of bare TypeVars, it's not clear which of the two
+                // (or both) should be constrained. We'll skip any attempt to solve the TypeVars during
+                // this pass and hope that subsequent arg assignments will help us establish the correct
+                // constraints.
+                if ((0, types_1.isUnion)(argParam.paramType)) {
+                    skipSolveTypeVars = true;
+                }
             }
             // If the expected type is unknown, don't use an expected type. Instead,
             // use default rules for evaluating the expression type.
@@ -8166,15 +8249,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         const condition = argType.condition;
         let diag = new diagnostic_1.DiagnosticAddendum();
-        // Handle the case where we're assigning a *args or **kwargs argument
-        // to a *P.args or **P.kwargs parameter.
-        if ((0, types_1.isParamSpec)(argParam.paramType) && argParam.paramType.paramSpecAccess !== undefined) {
-            return { isCompatible, argType, isTypeIncomplete, condition };
-        }
-        // Handle the case where we're assigning a *P.args or **P.kwargs argument
-        // to a *P.args or **P.kwargs parameter.
-        if ((0, types_1.isParamSpec)(argType) && argType.paramSpecAccess !== undefined) {
-            return { isCompatible, argType, isTypeIncomplete, condition };
+        if ((0, types_1.isParamSpec)(argParam.paramType)) {
+            // Handle the case where we're assigning a *args or **kwargs argument
+            // to a *P.args or **P.kwargs parameter.
+            if (argParam.paramType.paramSpecAccess !== undefined) {
+                return { isCompatible, argType, isTypeIncomplete, condition };
+            }
+            // Handle the case where we're assigning a *P.args or **P.kwargs argument
+            // to a *P.args or **P.kwargs parameter.
+            if ((0, types_1.isParamSpec)(argType) && argType.paramSpecAccess !== undefined) {
+                return { isCompatible, argType, isTypeIncomplete, condition };
+            }
         }
         // If we are asked to skip overload arguments, determine whether the argument
         // is an explicit overload type, an overloaded class constructor, or a
@@ -8206,7 +8291,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                 }
                 if ((0, types_1.isClassInstance)(argType)) {
-                    const callMember = (0, typeUtils_1.lookUpObjectMember)(argType, '__call__');
+                    const callMember = (0, typeUtils_1.lookUpObjectMember)(argType, '__call__', 8 /* SkipInstanceVariables */);
                     if (callMember) {
                         const memberType = getTypeOfMember(callMember);
                         if ((0, types_1.isOverloadedFunction)(memberType)) {
@@ -8223,7 +8308,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
             }
         }
-        if (!assignType(argParam.paramType, argType, diag.createAddendum(), typeVarContext)) {
+        if (!assignType(argParam.paramType, argType, diag.createAddendum(), typeVarContext, 
+        /* srcTypeVarContext */ undefined, skipSolveTypeVars ? 8 /* SkipSolveTypeVars */ : undefined)) {
             // Mismatching parameter types are common in untyped code; don't bother spending time
             // printing types if the diagnostic is disabled.
             const fileInfo = AnalyzerNodeInfo.getFileInfo(argParam.errorNode);
@@ -10064,7 +10150,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
             }
             if (!type) {
-                const exprType = getTypeOfExpression(itemExpr);
+                const exprType = getTypeOfExpression(itemExpr, flags & 4 /* AllowForwardReferences */);
                 // Is this an enum type?
                 if ((0, types_1.isClassInstance)(exprType.type) &&
                     types_1.ClassType.isEnumClass(exprType.type) &&
@@ -10616,7 +10702,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // methods that are abstract are overridden and shouldn't
                 // cause the TypedDict to be marked as abstract.
                 if ((0, types_1.isInstantiableClass)(baseClass) && types_1.ClassType.isBuiltIn(baseClass, '_TypedDict')) {
-                    baseClass.details.flags &= ~1024 /* SupportsAbstractMethods */;
+                    baseClass = types_1.ClassType.cloneWithNewFlags(baseClass, baseClass.details.flags &
+                        ~(1024 /* SupportsAbstractMethods */ | 134217728 /* TypeCheckOnly */));
                 }
             }
         }
@@ -11022,452 +11109,465 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             setSymbolResolutionPartialType(classSymbol, classDecl, classType);
         }
         classType.details.flags |= 131072 /* PartiallyEvaluated */;
-        writeTypeCache(node, { type: classType }, /* flags */ undefined);
-        writeTypeCache(node.name, { type: classType }, /* flags */ undefined);
-        // Keep a list of unique type parameters that are used in the
-        // base class arguments.
-        let typeParameters = [];
-        if (node.typeParameters) {
-            typeParameters = evaluateTypeParameterList(node.typeParameters).map((t) => types_1.TypeVarType.cloneAsInstance(t));
-        }
-        // If the class derives from "Generic" directly, it will provide
-        // all of the type parameters in the specified order.
-        let genericTypeParameters;
-        let protocolTypeParameters;
-        const initSubclassArgs = [];
-        let metaclassNode;
-        let exprFlags = 128 /* ExpectingInstantiableType */ |
-            1024 /* AllowGenericClassType */ |
-            262144 /* DisallowNakedGeneric */ |
-            2048 /* DisallowTypeVarsWithScopeId */ |
-            8192 /* AssociateTypeVarsWithCurrentScope */ |
-            16384 /* EnforceTypeVarVarianceConsistency */ |
-            16777216 /* DisallowPep695TypeAlias */;
-        if (fileInfo.isStubFile) {
-            exprFlags |= 4 /* AllowForwardReferences */;
-        }
-        node.arguments.forEach((arg) => {
-            // Ignore unpacked arguments.
-            if (arg.argumentCategory === 2 /* UnpackedDictionary */) {
-                // Evaluate the expression's type so symbols are marked accessed
-                // and errors are reported.
-                getTypeOfExpression(arg.valueExpression);
-                return;
+        try {
+            writeTypeCache(node, { type: classType }, /* flags */ undefined);
+            writeTypeCache(node.name, { type: classType }, /* flags */ undefined);
+            // Keep a list of unique type parameters that are used in the
+            // base class arguments.
+            let typeParameters = [];
+            if (node.typeParameters) {
+                typeParameters = evaluateTypeParameterList(node.typeParameters).map((t) => types_1.TypeVarType.cloneAsInstance(t));
+            }
+            // If the class derives from "Generic" directly, it will provide
+            // all of the type parameters in the specified order.
+            let genericTypeParameters;
+            let protocolTypeParameters;
+            const initSubclassArgs = [];
+            let metaclassNode;
+            let exprFlags = 128 /* ExpectingInstantiableType */ |
+                1024 /* AllowGenericClassType */ |
+                262144 /* DisallowNakedGeneric */ |
+                2048 /* DisallowTypeVarsWithScopeId */ |
+                8192 /* AssociateTypeVarsWithCurrentScope */ |
+                16384 /* EnforceTypeVarVarianceConsistency */ |
+                16777216 /* DisallowPep695TypeAlias */;
+            if (fileInfo.isStubFile) {
+                exprFlags |= 4 /* AllowForwardReferences */;
             }
-            if (!arg.name) {
-                let argType;
-                if (arg.argumentCategory === 1 /* UnpackedList */) {
+            node.arguments.forEach((arg) => {
+                // Ignore unpacked arguments.
+                if (arg.argumentCategory === 2 /* UnpackedDictionary */) {
+                    // Evaluate the expression's type so symbols are marked accessed
+                    // and errors are reported.
                     getTypeOfExpression(arg.valueExpression);
-                    argType = types_1.UnknownType.create();
+                    return;
                 }
-                else {
-                    argType = makeTopLevelTypeVarsConcrete(getTypeOfExpression(arg.valueExpression, exprFlags).type);
-                }
-                // In some stub files, classes are conditionally defined (e.g. based
-                // on platform type). We'll assume that the conditional logic is correct
-                // and strip off the "unbound" union.
-                if ((0, types_1.isUnion)(argType)) {
-                    argType = (0, types_1.removeUnbound)(argType);
-                }
-                if (!(0, types_1.isAnyOrUnknown)(argType) && !(0, types_1.isUnbound)(argType)) {
-                    if ((0, typeUtils_1.isMetaclassInstance)(argType)) {
-                        (0, debug_1.assert)((0, types_1.isClassInstance)(argType));
-                        argType =
-                            argType.typeArguments && argType.typeArguments.length > 0
-                                ? argType.typeArguments[0]
-                                : types_1.UnknownType.create();
-                    }
-                    else if (!(0, types_1.isInstantiableClass)(argType)) {
-                        addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.baseClassInvalid(), arg);
+                if (!arg.name) {
+                    let argType;
+                    if (arg.argumentCategory === 1 /* UnpackedList */) {
+                        getTypeOfExpression(arg.valueExpression);
                         argType = types_1.UnknownType.create();
                     }
                     else {
-                        if (types_1.ClassType.isPartiallyEvaluated(argType) ||
-                            argType.details.mro.some((t) => (0, types_1.isClass)(t) && types_1.ClassType.isPartiallyEvaluated(t))) {
-                            // If the base class is partially evaluated, install a callback
-                            // so we can fix up this class (e.g. compute the MRO) when the
-                            // dependent class is completed.
-                            registerDeferredClassCompletion(node, argType);
+                        argType = makeTopLevelTypeVarsConcrete(getTypeOfExpression(arg.valueExpression, exprFlags).type);
+                    }
+                    // In some stub files, classes are conditionally defined (e.g. based
+                    // on platform type). We'll assume that the conditional logic is correct
+                    // and strip off the "unbound" union.
+                    if ((0, types_1.isUnion)(argType)) {
+                        argType = (0, types_1.removeUnbound)(argType);
+                    }
+                    if (!(0, types_1.isAnyOrUnknown)(argType) && !(0, types_1.isUnbound)(argType)) {
+                        if ((0, typeUtils_1.isMetaclassInstance)(argType)) {
+                            (0, debug_1.assert)((0, types_1.isClassInstance)(argType));
+                            argType =
+                                argType.typeArguments && argType.typeArguments.length > 0
+                                    ? argType.typeArguments[0]
+                                    : types_1.UnknownType.create();
                         }
-                        if (types_1.ClassType.isBuiltIn(argType, 'Protocol')) {
-                            if (!fileInfo.isStubFile &&
-                                !types_1.ClassType.isTypingExtensionClass(argType) &&
-                                fileInfo.executionEnvironment.pythonVersion < pythonVersion_1.PythonVersion.V3_7) {
-                                addError(localize_1.Localizer.Diagnostic.protocolIllegal(), arg.valueExpression);
+                        else if (!(0, types_1.isInstantiableClass)(argType)) {
+                            addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.baseClassInvalid(), arg);
+                            argType = types_1.UnknownType.create();
+                        }
+                        else {
+                            if (types_1.ClassType.isPartiallyEvaluated(argType) ||
+                                argType.details.mro.some((t) => (0, types_1.isClass)(t) && types_1.ClassType.isPartiallyEvaluated(t))) {
+                                // If the base class is partially evaluated, install a callback
+                                // so we can fix up this class (e.g. compute the MRO) when the
+                                // dependent class is completed.
+                                registerDeferredClassCompletion(node, argType);
+                            }
+                            if (types_1.ClassType.isBuiltIn(argType, 'Protocol')) {
+                                if (!fileInfo.isStubFile &&
+                                    !types_1.ClassType.isTypingExtensionClass(argType) &&
+                                    fileInfo.executionEnvironment.pythonVersion < pythonVersion_1.PythonVersion.V3_7) {
+                                    addError(localize_1.Localizer.Diagnostic.protocolIllegal(), arg.valueExpression);
+                                }
+                                classType.details.flags |= 8192 /* ProtocolClass */;
+                            }
+                            if (types_1.ClassType.isBuiltIn(argType, 'property')) {
+                                classType.details.flags |= 2048 /* PropertyClass */;
+                            }
+                            // If the class directly derives from NamedTuple (in Python 3.6 or
+                            // newer), it's considered a (read-only) dataclass.
+                            if (fileInfo.executionEnvironment.pythonVersion >= pythonVersion_1.PythonVersion.V3_6) {
+                                if (types_1.ClassType.isBuiltIn(argType, 'NamedTuple')) {
+                                    classType.details.flags |=
+                                        4 /* DataClass */ |
+                                            32 /* SkipSynthesizedDataClassEq */ |
+                                            16777216 /* ReadOnlyInstanceVariables */;
+                                }
+                            }
+                            // If the class directly derives from TypedDict or from a class that is
+                            // a TypedDict, it is considered a TypedDict.
+                            if (types_1.ClassType.isBuiltIn(argType, 'TypedDict') || types_1.ClassType.isTypedDictClass(argType)) {
+                                classType.details.flags |= 128 /* TypedDictClass */;
+                            }
+                            else if (types_1.ClassType.isTypedDictClass(classType) && !types_1.ClassType.isTypedDictClass(argType)) {
+                                // Exempt Generic from this test. As of Python 3.11, generic TypedDict
+                                // classes are supported.
+                                if (!(0, types_1.isInstantiableClass)(argType) || !types_1.ClassType.isBuiltIn(argType, 'Generic')) {
+                                    // TypedDict classes must derive only from other TypedDict classes.
+                                    addError(localize_1.Localizer.Diagnostic.typedDictBaseClass(), arg);
+                                }
+                            }
+                            // Validate that the class isn't deriving from itself, creating a
+                            // circular dependency.
+                            if ((0, typeUtils_1.derivesFromClassRecursive)(argType, classType, /* ignoreUnknown */ true)) {
+                                addError(localize_1.Localizer.Diagnostic.baseClassCircular(), arg);
+                                argType = types_1.UnknownType.create();
                             }
-                            classType.details.flags |= 8192 /* ProtocolClass */;
                         }
-                        if (types_1.ClassType.isBuiltIn(argType, 'property')) {
-                            classType.details.flags |= 2048 /* PropertyClass */;
+                    }
+                    if ((0, types_1.isUnknown)(argType)) {
+                        addDiagnostic(fileInfo.diagnosticRuleSet.reportUntypedBaseClass, diagnosticRules_1.DiagnosticRule.reportUntypedBaseClass, localize_1.Localizer.Diagnostic.baseClassUnknown(), arg);
+                    }
+                    // Check for a duplicate class.
+                    if (classType.details.baseClasses.some((prevBaseClass) => {
+                        return ((0, types_1.isInstantiableClass)(prevBaseClass) &&
+                            (0, types_1.isInstantiableClass)(argType) &&
+                            types_1.ClassType.isSameGenericClass(argType, prevBaseClass));
+                    })) {
+                        addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.duplicateBaseClass(), arg.name || arg);
+                    }
+                    classType.details.baseClasses.push(argType);
+                    if ((0, types_1.isInstantiableClass)(argType)) {
+                        if (types_1.ClassType.isEnumClass(argType)) {
+                            classType.details.flags |= 1048576 /* EnumClass */;
                         }
-                        // If the class directly derives from NamedTuple (in Python 3.6 or
-                        // newer), it's considered a (read-only) dataclass.
-                        if (fileInfo.executionEnvironment.pythonVersion >= pythonVersion_1.PythonVersion.V3_6) {
-                            if (types_1.ClassType.isBuiltIn(argType, 'NamedTuple')) {
-                                classType.details.flags |=
-                                    4 /* DataClass */ |
-                                        32 /* SkipSynthesizedDataClassEq */ |
-                                        16777216 /* ReadOnlyInstanceVariables */;
-                            }
+                        // Determine if the class is abstract. Protocol classes support abstract methods
+                        // even though they don't derive from the ABCMeta class. We'll exclude built-in
+                        // protocol classes because these are known not to contain any abstract methods
+                        // and getAbstractMethods causes problems because of dependencies on some of these
+                        // built-in protocol classes.
+                        if (types_1.ClassType.supportsAbstractMethods(argType) ||
+                            (types_1.ClassType.isProtocolClass(argType) && !types_1.ClassType.isBuiltIn(argType))) {
+                            classType.details.flags |= 1024 /* SupportsAbstractMethods */;
                         }
-                        // If the class directly derives from TypedDict or from a class that is
-                        // a TypedDict, it is considered a TypedDict.
-                        if (types_1.ClassType.isBuiltIn(argType, 'TypedDict') || types_1.ClassType.isTypedDictClass(argType)) {
-                            classType.details.flags |= 128 /* TypedDictClass */;
+                        if (types_1.ClassType.isPropertyClass(argType)) {
+                            classType.details.flags |= 2048 /* PropertyClass */;
+                        }
+                        if (types_1.ClassType.isFinal(argType)) {
+                            const className = printObjectTypeForClass(argType);
+                            addError(localize_1.Localizer.Diagnostic.baseClassFinal().format({ type: className }), arg.valueExpression);
                         }
-                        else if (types_1.ClassType.isTypedDictClass(classType) && !types_1.ClassType.isTypedDictClass(argType)) {
-                            // Exempt Generic from this test. As of Python 3.11, generic TypedDict
-                            // classes are supported.
-                            if (!(0, types_1.isInstantiableClass)(argType) || !types_1.ClassType.isBuiltIn(argType, 'Generic')) {
-                                // TypedDict classes must derive only from other TypedDict classes.
-                                addError(localize_1.Localizer.Diagnostic.typedDictBaseClass(), arg);
+                    }
+                    (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(argType));
+                    if ((0, types_1.isInstantiableClass)(argType)) {
+                        if (types_1.ClassType.isBuiltIn(argType, 'Generic')) {
+                            // 'Generic' is implicitly added if type parameter syntax is used.
+                            if (node.typeParameters) {
+                                addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.genericBaseClassNotAllowed(), arg.valueExpression);
+                            }
+                            else {
+                                if (!genericTypeParameters) {
+                                    if (protocolTypeParameters) {
+                                        addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.duplicateGenericAndProtocolBase(), arg.valueExpression);
+                                    }
+                                    genericTypeParameters = [];
+                                    (0, typeUtils_1.addTypeVarsToListIfUnique)(genericTypeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(argType));
+                                }
                             }
                         }
-                        // Validate that the class isn't deriving from itself, creating a
-                        // circular dependency.
-                        if ((0, typeUtils_1.derivesFromClassRecursive)(argType, classType, /* ignoreUnknown */ true)) {
-                            addError(localize_1.Localizer.Diagnostic.baseClassCircular(), arg);
-                            argType = types_1.UnknownType.create();
+                        else if (types_1.ClassType.isBuiltIn(argType, 'Protocol') &&
+                            argType.typeArguments &&
+                            argType.typeArguments.length > 0) {
+                            if (!protocolTypeParameters) {
+                                if (genericTypeParameters) {
+                                    addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.duplicateGenericAndProtocolBase(), arg.valueExpression);
+                                }
+                                protocolTypeParameters = [];
+                                (0, typeUtils_1.addTypeVarsToListIfUnique)(protocolTypeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(argType));
+                                if (node.typeParameters && protocolTypeParameters.length > 0) {
+                                    addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.protocolBaseClassWithTypeArgs(), arg.valueExpression);
+                                    protocolTypeParameters = [];
+                                }
+                            }
                         }
                     }
                 }
-                if ((0, types_1.isUnknown)(argType)) {
-                    addDiagnostic(fileInfo.diagnosticRuleSet.reportUntypedBaseClass, diagnosticRules_1.DiagnosticRule.reportUntypedBaseClass, localize_1.Localizer.Diagnostic.baseClassUnknown(), arg);
-                }
-                // Check for a duplicate class.
-                if (classType.details.baseClasses.some((prevBaseClass) => {
-                    return ((0, types_1.isInstantiableClass)(prevBaseClass) &&
-                        (0, types_1.isInstantiableClass)(argType) &&
-                        types_1.ClassType.isSameGenericClass(argType, prevBaseClass));
-                })) {
-                    addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.duplicateBaseClass(), arg.name || arg);
-                }
-                classType.details.baseClasses.push(argType);
-                if ((0, types_1.isInstantiableClass)(argType)) {
-                    if (types_1.ClassType.isEnumClass(argType)) {
-                        classType.details.flags |= 1048576 /* EnumClass */;
+                else if (arg.name.value === 'metaclass') {
+                    if (metaclassNode) {
+                        addError(localize_1.Localizer.Diagnostic.metaclassDuplicate(), arg);
                     }
-                    // Determine if the class is abstract. Protocol classes support abstract methods
-                    // even though they don't derive from the ABCMeta class. We'll exclude built-in
-                    // protocol classes because these are known not to contain any abstract methods
-                    // and getAbstractMethods causes problems because of dependencies on some of these
-                    // built-in protocol classes.
-                    if (types_1.ClassType.supportsAbstractMethods(argType) ||
-                        (types_1.ClassType.isProtocolClass(argType) && !types_1.ClassType.isBuiltIn(argType))) {
-                        classType.details.flags |= 1024 /* SupportsAbstractMethods */;
+                    else {
+                        metaclassNode = arg.valueExpression;
+                    }
+                }
+                else if (types_1.ClassType.isTypedDictClass(classType) &&
+                    (arg.name.value === 'total' || arg.name.value === 'readonly')) {
+                    // The "total" and "readonly" parameters apply only for TypedDict classes.
+                    // PEP 589 specifies that the parameter must be either True or False.
+                    const constArgValue = (0, staticExpressions_1.evaluateStaticBoolExpression)(arg.valueExpression, fileInfo.executionEnvironment, fileInfo.definedConstants);
+                    if (constArgValue === undefined) {
+                        addError(localize_1.Localizer.Diagnostic.typedDictBoolParam().format({ name: arg.name.value }), arg.valueExpression);
                     }
-                    if (types_1.ClassType.isPropertyClass(argType)) {
-                        classType.details.flags |= 2048 /* PropertyClass */;
+                    else if (arg.name.value === 'total' && !constArgValue) {
+                        classType.details.flags |= 256 /* CanOmitDictValues */;
                     }
-                    if (types_1.ClassType.isFinal(argType)) {
-                        const className = printObjectTypeForClass(argType);
-                        addError(localize_1.Localizer.Diagnostic.baseClassFinal().format({ type: className }), arg.valueExpression);
+                    else if (arg.name.value === 'readonly' && constArgValue) {
+                        classType.details.flags |= 512 /* DictValuesReadOnly */;
                     }
                 }
-                (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(argType));
-                if ((0, types_1.isInstantiableClass)(argType)) {
-                    if (types_1.ClassType.isBuiltIn(argType, 'Generic')) {
-                        // 'Generic' is implicitly added if type parameter syntax is used.
-                        if (node.typeParameters) {
-                            addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.genericBaseClassNotAllowed(), arg.valueExpression);
+                else {
+                    // Collect arguments that will be passed to the `__init_subclass__`
+                    // method described in PEP 487.
+                    initSubclassArgs.push({
+                        argumentCategory: 0 /* Simple */,
+                        node: arg,
+                        name: arg.name,
+                        valueExpression: arg.valueExpression,
+                    });
+                }
+            });
+            // Check for NamedTuple multiple inheritance.
+            if (classType.details.baseClasses.length > 1) {
+                let derivesFromNamedTuple = false;
+                let foundIllegalBaseClass = false;
+                classType.details.baseClasses.forEach((baseClass) => {
+                    if ((0, types_1.isInstantiableClass)(baseClass)) {
+                        if (types_1.ClassType.isBuiltIn(baseClass, 'NamedTuple')) {
+                            derivesFromNamedTuple = true;
                         }
-                        else {
-                            if (!genericTypeParameters) {
-                                if (protocolTypeParameters) {
-                                    addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.duplicateGenericAndProtocolBase(), arg.valueExpression);
-                                }
-                                genericTypeParameters = [];
-                                (0, typeUtils_1.addTypeVarsToListIfUnique)(genericTypeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(argType));
-                            }
+                        else if (!types_1.ClassType.isBuiltIn(baseClass, 'Generic')) {
+                            foundIllegalBaseClass = true;
                         }
                     }
-                    else if (types_1.ClassType.isBuiltIn(argType, 'Protocol') &&
-                        argType.typeArguments &&
-                        argType.typeArguments.length > 0) {
-                        if (!protocolTypeParameters) {
-                            if (genericTypeParameters) {
-                                addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.duplicateGenericAndProtocolBase(), arg.valueExpression);
-                            }
-                            protocolTypeParameters = [];
-                            (0, typeUtils_1.addTypeVarsToListIfUnique)(protocolTypeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(argType));
-                            if (node.typeParameters && protocolTypeParameters.length > 0) {
-                                addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.protocolBaseClassWithTypeArgs(), arg.valueExpression);
-                                protocolTypeParameters = [];
+                });
+                if (derivesFromNamedTuple && foundIllegalBaseClass) {
+                    addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.namedTupleMultipleInheritance(), node.name);
+                }
+            }
+            // Make sure we don't have 'object' derive from itself. Infinite
+            // recursion will result.
+            if (!types_1.ClassType.isBuiltIn(classType, 'object') &&
+                classType.details.baseClasses.filter((baseClass) => (0, types_1.isClass)(baseClass)).length === 0) {
+                // If there are no other (known) base classes, the class implicitly derives from object.
+                classType.details.baseClasses.push(getBuiltInType(node, 'object'));
+            }
+            // If genericTypeParameters or protocolTypeParameters are provided,
+            // make sure that typeParameters is a proper subset.
+            genericTypeParameters = genericTypeParameters !== null && genericTypeParameters !== void 0 ? genericTypeParameters : protocolTypeParameters;
+            if (genericTypeParameters && !node.typeParameters) {
+                verifyGenericTypeParameters(node.name, typeParameters, genericTypeParameters);
+            }
+            classType.details.typeParameters = genericTypeParameters !== null && genericTypeParameters !== void 0 ? genericTypeParameters : typeParameters;
+            // Determine if one or more type parameters is autovariance.
+            if (classType.details.typeParameters.some((param) => param.details.declaredVariance === 0 /* Auto */ && param.computedVariance === undefined)) {
+                classType.details.requiresVarianceInference = true;
+            }
+            // Make sure there's at most one variadic type parameter.
+            const variadics = classType.details.typeParameters.filter((param) => (0, types_1.isVariadicTypeVar)(param));
+            if (variadics.length > 1) {
+                addError(localize_1.Localizer.Diagnostic.variadicTypeParamTooManyClass().format({
+                    names: variadics.map((v) => `"${v.details.name}"`).join(', '),
+                }), node.name, textRange_1.TextRange.combine(node.arguments) || node.name);
+            }
+            // Validate the default types for all type parameters.
+            classType.details.typeParameters.forEach((typeParam, index) => {
+                var _a;
+                let bestErrorNode = node.name;
+                if (node.typeParameters && index < node.typeParameters.parameters.length) {
+                    const typeParamNode = node.typeParameters.parameters[index];
+                    bestErrorNode = (_a = typeParamNode.defaultExpression) !== null && _a !== void 0 ? _a : typeParamNode.name;
+                }
+                validateTypeParameterDefault(bestErrorNode, typeParam, classType.details.typeParameters.slice(0, index));
+            });
+            if (!(0, typeUtils_1.computeMroLinearization)(classType)) {
+                addError(localize_1.Localizer.Diagnostic.methodOrdering(), node.name);
+            }
+            // The scope for this class becomes the "fields" for the corresponding type.
+            const innerScope = ScopeUtils.getScopeForNode(node.suite);
+            classType.details.fields = (innerScope === null || innerScope === void 0 ? void 0 : innerScope.symbolTable)
+                ? new Map(innerScope.symbolTable)
+                : new Map();
+            // Determine whether the class should inherit __hash__. If a class defines
+            // __eq__ but doesn't define __hash__ then __hash__ is set to None.
+            if (classType.details.fields.has('__eq__') && !classType.details.fields.has('__hash__')) {
+                classType.details.fields.set('__hash__', symbol_1.Symbol.createWithType(4 /* ClassMember */ |
+                    128 /* ClassVar */ |
+                    64 /* IgnoredForProtocolMatch */ |
+                    4096 /* IgnoredForOverrideChecks */, types_1.NoneType.createInstance()));
+            }
+            // Determine whether the class's instance variables are constrained
+            // to those defined by __slots__. We need to do this prior to dataclass
+            // processing because dataclasses can implicitly add to the slots
+            // list.
+            const slotsNames = innerScope === null || innerScope === void 0 ? void 0 : innerScope.getSlotsNames();
+            if (slotsNames) {
+                classType.details.localSlotsNames = slotsNames;
+            }
+            // Determine if the class should be a "pseudo-generic" class, characterized
+            // by having an __init__ method with parameters that lack type annotations.
+            // For such classes, we'll treat them as generic, with the type arguments provided
+            // by the callers of the constructor.
+            if (!fileInfo.isStubFile && classType.details.typeParameters.length === 0) {
+                const initMethod = classType.details.fields.get('__init__');
+                if (initMethod) {
+                    const initDecls = initMethod.getTypedDeclarations();
+                    if (initDecls.length === 1 && initDecls[0].type === 5 /* Function */) {
+                        const initDeclNode = initDecls[0].node;
+                        const initParams = initDeclNode.parameters;
+                        if (initParams.length > 1 &&
+                            !initParams.some((param, index) => !!ParseTreeUtils.getTypeAnnotationForParameter(initDeclNode, index))) {
+                            const genericParams = initParams.filter((param, index) => index > 0 &&
+                                param.name &&
+                                param.category === 0 /* Simple */ &&
+                                !param.defaultValue);
+                            if (genericParams.length > 0) {
+                                classType.details.flags |= 16384 /* PseudoGenericClass */;
+                                // Create a type parameter for each simple, named parameter
+                                // in the __init__ method.
+                                classType.details.typeParameters = genericParams.map((param) => {
+                                    const typeVar = types_1.TypeVarType.createInstance(getPseudoGenericTypeVarName(param.name.value));
+                                    typeVar.details.isSynthesized = true;
+                                    typeVar.scopeId = ParseTreeUtils.getScopeIdForNode(initDeclNode);
+                                    typeVar.details.boundType = types_1.UnknownType.create();
+                                    return types_1.TypeVarType.cloneForScopeId(typeVar, ParseTreeUtils.getScopeIdForNode(node), node.name.value, 0 /* Class */);
+                                });
                             }
                         }
                     }
                 }
             }
-            else if (arg.name.value === 'metaclass') {
-                if (metaclassNode) {
-                    addError(localize_1.Localizer.Diagnostic.metaclassDuplicate(), arg);
+            // Determine if the class has a custom __class_getitem__ method. This applies
+            // only to classes that have no type parameters, since those with type parameters
+            // are assumed to follow normal subscripting semantics for generic classes.
+            if (classType.details.typeParameters.length === 0 && !types_1.ClassType.isBuiltIn(classType, 'type')) {
+                if (classType.details.baseClasses.some((baseClass) => (0, types_1.isInstantiableClass)(baseClass) && types_1.ClassType.hasCustomClassGetItem(baseClass)) ||
+                    classType.details.fields.has('__class_getitem__')) {
+                    classType.details.flags |= 262144 /* HasCustomClassGetItem */;
                 }
-                else {
-                    metaclassNode = arg.valueExpression;
-                }
-            }
-            else if (types_1.ClassType.isTypedDictClass(classType) &&
-                (arg.name.value === 'total' || arg.name.value === 'readonly')) {
-                // The "total" and "readonly" parameters apply only for TypedDict classes.
-                // PEP 589 specifies that the parameter must be either True or False.
-                const constArgValue = (0, staticExpressions_1.evaluateStaticBoolExpression)(arg.valueExpression, fileInfo.executionEnvironment, fileInfo.definedConstants);
-                if (constArgValue === undefined) {
-                    addError(localize_1.Localizer.Diagnostic.typedDictBoolParam().format({ name: arg.name.value }), arg.valueExpression);
-                }
-                else if (arg.name.value === 'total' && !constArgValue) {
-                    classType.details.flags |= 256 /* CanOmitDictValues */;
-                }
-                else if (arg.name.value === 'readonly' && constArgValue) {
-                    classType.details.flags |= 512 /* DictValuesReadOnly */;
-                }
-            }
-            else {
-                // Collect arguments that will be passed to the `__init_subclass__`
-                // method described in PEP 487.
-                initSubclassArgs.push({
-                    argumentCategory: 0 /* Simple */,
-                    node: arg,
-                    name: arg.name,
-                    valueExpression: arg.valueExpression,
-                });
             }
-        });
-        // Check for NamedTuple multiple inheritance.
-        if (classType.details.baseClasses.length > 1) {
-            let derivesFromNamedTuple = false;
-            let foundIllegalBaseClass = false;
-            classType.details.baseClasses.forEach((baseClass) => {
-                if ((0, types_1.isInstantiableClass)(baseClass)) {
-                    if (types_1.ClassType.isBuiltIn(baseClass, 'NamedTuple')) {
-                        derivesFromNamedTuple = true;
-                    }
-                    else if (!types_1.ClassType.isBuiltIn(baseClass, 'Generic')) {
-                        foundIllegalBaseClass = true;
+            // Determine the effective metaclass.
+            if (metaclassNode) {
+                const metaclassType = getTypeOfExpression(metaclassNode, exprFlags).type;
+                if ((0, types_1.isInstantiableClass)(metaclassType) || (0, types_1.isUnknown)(metaclassType)) {
+                    if ((0, typeUtils_1.requiresSpecialization)(metaclassType, /* ignorePseudoGeneric */ true)) {
+                        addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.metaclassIsGeneric(), metaclassNode);
                     }
-                }
-            });
-            if (derivesFromNamedTuple && foundIllegalBaseClass) {
-                addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.namedTupleMultipleInheritance(), node.name);
-            }
-        }
-        // Make sure we don't have 'object' derive from itself. Infinite
-        // recursion will result.
-        if (!types_1.ClassType.isBuiltIn(classType, 'object') &&
-            classType.details.baseClasses.filter((baseClass) => (0, types_1.isClass)(baseClass)).length === 0) {
-            // If there are no other (known) base classes, the class implicitly derives from object.
-            classType.details.baseClasses.push(getBuiltInType(node, 'object'));
-        }
-        // If genericTypeParameters or protocolTypeParameters are provided,
-        // make sure that typeParameters is a proper subset.
-        genericTypeParameters = genericTypeParameters !== null && genericTypeParameters !== void 0 ? genericTypeParameters : protocolTypeParameters;
-        if (genericTypeParameters && !node.typeParameters) {
-            verifyGenericTypeParameters(node.name, typeParameters, genericTypeParameters);
-        }
-        classType.details.typeParameters = genericTypeParameters !== null && genericTypeParameters !== void 0 ? genericTypeParameters : typeParameters;
-        // Determine if one or more type parameters is autovariance.
-        if (classType.details.typeParameters.some((param) => param.details.declaredVariance === 0 /* Auto */ && param.computedVariance === undefined)) {
-            classType.details.requiresVarianceInference = true;
-        }
-        // Make sure there's at most one variadic type parameter.
-        const variadics = classType.details.typeParameters.filter((param) => (0, types_1.isVariadicTypeVar)(param));
-        if (variadics.length > 1) {
-            addError(localize_1.Localizer.Diagnostic.variadicTypeParamTooManyClass().format({
-                names: variadics.map((v) => `"${v.details.name}"`).join(', '),
-            }), node.name, textRange_1.TextRange.combine(node.arguments) || node.name);
-        }
-        // Validate the default types for all type parameters.
-        classType.details.typeParameters.forEach((typeParam, index) => {
-            var _a;
-            let bestErrorNode = node.name;
-            if (node.typeParameters && index < node.typeParameters.parameters.length) {
-                const typeParamNode = node.typeParameters.parameters[index];
-                bestErrorNode = (_a = typeParamNode.defaultExpression) !== null && _a !== void 0 ? _a : typeParamNode.name;
-            }
-            validateTypeParameterDefault(bestErrorNode, typeParam, classType.details.typeParameters.slice(0, index));
-        });
-        if (!(0, typeUtils_1.computeMroLinearization)(classType)) {
-            addError(localize_1.Localizer.Diagnostic.methodOrdering(), node.name);
-        }
-        // The scope for this class becomes the "fields" for the corresponding type.
-        const innerScope = ScopeUtils.getScopeForNode(node.suite);
-        classType.details.fields = (innerScope === null || innerScope === void 0 ? void 0 : innerScope.symbolTable)
-            ? new Map(innerScope.symbolTable)
-            : new Map();
-        // Determine whether the class should inherit __hash__. If a class defines
-        // __eq__ but doesn't define __hash__ then __hash__ is set to None.
-        if (classType.details.fields.has('__eq__') && !classType.details.fields.has('__hash__')) {
-            classType.details.fields.set('__hash__', symbol_1.Symbol.createWithType(4 /* ClassMember */ | 128 /* ClassVar */ | 64 /* IgnoredForProtocolMatch */, types_1.NoneType.createInstance()));
-        }
-        // Determine whether the class's instance variables are constrained
-        // to those defined by __slots__. We need to do this prior to dataclass
-        // processing because dataclasses can implicitly add to the slots
-        // list.
-        const slotsNames = innerScope === null || innerScope === void 0 ? void 0 : innerScope.getSlotsNames();
-        if (slotsNames) {
-            classType.details.localSlotsNames = slotsNames;
-        }
-        // Determine if the class should be a "pseudo-generic" class, characterized
-        // by having an __init__ method with parameters that lack type annotations.
-        // For such classes, we'll treat them as generic, with the type arguments provided
-        // by the callers of the constructor.
-        if (!fileInfo.isStubFile && classType.details.typeParameters.length === 0) {
-            const initMethod = classType.details.fields.get('__init__');
-            if (initMethod) {
-                const initDecls = initMethod.getTypedDeclarations();
-                if (initDecls.length === 1 && initDecls[0].type === 5 /* Function */) {
-                    const initDeclNode = initDecls[0].node;
-                    const initParams = initDeclNode.parameters;
-                    if (initParams.length > 1 &&
-                        !initParams.some((param, index) => !!ParseTreeUtils.getTypeAnnotationForParameter(initDeclNode, index))) {
-                        const genericParams = initParams.filter((param, index) => index > 0 &&
-                            param.name &&
-                            param.category === 0 /* Simple */ &&
-                            !param.defaultValue);
-                        if (genericParams.length > 0) {
-                            classType.details.flags |= 16384 /* PseudoGenericClass */;
-                            // Create a type parameter for each simple, named parameter
-                            // in the __init__ method.
-                            classType.details.typeParameters = genericParams.map((param) => {
-                                const typeVar = types_1.TypeVarType.createInstance(getPseudoGenericTypeVarName(param.name.value));
-                                typeVar.details.isSynthesized = true;
-                                typeVar.scopeId = ParseTreeUtils.getScopeIdForNode(initDeclNode);
-                                typeVar.details.boundType = types_1.UnknownType.create();
-                                return types_1.TypeVarType.cloneForScopeId(typeVar, ParseTreeUtils.getScopeIdForNode(node), node.name.value, 0 /* Class */);
-                            });
+                    classType.details.declaredMetaclass = metaclassType;
+                    if ((0, types_1.isInstantiableClass)(metaclassType)) {
+                        if (types_1.ClassType.isBuiltIn(metaclassType, 'EnumMeta')) {
+                            classType.details.flags |= 1048576 /* EnumClass */;
+                        }
+                        else if (types_1.ClassType.isBuiltIn(metaclassType, 'ABCMeta')) {
+                            classType.details.flags |= 1024 /* SupportsAbstractMethods */;
                         }
                     }
                 }
             }
-        }
-        // Determine if the class has a custom __class_getitem__ method. This applies
-        // only to classes that have no type parameters, since those with type parameters
-        // are assumed to follow normal subscripting semantics for generic classes.
-        if (classType.details.typeParameters.length === 0 && !types_1.ClassType.isBuiltIn(classType, 'type')) {
-            if (classType.details.baseClasses.some((baseClass) => (0, types_1.isInstantiableClass)(baseClass) && types_1.ClassType.hasCustomClassGetItem(baseClass)) ||
-                classType.details.fields.has('__class_getitem__')) {
-                classType.details.flags |= 262144 /* HasCustomClassGetItem */;
-            }
-        }
-        // Determine the effective metaclass.
-        if (metaclassNode) {
-            const metaclassType = getTypeOfExpression(metaclassNode, exprFlags).type;
-            if ((0, types_1.isInstantiableClass)(metaclassType) || (0, types_1.isUnknown)(metaclassType)) {
-                if ((0, typeUtils_1.requiresSpecialization)(metaclassType, /* ignorePseudoGeneric */ true)) {
-                    addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.metaclassIsGeneric(), metaclassNode);
-                }
-                classType.details.declaredMetaclass = metaclassType;
-                if ((0, types_1.isInstantiableClass)(metaclassType)) {
-                    if (types_1.ClassType.isBuiltIn(metaclassType, 'EnumMeta')) {
-                        classType.details.flags |= 1048576 /* EnumClass */;
-                    }
-                    else if (types_1.ClassType.isBuiltIn(metaclassType, 'ABCMeta')) {
-                        classType.details.flags |= 1024 /* SupportsAbstractMethods */;
+            const effectiveMetaclass = computeEffectiveMetaclass(classType, node.name);
+            // Clear the "partially constructed" flag.
+            classType.details.flags &= ~131072 /* PartiallyEvaluated */;
+            // Now determine the decorated type of the class.
+            let decoratedType = classType;
+            let foundUnknown = false;
+            for (let i = node.decorators.length - 1; i >= 0; i--) {
+                const decorator = node.decorators[i];
+                const newDecoratedType = (0, decorators_1.applyClassDecorator)(evaluatorInterface, decoratedType, classType, decorator);
+                const unknownOrAny = (0, typeUtils_1.containsAnyOrUnknown)(newDecoratedType, /* recurse */ false);
+                if (unknownOrAny && (0, types_1.isUnknown)(unknownOrAny)) {
+                    // Report this error only on the first unknown type.
+                    if (!foundUnknown) {
+                        addDiagnostic(fileInfo.diagnosticRuleSet.reportUntypedClassDecorator, diagnosticRules_1.DiagnosticRule.reportUntypedClassDecorator, localize_1.Localizer.Diagnostic.classDecoratorTypeUnknown(), node.decorators[i].expression);
+                        foundUnknown = true;
                     }
                 }
-            }
-        }
-        const effectiveMetaclass = computeEffectiveMetaclass(classType, node.name);
-        // Clear the "partially constructed" flag.
-        classType.details.flags &= ~131072 /* PartiallyEvaluated */;
-        // Now determine the decorated type of the class.
-        let decoratedType = classType;
-        let foundUnknown = false;
-        for (let i = node.decorators.length - 1; i >= 0; i--) {
-            const decorator = node.decorators[i];
-            const newDecoratedType = (0, decorators_1.applyClassDecorator)(evaluatorInterface, decoratedType, classType, decorator);
-            const unknownOrAny = (0, typeUtils_1.containsAnyOrUnknown)(newDecoratedType, /* recurse */ false);
-            if (unknownOrAny && (0, types_1.isUnknown)(unknownOrAny)) {
-                // Report this error only on the first unknown type.
-                if (!foundUnknown) {
-                    addDiagnostic(fileInfo.diagnosticRuleSet.reportUntypedClassDecorator, diagnosticRules_1.DiagnosticRule.reportUntypedClassDecorator, localize_1.Localizer.Diagnostic.classDecoratorTypeUnknown(), node.decorators[i].expression);
-                    foundUnknown = true;
+                else {
+                    // Apply the decorator only if the type is known.
+                    decoratedType = newDecoratedType;
                 }
             }
-            else {
-                // Apply the decorator only if the type is known.
-                decoratedType = newDecoratedType;
+            // Determine whether this class derives from (or has a metaclass) that imbues
+            // it with dataclass-like behaviors. If so, we'll apply those here.
+            let dataClassBehaviors;
+            if ((0, types_1.isInstantiableClass)(effectiveMetaclass) && effectiveMetaclass.details.classDataClassTransform) {
+                dataClassBehaviors = effectiveMetaclass.details.classDataClassTransform;
             }
-        }
-        // Determine whether this class derives from (or has a metaclass) that imbues
-        // it with dataclass-like behaviors. If so, we'll apply those here.
-        let dataClassBehaviors;
-        if ((0, types_1.isInstantiableClass)(effectiveMetaclass) && effectiveMetaclass.details.classDataClassTransform) {
-            dataClassBehaviors = effectiveMetaclass.details.classDataClassTransform;
-        }
-        else {
-            const baseClassDataTransform = classType.details.mro.find((mroClass) => {
-                return ((0, types_1.isClass)(mroClass) &&
-                    mroClass.details.classDataClassTransform !== undefined &&
-                    !types_1.ClassType.isSameGenericClass(mroClass, classType));
-            });
-            if (baseClassDataTransform) {
-                dataClassBehaviors = baseClassDataTransform.details.classDataClassTransform;
-            }
-        }
-        if (dataClassBehaviors) {
-            (0, dataClasses_1.applyDataClassDefaultBehaviors)(classType, dataClassBehaviors);
-            (0, dataClasses_1.applyDataClassClassBehaviorOverrides)(evaluatorInterface, node.name, classType, initSubclassArgs, dataClassBehaviors);
-        }
-        // Run any deferred class completions that depend on this class.
-        runDeferredClassCompletions(classType);
-        // If there are any outstanding deferred class completions registered that
-        // were not removed by the call to runDeferredClassCompletions, assume that
-        // the current class may depend on them and register for deferred completion.
-        registerDeferredClassCompletion(node, /* dependsUpon */ undefined);
-        // Synthesize TypedDict methods.
-        if (types_1.ClassType.isTypedDictClass(classType)) {
-            (0, typedDicts_1.synthesizeTypedDictClassMethods)(evaluatorInterface, node, classType, (0, types_1.isClass)(decoratedType) && types_1.ClassType.isFinal(decoratedType));
-        }
-        // Synthesize dataclass methods.
-        if (types_1.ClassType.isDataClass(classType)) {
-            const skipSynthesizedInit = types_1.ClassType.isSkipSynthesizedDataClassInit(classType);
-            let hasExistingInitMethod = skipSynthesizedInit;
-            // See if there's already a non-synthesized __init__ method.
-            // We shouldn't override it.
-            if (!skipSynthesizedInit) {
-                const initSymbol = (0, typeUtils_1.lookUpClassMember)(classType, '__init__', 2 /* SkipBaseClasses */);
-                if (initSymbol) {
-                    hasExistingInitMethod = true;
-                }
-            }
-            let skipSynthesizeHash = false;
-            const hashSymbol = (0, typeUtils_1.lookUpClassMember)(classType, '__hash__', 2 /* SkipBaseClasses */);
-            if (hashSymbol) {
-                skipSynthesizeHash = true;
-            }
-            (0, dataClasses_1.synthesizeDataClassMethods)(evaluatorInterface, node, classType, skipSynthesizedInit, hasExistingInitMethod, skipSynthesizeHash);
-        }
-        // Build a complete list of all slots names defined by the class hierarchy.
-        // This needs to be done after dataclass processing.
-        if (classType.details.localSlotsNames) {
-            let isLimitedToSlots = true;
-            const extendedSlotsNames = Array.from(classType.details.localSlotsNames);
-            classType.details.baseClasses.forEach((baseClass) => {
-                if ((0, types_1.isInstantiableClass)(baseClass)) {
-                    if (!types_1.ClassType.isBuiltIn(baseClass, 'object') &&
-                        !types_1.ClassType.isBuiltIn(baseClass, 'type') &&
-                        !types_1.ClassType.isBuiltIn(baseClass, 'Generic')) {
-                        if (baseClass.details.inheritedSlotsNames === undefined) {
-                            isLimitedToSlots = false;
-                        }
-                        else {
-                            (0, collectionUtils_1.appendArray)(extendedSlotsNames, baseClass.details.inheritedSlotsNames);
+            else {
+                const baseClassDataTransform = classType.details.mro.find((mroClass) => {
+                    return ((0, types_1.isClass)(mroClass) &&
+                        mroClass.details.classDataClassTransform !== undefined &&
+                        !types_1.ClassType.isSameGenericClass(mroClass, classType));
+                });
+                if (baseClassDataTransform) {
+                    dataClassBehaviors = baseClassDataTransform.details.classDataClassTransform;
+                }
+            }
+            if (dataClassBehaviors) {
+                (0, dataClasses_1.applyDataClassDefaultBehaviors)(classType, dataClassBehaviors);
+                (0, dataClasses_1.applyDataClassClassBehaviorOverrides)(evaluatorInterface, node.name, classType, initSubclassArgs, dataClassBehaviors);
+            }
+            // Run any deferred class completions that depend on this class.
+            runDeferredClassCompletions(classType);
+            // If there are any outstanding deferred class completions registered that
+            // were not removed by the call to runDeferredClassCompletions, assume that
+            // the current class may depend on them and register for deferred completion.
+            registerDeferredClassCompletion(node, /* dependsUpon */ undefined);
+            // Synthesize TypedDict methods.
+            if (types_1.ClassType.isTypedDictClass(classType)) {
+                (0, typedDicts_1.synthesizeTypedDictClassMethods)(evaluatorInterface, node, classType, (0, types_1.isClass)(decoratedType) && types_1.ClassType.isFinal(decoratedType));
+            }
+            // Synthesize dataclass methods.
+            if (types_1.ClassType.isDataClass(classType)) {
+                const skipSynthesizedInit = types_1.ClassType.isSkipSynthesizedDataClassInit(classType);
+                let hasExistingInitMethod = skipSynthesizedInit;
+                // See if there's already a non-synthesized __init__ method.
+                // We shouldn't override it.
+                if (!skipSynthesizedInit) {
+                    const initSymbol = (0, typeUtils_1.lookUpClassMember)(classType, '__init__', 2 /* SkipBaseClasses */);
+                    if (initSymbol) {
+                        hasExistingInitMethod = true;
+                    }
+                }
+                let skipSynthesizeHash = false;
+                const hashSymbol = (0, typeUtils_1.lookUpClassMember)(classType, '__hash__', 2 /* SkipBaseClasses */);
+                if (hashSymbol) {
+                    skipSynthesizeHash = true;
+                }
+                (0, dataClasses_1.synthesizeDataClassMethods)(evaluatorInterface, node, classType, skipSynthesizedInit, hasExistingInitMethod, skipSynthesizeHash);
+            }
+            // Build a complete list of all slots names defined by the class hierarchy.
+            // This needs to be done after dataclass processing.
+            if (classType.details.localSlotsNames) {
+                let isLimitedToSlots = true;
+                const extendedSlotsNames = Array.from(classType.details.localSlotsNames);
+                classType.details.baseClasses.forEach((baseClass) => {
+                    if ((0, types_1.isInstantiableClass)(baseClass)) {
+                        if (!types_1.ClassType.isBuiltIn(baseClass, 'object') &&
+                            !types_1.ClassType.isBuiltIn(baseClass, 'type') &&
+                            !types_1.ClassType.isBuiltIn(baseClass, 'Generic')) {
+                            if (baseClass.details.inheritedSlotsNames === undefined) {
+                                isLimitedToSlots = false;
+                            }
+                            else {
+                                (0, collectionUtils_1.appendArray)(extendedSlotsNames, baseClass.details.inheritedSlotsNames);
+                            }
                         }
                     }
+                    else {
+                        isLimitedToSlots = false;
+                    }
+                });
+                if (isLimitedToSlots) {
+                    classType.details.inheritedSlotsNames = extendedSlotsNames;
                 }
-                else {
-                    isLimitedToSlots = false;
-                }
-            });
-            if (isLimitedToSlots) {
-                classType.details.inheritedSlotsNames = extendedSlotsNames;
             }
+            // Update the undecorated class type.
+            writeTypeCache(node.name, { type: classType }, 0 /* None */);
+            // Update the decorated class type.
+            writeTypeCache(node, { type: decoratedType }, 0 /* None */);
+            return { classType, decoratedType };
+        }
+        catch (e) {
+            if (cancellationUtils_1.OperationCanceledException.is(e)) {
+                // If the work was canceled before the class types were updated, the
+                // class type in the type cache is in an invalid, partially-constructed state.
+                e.isTypeCacheInvalid = true;
+            }
+            throw e;
         }
-        // Update the undecorated class type.
-        writeTypeCache(node.name, { type: classType }, 0 /* None */);
-        // Update the decorated class type.
-        writeTypeCache(node, { type: decoratedType }, 0 /* None */);
-        return { classType, decoratedType };
     }
     // Determines whether the type parameters has a default that refers to another
     // type parameter. If so, validates that it is in the list of "live" type
@@ -12761,6 +12861,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 setSymbolAccessed(fileInfo, symbolInScope.symbol, node);
             }
         }
+        // If this is an import into a class scope, mark the symbol as accessed.
+        const classNode = ParseTreeUtils.getEnclosingClass(node, /* stopAtFunction */ true);
+        if (classNode) {
+            const symbolInScope = lookUpSymbolRecursive(node, aliasNode.value, /* honorCodeFlow */ true);
+            if (symbolInScope) {
+                setSymbolAccessed(fileInfo, symbolInScope.symbol, node);
+            }
+        }
         let symbolType = getAliasedSymbolTypeForName(node, aliasNode.value);
         if (!symbolType) {
             const parentNode = node.parent;
@@ -14753,6 +14861,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     isIncomplete,
                     includesVariableDecl: typedDecls.some((decl) => decl.type === 1 /* Variable */),
                     includesIllegalTypeAliasDecl: !typedDecls.every((decl) => isPossibleTypeAliasDeclaration(decl)),
+                    includesSpeculativeResult: false,
                     isRecursiveDefinition: !declaredType,
                 };
                 return result;
@@ -14771,12 +14880,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
         }
         // Infer the type.
-        const typesToCombine = [];
         const decls = symbol.getDeclarations();
-        let isIncomplete = false;
-        let sawPendingEvaluation = false;
-        let includesVariableDecl = false;
-        let includesSpeculativeResult = false;
         let declIndexToConsider;
         // Limit the number of declarations to explore.
         if (decls.length > maxDeclarationsToUseForInference) {
@@ -14785,6 +14889,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 isIncomplete: false,
                 includesVariableDecl: false,
                 includesIllegalTypeAliasDecl: !decls.every((decl) => isPossibleTypeAliasDeclaration(decl)),
+                includesSpeculativeResult: false,
                 isRecursiveDefinition: false,
             };
             addToEffectiveTypeCache(result);
@@ -14811,22 +14916,26 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
             }
         }
+        // Determine which declarations to use for inference.
+        const declsToConsider = [];
         let sawExplicitTypeAlias = false;
         decls.forEach((decl, index) => {
             var _a, _b, _c;
-            let considerDecl = declIndexToConsider === undefined || index === declIndexToConsider;
+            if (declIndexToConsider !== undefined && declIndexToConsider !== index) {
+                return;
+            }
             // If we have already seen an explicit type alias, do not consider
             // additional decls. This can happen if multiple TypeAlias declarations
             // are provided -- normally an error, but it can happen in stdlib stubs
             // if the user sets the pythonPlatform to "All".
             if (sawExplicitTypeAlias) {
-                considerDecl = false;
+                return;
             }
             // If the symbol is explicitly marked as a ClassVar, consider only the
             // declarations that assign to it from within the class body, not through
             // a member access expression.
             if (symbol.isClassVar() && decl.type === 1 /* Variable */ && decl.isDefinedByMemberAccess) {
-                considerDecl = false;
+                return;
             }
             if (usageNode !== undefined) {
                 if (decl.type !== 8 /* Alias */) {
@@ -14835,122 +14944,133 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     const declScope = ParseTreeUtils.getExecutionScopeNode(decl.node);
                     if (usageScope === declScope) {
                         if (!isFlowPathBetweenNodes(decl.node, usageNode)) {
-                            considerDecl = false;
+                            return;
                         }
                     }
                 }
             }
-            if (considerDecl) {
-                const resolvedDecl = (_a = resolveAliasDeclaration(decl, /* resolveLocalNames */ true, {
-                    allowExternallyHiddenAccess: AnalyzerNodeInfo.getFileInfo(decl.node).isStubFile,
-                })) !== null && _a !== void 0 ? _a : decl;
-                const isExplicitTypeAlias = isExplicitTypeAliasDeclaration(resolvedDecl);
-                const isTypeAlias = isExplicitTypeAlias || isPossibleTypeAliasOrTypedDict(resolvedDecl);
-                if (isExplicitTypeAlias) {
-                    sawExplicitTypeAlias = true;
-                }
-                // If this is a type alias, evaluate it outside of the recursive symbol
-                // resolution check so we can evaluate the full assignment statement.
-                if (isTypeAlias &&
-                    resolvedDecl.type === 1 /* Variable */ &&
-                    ((_c = (_b = resolvedDecl.inferredTypeSource) === null || _b === void 0 ? void 0 : _b.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 3 /* Assignment */) {
-                    evaluateTypesForAssignmentStatement(resolvedDecl.inferredTypeSource.parent);
-                }
-                if (pushSymbolResolution(symbol, decl)) {
-                    try {
-                        let type = getInferredTypeOfDeclaration(symbol, decl);
-                        if (!popSymbolResolution(symbol)) {
-                            isIncomplete = true;
-                        }
-                        if (type) {
-                            if (resolvedDecl.type === 1 /* Variable */) {
-                                // Exempt typing.pyi, which uses variables to define some
-                                // special forms like Any.
-                                const fileInfo = AnalyzerNodeInfo.getFileInfo(resolvedDecl.node);
-                                if (!fileInfo.isTypingStubFile) {
-                                    includesVariableDecl = true;
-                                }
-                                let isConstant = false;
-                                if (resolvedDecl.type === 1 /* Variable */) {
-                                    if (resolvedDecl.isConstant || isFinalVariableDeclaration(resolvedDecl)) {
-                                        isConstant = true;
-                                    }
-                                }
-                                // Treat enum values declared within an enum class as though they are const even
-                                // though they may not be named as such.
-                                if ((0, types_1.isClassInstance)(type) &&
-                                    types_1.ClassType.isEnumClass(type) &&
-                                    (0, enums_1.isDeclInEnumClass)(evaluatorInterface, resolvedDecl)) {
+            const resolvedDecl = (_a = resolveAliasDeclaration(decl, /* resolveLocalNames */ true, {
+                allowExternallyHiddenAccess: AnalyzerNodeInfo.getFileInfo(decl.node).isStubFile,
+            })) !== null && _a !== void 0 ? _a : decl;
+            const isExplicitTypeAlias = isExplicitTypeAliasDeclaration(resolvedDecl);
+            const isTypeAlias = isExplicitTypeAlias || isPossibleTypeAliasOrTypedDict(resolvedDecl);
+            if (isExplicitTypeAlias) {
+                sawExplicitTypeAlias = true;
+            }
+            // If this is a type alias, evaluate it outside of the recursive symbol
+            // resolution check so we can evaluate the full assignment statement.
+            if (isTypeAlias &&
+                resolvedDecl.type === 1 /* Variable */ &&
+                ((_c = (_b = resolvedDecl.inferredTypeSource) === null || _b === void 0 ? void 0 : _b.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 3 /* Assignment */) {
+                evaluateTypesForAssignmentStatement(resolvedDecl.inferredTypeSource.parent);
+            }
+            declsToConsider.push(resolvedDecl);
+        });
+        const evaluationAttempts = ((_b = (_a = cacheEntries === null || cacheEntries === void 0 ? void 0 : cacheEntries.get(effectiveTypeCacheKey)) === null || _a === void 0 ? void 0 : _a.evaluationAttempts) !== null && _b !== void 0 ? _b : 0) + 1;
+        const result = getTypeOfSymbolForDecls(symbol, declsToConsider, evaluationAttempts);
+        // Add the result to the effective type cache if it doesn't include speculative results.
+        if (!result.includesSpeculativeResult) {
+            addToEffectiveTypeCache(result);
+        }
+        return result;
+        function addToEffectiveTypeCache(result) {
+            // Add the entry to the cache so we don't need to compute it next time.
+            if (!cacheEntries) {
+                cacheEntries = new Map();
+                effectiveTypeCache.set(symbol.id, cacheEntries);
+            }
+            cacheEntries.set(effectiveTypeCacheKey, result);
+        }
+    }
+    // Returns the type of a symbol based on a subset of its declarations.
+    function getTypeOfSymbolForDecls(symbol, decls, evaluationAttempts) {
+        const typesToCombine = [];
+        let isIncomplete = false;
+        let sawPendingEvaluation = false;
+        let includesVariableDecl = false;
+        let includesSpeculativeResult = false;
+        decls.forEach((decl) => {
+            if (pushSymbolResolution(symbol, decl)) {
+                try {
+                    let type = getInferredTypeOfDeclaration(symbol, decl);
+                    if (!popSymbolResolution(symbol)) {
+                        isIncomplete = true;
+                    }
+                    if (type) {
+                        if (decl.type === 1 /* Variable */) {
+                            // Exempt typing.pyi, which uses variables to define some
+                            // special forms like Any.
+                            const fileInfo = AnalyzerNodeInfo.getFileInfo(decl.node);
+                            if (!fileInfo.isTypingStubFile) {
+                                includesVariableDecl = true;
+                            }
+                            let isConstant = false;
+                            if (decl.type === 1 /* Variable */) {
+                                if (decl.isConstant || isFinalVariableDeclaration(decl)) {
                                     isConstant = true;
                                 }
-                                // If the symbol is constant, we can retain the literal
-                                // value. Otherwise, strip literal values to widen the type.
-                                if (types_1.TypeBase.isInstance(type) && !isExplicitTypeAlias && !isConstant) {
-                                    type = stripLiteralValue(type);
-                                }
                             }
-                            typesToCombine.push(type);
-                            if (isSpeculativeModeInUse(decl.node)) {
-                                includesSpeculativeResult = true;
+                            // Treat enum values declared within an enum class as though they are const even
+                            // though they may not be named as such.
+                            if ((0, types_1.isClassInstance)(type) &&
+                                types_1.ClassType.isEnumClass(type) &&
+                                (0, enums_1.isDeclInEnumClass)(evaluatorInterface, decl)) {
+                                isConstant = true;
+                            }
+                            // If the symbol is constant, we can retain the literal
+                            // value. Otherwise, strip literal values to widen the type.
+                            if (types_1.TypeBase.isInstance(type) && !isConstant && !isExplicitTypeAliasDeclaration(decl)) {
+                                type = stripLiteralValue(type);
                             }
                         }
-                        else {
-                            isIncomplete = true;
+                        typesToCombine.push(type);
+                        if (isSpeculativeModeInUse(decl.node)) {
+                            includesSpeculativeResult = true;
                         }
                     }
-                    catch (e) {
-                        // Clean up the stack before rethrowing.
-                        popSymbolResolution(symbol);
-                        throw e;
+                    else {
+                        isIncomplete = true;
                     }
                 }
-                else {
-                    if (resolvedDecl.type === 6 /* Class */) {
-                        const classTypeInfo = getTypeOfClass(resolvedDecl.node);
-                        if (classTypeInfo === null || classTypeInfo === void 0 ? void 0 : classTypeInfo.decoratedType) {
-                            typesToCombine.push(classTypeInfo.decoratedType);
-                        }
+                catch (e) {
+                    // Clean up the stack before rethrowing.
+                    popSymbolResolution(symbol);
+                    throw e;
+                }
+            }
+            else {
+                if (decl.type === 6 /* Class */) {
+                    const classTypeInfo = getTypeOfClass(decl.node);
+                    if (classTypeInfo === null || classTypeInfo === void 0 ? void 0 : classTypeInfo.decoratedType) {
+                        typesToCombine.push(classTypeInfo.decoratedType);
                     }
-                    isIncomplete = true;
-                    // Note that at least one decl could not be evaluated because
-                    // it was already in the process of being evaluated.
-                    sawPendingEvaluation = true;
                 }
+                isIncomplete = true;
+                // Note that at least one decl could not be evaluated because
+                // it was already in the process of being evaluated.
+                sawPendingEvaluation = true;
             }
         });
-        // How many times have we already attempted to evaluate this declaration already?
-        const evaluationAttempts = ((_b = (_a = cacheEntries === null || cacheEntries === void 0 ? void 0 : cacheEntries.get(effectiveTypeCacheKey)) === null || _a === void 0 ? void 0 : _a.evaluationAttempts) !== null && _b !== void 0 ? _b : 0) + 1;
-        let resultType;
+        let type;
         if (typesToCombine.length > 0) {
             // Ignore the pending evaluation flag if we've already attempted the
             // type evaluation many times because this probably means there's a
             // cyclical dependency that cannot be broken.
             isIncomplete = sawPendingEvaluation && evaluationAttempts < maxEffectiveTypeEvaluationAttempts;
-            resultType = (0, types_1.combineTypes)(typesToCombine);
+            type = (0, types_1.combineTypes)(typesToCombine);
         }
         else {
-            resultType = types_1.UnboundType.create();
+            type = types_1.UnboundType.create();
         }
-        const result = {
-            type: resultType,
+        return {
+            type,
             isIncomplete,
             includesVariableDecl,
             includesIllegalTypeAliasDecl: !decls.every((decl) => isPossibleTypeAliasDeclaration(decl)),
+            includesSpeculativeResult,
             isRecursiveDefinition: false,
             evaluationAttempts,
         };
-        if (!includesSpeculativeResult) {
-            addToEffectiveTypeCache(result);
-        }
-        return result;
-        function addToEffectiveTypeCache(result) {
-            // Add the entry to the cache so we don't need to compute it next time.
-            if (!cacheEntries) {
-                cacheEntries = new Map();
-                effectiveTypeCache.set(symbol.id, cacheEntries);
-            }
-            cacheEntries.set(effectiveTypeCacheKey, result);
-        }
     }
     // If a declaration has an explicit type (e.g. a variable with an annotation),
     // this function evaluates the type and returns it. If the symbol has no
@@ -15504,72 +15624,65 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         });
         return isAssignable;
     }
-    // Adjusts the source type arguments list to match the length of the
-    // dest type arguments list if the dest list contains an unbounded
-    // or variadic entry.
-    function adjustSourceTupleTypeArgs(destTypeArgs, srcTypeArgs) {
-        const destVariadicIndex = destTypeArgs.findIndex((t) => (0, types_1.isVariadicTypeVar)(t.type));
-        const destUnboundedIndex = destTypeArgs.findIndex((t) => t.isUnbounded);
+    // Adjusts the source and/or dest type arguments list to attempt to match
+    // the length of the src type arguments list if the dest or source contain
+    // entries with indeterminate length or variadic entries. It returns true
+    // if the source is potentially compatible with the dest type, false otherwise.
+    function adjustSrcTupleTypeArgs(destTypeArgs, srcTypeArgs) {
+        const destUnboundedIndex = destTypeArgs.findIndex((t) => t.isUnbounded || (0, types_1.isVariadicTypeVar)(t.type));
         const srcUnboundedIndex = srcTypeArgs.findIndex((t) => t.isUnbounded);
-        // If the source is unbounded, expand the unbounded argument to try
-        // to make the source and dest arg counts match.
+        // If the src contains an unbounded type but the dest does not, it's incompatible.
+        if (srcUnboundedIndex >= 0 && destUnboundedIndex < 0) {
+            return false;
+        }
         if (srcUnboundedIndex >= 0) {
+            // The source is unbounded, so expand the unbounded argument to try
+            // to make the source and dest arg counts match.
             const typeToReplicate = srcTypeArgs.length > 0 ? srcTypeArgs[srcUnboundedIndex].type : types_1.AnyType.create();
             while (srcTypeArgs.length < destTypeArgs.length) {
                 srcTypeArgs.splice(srcUnboundedIndex, 0, { type: typeToReplicate, isUnbounded: true });
             }
         }
-        // If the dest is unbounded or contains a variadic, determine which
-        // source args map to the unbounded or variadic arg.
-        if (destUnboundedIndex >= 0 || destVariadicIndex >= 0) {
-            // If there's a variadic within the destination, package up the corresponding
-            // source arguments into a tuple.
-            const srcArgsToCapture = srcTypeArgs.length - destTypeArgs.length + 1;
-            if (srcArgsToCapture >= 0) {
-                if (destVariadicIndex >= 0) {
-                    if (tupleClassType && (0, types_1.isInstantiableClass)(tupleClassType)) {
-                        const removedArgs = srcTypeArgs.splice(destVariadicIndex, srcArgsToCapture);
-                        // Package up the remaining type arguments into a tuple object.
-                        const variadicTuple = (0, typeUtils_1.convertToInstance)((0, typeUtils_1.specializeTupleClass)(tupleClassType, removedArgs.map((typeArg) => {
-                            return { type: typeArg.type, isUnbounded: typeArg.isUnbounded };
-                        }), 
-                        /* isTypeArgumentExplicit */ true, 
-                        /* isUnpackedTuple */ true));
-                        srcTypeArgs.splice(destVariadicIndex, 0, {
-                            type: variadicTuple,
-                            isUnbounded: false,
-                        });
-                    }
-                }
-                else {
-                    const removedArgTypes = srcTypeArgs.splice(destUnboundedIndex, srcArgsToCapture).map((t) => {
-                        if ((0, types_1.isTypeVar)(t.type) && (0, types_1.isUnpackedVariadicTypeVar)(t.type) && !t.type.isVariadicInUnion) {
-                            return types_1.TypeVarType.cloneForUnpacked(t.type, /* isInUnion */ true);
-                        }
-                        return t.type;
-                    });
+        const srcArgsToCapture = srcTypeArgs.length - destTypeArgs.length + 1;
+        if (destUnboundedIndex >= 0 && srcArgsToCapture >= 0) {
+            // If the dest contains a variadic element, determine which source
+            // args map to this element and package them up into an unpacked tuple.
+            if ((0, types_1.isVariadicTypeVar)(destTypeArgs[destUnboundedIndex].type)) {
+                if (tupleClassType && (0, types_1.isInstantiableClass)(tupleClassType)) {
+                    const removedArgs = srcTypeArgs.splice(destUnboundedIndex, srcArgsToCapture);
+                    // Package up the remaining type arguments into a tuple object.
+                    const variadicTuple = (0, typeUtils_1.convertToInstance)((0, typeUtils_1.specializeTupleClass)(tupleClassType, removedArgs.map((typeArg) => {
+                        return { type: typeArg.type, isUnbounded: typeArg.isUnbounded };
+                    }), 
+                    /* isTypeArgumentExplicit */ true, 
+                    /* isUnpackedTuple */ true));
                     srcTypeArgs.splice(destUnboundedIndex, 0, {
-                        type: removedArgTypes.length > 0 ? (0, types_1.combineTypes)(removedArgTypes) : types_1.AnyType.create(),
+                        type: variadicTuple,
                         isUnbounded: false,
                     });
                 }
             }
+            else {
+                const removedArgTypes = srcTypeArgs.splice(destUnboundedIndex, srcArgsToCapture).map((t) => {
+                    if ((0, types_1.isTypeVar)(t.type) && (0, types_1.isUnpackedVariadicTypeVar)(t.type) && !t.type.isVariadicInUnion) {
+                        return types_1.TypeVarType.cloneForUnpacked(t.type, /* isInUnion */ true);
+                    }
+                    return t.type;
+                });
+                srcTypeArgs.splice(destUnboundedIndex, 0, {
+                    type: removedArgTypes.length > 0 ? (0, types_1.combineTypes)(removedArgTypes) : types_1.AnyType.create(),
+                    isUnbounded: false,
+                });
+            }
         }
+        return destTypeArgs.length === srcTypeArgs.length;
     }
     function assignTupleTypeArguments(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
         var _a, _b;
         const destTypeArgs = [...((_a = destType.tupleTypeArguments) !== null && _a !== void 0 ? _a : [])];
         const srcTypeArgs = [...((_b = srcType.tupleTypeArguments) !== null && _b !== void 0 ? _b : [])];
-        let srcUnboundedIndex;
-        if (flags & 2 /* ReverseTypeVarMatching */) {
-            adjustSourceTupleTypeArgs(srcTypeArgs, destTypeArgs);
-            srcUnboundedIndex = destTypeArgs.findIndex((t) => t.isUnbounded);
-        }
-        else {
-            adjustSourceTupleTypeArgs(destTypeArgs, srcTypeArgs);
-            srcUnboundedIndex = srcTypeArgs.findIndex((t) => t.isUnbounded);
-        }
-        if (srcTypeArgs.length === destTypeArgs.length) {
+        const reverseMapping = (flags & 2 /* ReverseTypeVarMatching */) !== 0;
+        if (adjustSrcTupleTypeArgs(reverseMapping ? srcTypeArgs : destTypeArgs, reverseMapping ? destTypeArgs : srcTypeArgs)) {
             for (let argIndex = 0; argIndex < srcTypeArgs.length; argIndex++) {
                 const entryDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
                 if (!assignType(destTypeArgs[argIndex].type, srcTypeArgs[argIndex].type, entryDiag === null || entryDiag === void 0 ? void 0 : entryDiag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
@@ -15583,13 +15696,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
         }
         else {
-            if (srcUnboundedIndex < 0) {
+            if (srcTypeArgs.find((t) => t.isUnbounded)) {
+                diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.tupleSizeIndeterminate().format({
+                    expected: destTypeArgs.length,
+                }));
+            }
+            else {
                 diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.tupleSizeMismatch().format({
                     expected: destTypeArgs.length,
                     received: srcTypeArgs.length,
                 }));
-                return false;
             }
+            return false;
         }
         return true;
     }
@@ -15720,6 +15838,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             const variance = destTypeParam ? types_1.TypeVarType.getVariance(destTypeParam) : 3 /* Covariant */;
             let effectiveFlags;
             let errorSource;
+            let includeDiagAddendum = true;
             if (variance === 3 /* Covariant */) {
                 effectiveFlags = flags | 128 /* RetainLiteralsForTypeVar */;
                 errorSource = localize_1.Localizer.DiagnosticAddendum.typeVarIsCovariant;
@@ -15732,6 +15851,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             else {
                 effectiveFlags = flags | 1 /* EnforceInvariance */ | 128 /* RetainLiteralsForTypeVar */;
                 errorSource = localize_1.Localizer.DiagnosticAddendum.typeVarIsInvariant;
+                // Omit the diagnostic addendum for the invariant case because it's obvious
+                // why two types are not the same.
+                includeDiagAddendum = false;
             }
             if (!assignType(variance === 4 /* Contravariant */ ? srcTypeArg : destTypeArg, variance === 4 /* Contravariant */ ? destTypeArg : srcTypeArg, assignmentDiag, variance === 4 /* Contravariant */ ? srcTypeVarContext : destTypeVarContext, variance === 4 /* Contravariant */ ? destTypeVarContext : srcTypeVarContext, effectiveFlags, recursionCount)) {
                 // Don't report errors with type variables in "pseudo-random"
@@ -15744,6 +15866,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                                 name: types_1.TypeVarType.getReadableName(destTypeParam),
                                 ...printSrcDestTypes(srcTypeArg, destTypeArg),
                             }));
+                            if (includeDiagAddendum) {
+                                childDiag.addAddendum(assignmentDiag);
+                            }
                         }
                         else {
                             diag.addAddendum(assignmentDiag);
@@ -15841,7 +15966,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if ((0, types_1.isTypeVar)(destType)) {
             if ((0, typeUtils_1.isTypeVarSame)(destType, srcType)) {
                 if (destType.scopeId && (destTypeVarContext === null || destTypeVarContext === void 0 ? void 0 : destTypeVarContext.hasSolveForScope(destType.scopeId))) {
-                    return (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, destType, srcType, diag, destTypeVarContext, flags, recursionCount);
+                    // If the dest TypeVar has no current value bound to it, bind itself.
+                    if (!destTypeVarContext.getPrimarySignature().getTypeVar(destType)) {
+                        return (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, destType, srcType, diag, destTypeVarContext, flags, recursionCount);
+                    }
                 }
                 return true;
             }
@@ -15942,6 +16070,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     destType.details.parameters.length <= 2) {
                     return true;
                 }
+                // If the source is an unpacked TypeVarTuple and the dest is a
+                // *tuple[Any, ...], we'll treat it as compatible.
+                if ((0, types_1.isUnpackedVariadicTypeVar)(srcType) &&
+                    (0, types_1.isClassInstance)(destType) &&
+                    (0, types_1.isUnpackedClass)(destType) &&
+                    destType.tupleTypeArguments &&
+                    destType.tupleTypeArguments.length === 1 &&
+                    destType.tupleTypeArguments[0].isUnbounded &&
+                    (0, types_1.isAnyOrUnknown)(destType.tupleTypeArguments[0].type)) {
+                    return true;
+                }
                 if (!(0, types_1.isUnion)(destType)) {
                     diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.typeAssignmentMismatch().format(printSrcDestTypes(srcType, destType)));
                     return false;
@@ -16965,7 +17104,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                 }
             }
-            else {
+            else if (!srcParamDetails.paramSpec) {
                 diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.functionTooManyParams().format({
                     expected: srcPositionalCount,
                     received: destPositionalCount,
@@ -17672,8 +17811,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     if (!targetParamType) {
                         targetParamType = overrideParamDetails.params[overrideParamDetails.kwargsIndex].type;
                     }
-                    if (!assignType(targetParamType, paramInfo.type, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(overrideMethod)), 
-                    /* srcTypeVarContext */ undefined, 8 /* SkipSolveTypeVars */)) {
+                    if (!assignType(targetParamType, paramInfo.type, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(overrideMethod)), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(baseMethod)), 8 /* SkipSolveTypeVars */)) {
                         diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamKeywordType().format({
                             name: (_b = paramInfo.param.name) !== null && _b !== void 0 ? _b : '?',
                             baseType: printType(paramInfo.type),
@@ -17731,8 +17869,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // Now check the return type.
         const baseReturnType = getFunctionEffectiveReturnType(baseMethod);
         const overrideReturnType = getFunctionEffectiveReturnType(overrideMethod);
-        if (!assignType(baseReturnType, overrideReturnType, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(baseMethod)), 
-        /* srcTypeVarContext */ undefined, 8 /* SkipSolveTypeVars */)) {
+        if (!assignType(baseReturnType, overrideReturnType, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(baseMethod)), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(overrideMethod)), 8 /* SkipSolveTypeVars */)) {
             diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideReturnType().format({
                 baseType: printType(baseReturnType),
                 overrideType: printType(overrideReturnType),