@zzzen/pyright-internal 1.2.0-dev.20240609 → 1.2.0-dev.20240616

package/dist/analyzer/typeEvaluator.js

@@ -466,7 +466,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             functionClass = getBuiltInType(node, 'function');
             unionTypeClass = getTypesType(node, 'UnionType');
             if (unionTypeClass && (0, types_1.isClass)(unionTypeClass)) {
-                unionTypeClass.details.flags |= -2147483648 /* ClassTypeFlags.SpecialFormClass */;
+                unionTypeClass.details.flags |= 8388608 /* ClassTypeFlags.SpecialFormClass */;
             }
             // Initialize and cache "Collection" to break a cyclical dependency
             // that occurs when resolving tuple below.
@@ -487,7 +487,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             // Wire up the `Any` class to the special-form version of our internal AnyType.
             if (objectClass && (0, types_1.isInstantiableClass)(objectClass) && typeClass && (0, types_1.isInstantiableClass)(typeClass)) {
-                const anyClass = types_1.ClassType.createInstantiable('Any', 'typing.Any', 'typing', uri_1.Uri.empty(), 1 /* ClassTypeFlags.BuiltInClass */ | -2147483648 /* ClassTypeFlags.SpecialFormClass */, 
+                const anyClass = types_1.ClassType.createInstantiable('Any', 'typing.Any', 'typing', uri_1.Uri.empty(), 1 /* ClassTypeFlags.BuiltInClass */ | 8388608 /* ClassTypeFlags.SpecialFormClass */, 
                 /* typeSourceId */ -1, 
                 /* declaredMetaclass */ undefined, 
                 /* effectiveMetaclass */ typeClass);
@@ -740,6 +740,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (expectingInstantiable) {
             validateTypeIsInstantiable(typeResult, flags, node);
         }
+        // If this is a PEP 695 type alias, remove the special form so the type
+        // printer prints it as its aliased type rather than TypeAliasType.
+        if ((flags & 256 /* EvaluatorFlags.ExpectingTypeAnnotation */) !== 0) {
+            if (typeResult.type.specialForm && types_1.ClassType.isBuiltIn(typeResult.type.specialForm, 'TypeAliasType')) {
+                typeResult.type = types_1.TypeBase.cloneAsSpecialForm(typeResult.type, undefined);
+            }
+        }
         return typeResult;
     }
     // Reports the case where a function or class has been decorated with
@@ -1460,7 +1467,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         // If this is a type[Any] or type[Unknown], allow any other members.
         if ((0, types_1.isClassInstance)(objectType) && types_1.ClassType.isBuiltIn(objectType, 'type') && objectType.includeSubclasses) {
-            if ((flags & 8 /* MemberAccessFlags.SkipTypeBaseClass */) === 0) {
+            if ((flags & (8 /* MemberAccessFlags.SkipTypeBaseClass */ | 512 /* MemberAccessFlags.SkipAttributeAccessOverride */)) === 0) {
                 const typeArg = objectType.typeArguments && objectType.typeArguments.length >= 1
                     ? objectType.typeArguments[0]
                     : types_1.UnknownType.create();
@@ -4049,7 +4056,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 isDescriptorError = true;
             }
             if ((0, types_1.isInstantiableClass)(memberInfo.classType) &&
-                types_1.ClassType.isFrozenDataClass(memberInfo.classType) &&
+                types_1.ClassType.isDataClassFrozen(memberInfo.classType) &&
                 isAccessedThroughObject) {
                 diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.dataClassFrozen().format({
                     name: printType(types_1.ClassType.cloneAsInstance(memberInfo.classType)),
@@ -5647,7 +5654,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // the base type of this call is not the same as one of the tracked signatures.
         // This is important for nested generic calls (e.g. "foo(foo(x))").
         if (signatureTracker) {
-            baseTypeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(baseTypeResult.type, signatureTracker, node.leftExpression.start);
+            baseTypeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(baseTypeResult.type, signatureTracker, node.start);
         }
         if (!(0, typeUtils_1.isTypeAliasPlaceholder)(baseTypeResult.type)) {
             if (node.leftExpression.nodeType === 38 /* ParseNodeType.Name */ && node.leftExpression.value === 'super') {
@@ -6964,6 +6971,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if ((0, types_1.isTypeVar)(unexpandedCallType)) {
             returnType = (0, typeUtils_1.convertToInstance)(unexpandedCallType);
         }
+        // If we instantiated the "deprecated" class, attach the deprecation
+        // message to the instance.
+        if (errorNode.nodeType === 9 /* ParseNodeType.Call */ &&
+            returnType &&
+            (0, types_1.isClassInstance)(returnType) &&
+            types_1.ClassType.isBuiltIn(returnType, 'deprecated')) {
+            returnType = types_1.ClassType.cloneForDeprecatedInstance(returnType, (0, decorators_1.getDeprecatedMessageFromCall)(errorNode));
+        }
         // If we instantiated a type, transform it into a class.
         // This can happen if someone directly instantiates a metaclass
         // deriving from type.
@@ -8026,36 +8041,25 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }), errorNode.nodeType === 9 /* ParseNodeType.Call */ ? errorNode.leftExpression : errorNode);
             }
         }
-        if (type.boundTypeVarScopeId) {
-            // If the function was bound to a class or object and was a constructor, a
-            // static method or a class method, it's possible that some of that class's
-            // type variables have not yet been solved. Add that class's TypeVar scope ID.
-            if (type.preBoundFlags !== undefined && type.boundToType && (0, typeUtils_1.requiresSpecialization)(type.boundToType)) {
-                if (type.preBoundFlags &
-                    (4 /* FunctionTypeFlags.StaticMethod */ | 2 /* FunctionTypeFlags.ClassMethod */ | 4 /* FunctionTypeFlags.StaticMethod */)) {
-                    typeVarContext.addSolveForScope(type.boundTypeVarScopeId);
-                }
-            }
-            // The type annotation for the "self" parameter in an __init__ method to
-            // can influence the type being constructed.
-            if (type.details.name === '__init__' &&
-                type.strippedFirstParamType &&
-                type.boundToType &&
-                (0, types_1.isClassInstance)(type.strippedFirstParamType) &&
-                (0, types_1.isClassInstance)(type.boundToType) &&
-                types_1.ClassType.isSameGenericClass(type.strippedFirstParamType, type.boundToType) &&
-                type.strippedFirstParamType.typeArguments) {
-                const typeParams = type.strippedFirstParamType.details.typeParameters;
-                specializedInitSelfType = type.strippedFirstParamType;
-                type.strippedFirstParamType.typeArguments.forEach((typeArg, index) => {
-                    if (index < typeParams.length) {
-                        const typeParam = typeParams[index];
-                        if (!(0, types_1.isTypeSame)(typeParam, typeArg, { ignorePseudoGeneric: true })) {
-                            typeVarContext.setTypeVarType(typeParams[index], typeArg);
-                        }
+        // The type annotation for the "self" parameter in an __init__ method to
+        // can influence the type being constructed.
+        if (type.details.name === '__init__' &&
+            type.strippedFirstParamType &&
+            type.boundToType &&
+            (0, types_1.isClassInstance)(type.strippedFirstParamType) &&
+            (0, types_1.isClassInstance)(type.boundToType) &&
+            types_1.ClassType.isSameGenericClass(type.strippedFirstParamType, type.boundToType) &&
+            type.strippedFirstParamType.typeArguments) {
+            const typeParams = type.strippedFirstParamType.details.typeParameters;
+            specializedInitSelfType = type.strippedFirstParamType;
+            type.strippedFirstParamType.typeArguments.forEach((typeArg, index) => {
+                if (index < typeParams.length) {
+                    const typeParam = typeParams[index];
+                    if (!(0, types_1.isTypeSame)(typeParam, typeArg, { ignorePseudoGeneric: true })) {
+                        typeVarContext.setTypeVarType(typeParams[index], typeArg);
                     }
-                });
-            }
+                }
+            });
         }
         // Special-case a few built-in calls that are often used for
         // casting or checking for unknown types.
@@ -9191,7 +9195,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.newTypeLiteral(), argList[1].node || errorNode);
         }
         let classFlags = baseClass.details.flags & ~(1 /* ClassTypeFlags.BuiltInClass */ | 2 /* ClassTypeFlags.SpecialBuiltIn */);
-        classFlags |= 8192 /* ClassTypeFlags.Final */ | 536870912 /* ClassTypeFlags.NewTypeClass */ | 1073741824 /* ClassTypeFlags.ValidTypeAliasClass */;
+        classFlags |= 256 /* ClassTypeFlags.Final */ | 2097152 /* ClassTypeFlags.NewTypeClass */ | 4194304 /* ClassTypeFlags.ValidTypeAliasClass */;
         const classType = types_1.ClassType.createInstantiable(className, ParseTreeUtils.getClassFullName(errorNode, fileInfo.moduleName, className), fileInfo.moduleName, fileInfo.fileUri, classFlags, ParseTreeUtils.getTypeSourceId(errorNode), 
         /* declaredMetaclass */ undefined, baseClass.details.effectiveMetaclass);
         classType.details.baseClasses.push(isBaseClassAny ? types_1.AnyType.create() : baseClass);
@@ -9223,7 +9227,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             });
             types_1.FunctionType.addDefaultParameters(newType);
             newType.details.declaredReturnType = types_1.ClassType.cloneAsInstance(classType);
-            newType.details.constructorTypeVarScopeId = classType.details.typeVarScopeId;
+            newType.details.constructorTypeVarScopeId = (0, typeUtils_1.getTypeVarScopeId)(classType);
             types_1.ClassType.getSymbolTable(classType).set('__new__', symbol_1.Symbol.createWithType(4 /* SymbolFlags.ClassMember */, newType));
         }
         return classType;
@@ -9245,7 +9249,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (!(0, types_1.isClassInstance)(arg1Type) || !(0, typeUtils_1.isTupleClass)(arg1Type) || arg1Type.tupleTypeArguments === undefined) {
             return undefined;
         }
-        const classType = types_1.ClassType.createInstantiable(className, ParseTreeUtils.getClassFullName(errorNode, fileInfo.moduleName, className), fileInfo.moduleName, fileInfo.fileUri, 1073741824 /* ClassTypeFlags.ValidTypeAliasClass */, ParseTreeUtils.getTypeSourceId(errorNode), metaclass, arg1Type.details.effectiveMetaclass);
+        const classType = types_1.ClassType.createInstantiable(className, ParseTreeUtils.getClassFullName(errorNode, fileInfo.moduleName, className), fileInfo.moduleName, fileInfo.fileUri, 4194304 /* ClassTypeFlags.ValidTypeAliasClass */, ParseTreeUtils.getTypeSourceId(errorNode), metaclass, arg1Type.details.effectiveMetaclass);
         arg1Type.tupleTypeArguments.forEach((typeArg) => {
             const specializedType = makeTopLevelTypeVarsConcrete(typeArg.type);
             if ((0, typeUtils_1.isEffectivelyInstantiable)(specializedType)) {
@@ -10058,128 +10062,134 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         let functionType = types_1.FunctionType.createInstance('', '', '', 131072 /* FunctionTypeFlags.PartiallyEvaluated */);
         functionType.details.typeVarScopeId = ParseTreeUtils.getScopeIdForNode(node);
-        // Pre-cache the incomplete function type in case the evaluation of the
-        // lambda depends on itself.
-        writeTypeCache(node, { type: functionType, isIncomplete: true }, 0 /* EvaluatorFlags.None */);
-        // We assume for simplicity that the parameter signature of the lambda is
-        // the same as the expected type. If this isn't the case, we'll use
-        // object for any lambda parameters that don't match. We could make this
-        // more sophisticated in the future, but it becomes very complex to handle
-        // all of the permutations.
-        let sawParamMismatch = false;
-        node.parameters.forEach((param, index) => {
-            let paramType;
-            if (expectedParamDetails && !sawParamMismatch) {
-                if (index < expectedParamDetails.params.length) {
-                    const expectedParam = expectedParamDetails.params[index];
-                    // If the parameter category matches and both of the parameters are
-                    // either separators (/ or *) or not separators, copy the type
-                    // from the expected parameter.
-                    if (expectedParam.param.category === param.category && !param.name === !expectedParam.param.name) {
-                        paramType = expectedParam.type;
+        return (0, cancellationUtils_1.invalidateTypeCacheIfCanceled)(() => {
+            // Pre-cache the incomplete function type in case the evaluation of the
+            // lambda depends on itself.
+            writeTypeCache(node, { type: functionType, isIncomplete: true }, 0 /* EvaluatorFlags.None */);
+            // We assume for simplicity that the parameter signature of the lambda is
+            // the same as the expected type. If this isn't the case, we'll use
+            // object for any lambda parameters that don't match. We could make this
+            // more sophisticated in the future, but it becomes very complex to handle
+            // all of the permutations.
+            let sawParamMismatch = false;
+            node.parameters.forEach((param, index) => {
+                let paramType;
+                if (expectedParamDetails && !sawParamMismatch) {
+                    if (index < expectedParamDetails.params.length) {
+                        const expectedParam = expectedParamDetails.params[index];
+                        // If the parameter category matches and both of the parameters are
+                        // either separators (/ or *) or not separators, copy the type
+                        // from the expected parameter.
+                        if (expectedParam.param.category === param.category &&
+                            !param.name === !expectedParam.param.name) {
+                            paramType = expectedParam.type;
+                        }
+                        else {
+                            sawParamMismatch = true;
+                        }
                     }
-                    else {
-                        sawParamMismatch = true;
+                    else if (param.defaultValue) {
+                        // If the lambda param has a default value but there is no associated
+                        // parameter in the expected type, assume that the default value is
+                        // being used to explicitly capture a value from an outer scope. Infer
+                        // its type from the default value expression.
+                        paramType = getTypeOfExpression(param.defaultValue, undefined, inferenceContext).type;
                     }
                 }
                 else if (param.defaultValue) {
-                    // If the lambda param has a default value but there is no associated
-                    // parameter in the expected type, assume that the default value is
-                    // being used to explicitly capture a value from an outer scope. Infer
-                    // its type from the default value expression.
-                    paramType = getTypeOfExpression(param.defaultValue, undefined, inferenceContext).type;
-                }
-            }
-            else if (param.defaultValue) {
-                // If there is no inference context but we have a default value,
-                // use the default value to infer the parameter's type.
-                paramType = inferParameterTypeFromDefaultValue(param.defaultValue);
-            }
-            if (param.name) {
-                writeTypeCache(param.name, { type: transformVariadicParamType(node, param.category, paramType !== null && paramType !== void 0 ? paramType : types_1.UnknownType.create()) }, 0 /* EvaluatorFlags.None */);
-            }
-            if (param.defaultValue) {
-                // Evaluate the default value if it's present.
-                getTypeOfExpression(param.defaultValue, 1 /* EvaluatorFlags.ConvertEllipsisToAny */);
-            }
-            // Determine whether we need to insert an implied position-only parameter.
-            // This is needed when a function's parameters are named using the old-style
-            // way of specifying position-only parameters.
-            if (index >= 0) {
-                let isImplicitPositionOnlyParam = false;
-                if (param.category === 0 /* ParameterCategory.Simple */ && param.name) {
-                    if ((0, symbolNameUtils_1.isPrivateName)(param.name.value)) {
-                        isImplicitPositionOnlyParam = true;
+                    // If there is no inference context but we have a default value,
+                    // use the default value to infer the parameter's type.
+                    paramType = inferParameterTypeFromDefaultValue(param.defaultValue);
+                }
+                if (param.name) {
+                    writeTypeCache(param.name, { type: transformVariadicParamType(node, param.category, paramType !== null && paramType !== void 0 ? paramType : types_1.UnknownType.create()) }, 0 /* EvaluatorFlags.None */);
+                }
+                if (param.defaultValue) {
+                    // Evaluate the default value if it's present.
+                    getTypeOfExpression(param.defaultValue, 1 /* EvaluatorFlags.ConvertEllipsisToAny */);
+                }
+                // Determine whether we need to insert an implied position-only parameter.
+                // This is needed when a function's parameters are named using the old-style
+                // way of specifying position-only parameters.
+                if (index >= 0) {
+                    let isImplicitPositionOnlyParam = false;
+                    if (param.category === 0 /* ParameterCategory.Simple */ && param.name) {
+                        if ((0, symbolNameUtils_1.isPrivateName)(param.name.value)) {
+                            isImplicitPositionOnlyParam = true;
+                        }
+                    }
+                    else {
+                        paramsArePositionOnly = false;
+                    }
+                    if (paramsArePositionOnly &&
+                        !isImplicitPositionOnlyParam &&
+                        functionType.details.parameters.length > 0) {
+                        types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
+                    }
+                    if (!isImplicitPositionOnlyParam) {
+                        paramsArePositionOnly = false;
                     }
                 }
-                else {
-                    paramsArePositionOnly = false;
-                }
-                if (paramsArePositionOnly &&
-                    !isImplicitPositionOnlyParam &&
-                    functionType.details.parameters.length > 0) {
-                    types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
+                const functionParam = {
+                    category: param.category,
+                    name: param.name ? param.name.value : undefined,
+                    hasDefault: !!param.defaultValue,
+                    defaultValueExpression: param.defaultValue,
+                    hasDeclaredType: true,
+                    type: paramType !== null && paramType !== void 0 ? paramType : types_1.UnknownType.create(),
+                };
+                types_1.FunctionType.addParameter(functionType, functionParam);
+            });
+            if (paramsArePositionOnly && functionType.details.parameters.length > 0) {
+                types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
+            }
+            let typeErrors = false;
+            // If we're speculatively evaluating the lambda, create another speculative
+            // evaluation scope for the return expression and do not allow retention
+            // of the cached types.
+            // We need to set allowCacheRetention to false because we don't want to
+            // cache the type of the lambda return expression because it depends on
+            // the parameter types that we set above, and the speculative type cache
+            // doesn't know about that context.
+            useSpeculativeMode(forceSpeculative || isSpeculativeModeInUse(node) || (inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.isTypeIncomplete)
+                ? node.expression
+                : undefined, () => {
+                const returnTypeResult = getTypeOfExpression(node.expression, 
+                /* flags */ undefined, (0, typeUtils_1.makeInferenceContext)(expectedReturnType));
+                functionType.inferredReturnType = returnTypeResult.type;
+                if (returnTypeResult.isIncomplete) {
+                    isIncomplete = true;
                 }
-                if (!isImplicitPositionOnlyParam) {
-                    paramsArePositionOnly = false;
+                if (returnTypeResult.typeErrors) {
+                    typeErrors = true;
                 }
-            }
-            const functionParam = {
-                category: param.category,
-                name: param.name ? param.name.value : undefined,
-                hasDefault: !!param.defaultValue,
-                defaultValueExpression: param.defaultValue,
-                hasDeclaredType: true,
-                type: paramType !== null && paramType !== void 0 ? paramType : types_1.UnknownType.create(),
-            };
-            types_1.FunctionType.addParameter(functionType, functionParam);
-        });
-        if (paramsArePositionOnly && functionType.details.parameters.length > 0) {
-            types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
-        }
-        let typeErrors = false;
-        // If we're speculatively evaluating the lambda, create another speculative
-        // evaluation scope for the return expression and do not allow retention
-        // of the cached types.
-        // We need to set allowCacheRetention to false because we don't want to
-        // cache the type of the lambda return expression because it depends on
-        // the parameter types that we set above, and the speculative type cache
-        // doesn't know about that context.
-        useSpeculativeMode(forceSpeculative || isSpeculativeModeInUse(node) || (inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.isTypeIncomplete)
-            ? node.expression
-            : undefined, () => {
-            const returnTypeResult = getTypeOfExpression(node.expression, 
-            /* flags */ undefined, (0, typeUtils_1.makeInferenceContext)(expectedReturnType));
-            functionType.inferredReturnType = returnTypeResult.type;
-            if (returnTypeResult.isIncomplete) {
-                isIncomplete = true;
-            }
-            if (returnTypeResult.typeErrors) {
-                typeErrors = true;
-            }
-            else if (expectedReturnType) {
-                // If the expectedReturnType is generic, see if the actual return type
-                // provides types for some or all type variables.
-                if ((0, typeUtils_1.requiresSpecialization)(expectedReturnType)) {
-                    const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(functionType));
-                    if (assignType(expectedReturnType, returnTypeResult.type, /* diag */ undefined, typeVarContext)) {
-                        functionType = (0, typeUtils_1.applySolvedTypeVars)(functionType, typeVarContext, {
-                            applyInScopePlaceholders: true,
-                        });
+                else if (expectedReturnType) {
+                    // If the expectedReturnType is generic, see if the actual return type
+                    // provides types for some or all type variables.
+                    if ((0, typeUtils_1.requiresSpecialization)(expectedReturnType)) {
+                        const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(functionType));
+                        if (assignType(expectedReturnType, returnTypeResult.type, 
+                        /* diag */ undefined, typeVarContext)) {
+                            functionType = (0, typeUtils_1.applySolvedTypeVars)(functionType, typeVarContext, {
+                                applyInScopePlaceholders: true,
+                            });
+                        }
                     }
                 }
+            }, {
+                dependentType: inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.expectedType,
+                allowDiagnostics: !forceSpeculative &&
+                    !isDiagnosticSuppressedForNode(node) &&
+                    !(inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.isTypeIncomplete),
+            });
+            // Mark the function type as no longer being evaluated.
+            functionType.details.flags &= ~131072 /* FunctionTypeFlags.PartiallyEvaluated */;
+            // Is the resulting function compatible with the expected type?
+            if (expectedType && !assignType(expectedType, functionType)) {
+                typeErrors = true;
             }
-        }, {
-            dependentType: inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.expectedType,
-            allowDiagnostics: !forceSpeculative && !isDiagnosticSuppressedForNode(node) && !(inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.isTypeIncomplete),
+            return { type: functionType, isIncomplete, typeErrors };
         });
-        // Mark the function type as no longer being evaluated.
-        functionType.details.flags &= ~131072 /* FunctionTypeFlags.PartiallyEvaluated */;
-        // Is the resulting function compatible with the expected type?
-        if (expectedType && !assignType(expectedType, functionType)) {
-            typeErrors = true;
-        }
-        return { type: functionType, isIncomplete, typeErrors };
     }
     function getTypeOfComprehension(node, flags, inferenceContext) {
         let isIncomplete = false;
@@ -11256,7 +11266,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         /* declaredMetaclass */ undefined, 
         /* effectiveMetaclass */ undefined);
         if (aliasMapEntry.isSpecialForm) {
-            specialClassType.details.flags |= -2147483648 /* ClassTypeFlags.SpecialFormClass */;
+            specialClassType.details.flags |= 8388608 /* ClassTypeFlags.SpecialFormClass */;
         }
         // Synthesize a single type parameter with the specified variance if
         // specified in the alias map entry.
@@ -11269,7 +11279,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         const specialBuiltInClassDeclaration = ((_a = AnalyzerNodeInfo.getDeclaration(node)) !== null && _a !== void 0 ? _a : (node.parent ? AnalyzerNodeInfo.getDeclaration(node.parent) : undefined));
         specialClassType.details.declaration = specialBuiltInClassDeclaration;
         if (fileInfo.isTypingExtensionsStubFile) {
-            specialClassType.details.flags |= 131072 /* ClassTypeFlags.TypingExtensionClass */;
+            specialClassType.details.flags |= 4096 /* ClassTypeFlags.TypingExtensionClass */;
         }
         const baseClassName = aliasMapEntry.alias || 'object';
         let baseClass;
@@ -11289,7 +11299,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // cause the TypedDict to be marked as abstract.
                 if ((0, types_1.isInstantiableClass)(baseClass) && types_1.ClassType.isBuiltIn(baseClass, '_TypedDict')) {
                     baseClass = types_1.ClassType.cloneWithNewFlags(baseClass, baseClass.details.flags &
-                        ~(2048 /* ClassTypeFlags.SupportsAbstractMethods */ | 268435456 /* ClassTypeFlags.TypeCheckOnly */));
+                        ~(64 /* ClassTypeFlags.SupportsAbstractMethods */ | 1048576 /* ClassTypeFlags.TypeCheckOnly */));
                 }
             }
         }
@@ -11664,17 +11674,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             fileInfo.isTypeshedStubFile) {
             classFlags |= 1 /* ClassTypeFlags.BuiltInClass */;
             if (fileInfo.isTypingExtensionsStubFile) {
-                classFlags |= 131072 /* ClassTypeFlags.TypingExtensionClass */;
+                classFlags |= 4096 /* ClassTypeFlags.TypingExtensionClass */;
             }
             if (node.name.value === 'property') {
-                classFlags |= 4096 /* ClassTypeFlags.PropertyClass */;
+                classFlags |= 128 /* ClassTypeFlags.PropertyClass */;
             }
             if (node.name.value === 'tuple') {
-                classFlags |= 1048576 /* ClassTypeFlags.TupleClass */;
+                classFlags |= 32768 /* ClassTypeFlags.TupleClass */;
             }
         }
         if (fileInfo.isStubFile) {
-            classFlags |= 16777216 /* ClassTypeFlags.DefinedInStub */;
+            classFlags |= 262144 /* ClassTypeFlags.DefinedInStub */;
         }
         const classType = types_1.ClassType.createInstantiable(node.name.value, ParseTreeUtils.getClassFullName(node, fileInfo.moduleName, node.name.value), fileInfo.moduleName, fileInfo.fileUri, classFlags, 
         /* typeSourceId */ 0, 
@@ -11697,9 +11707,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (classDecl && classSymbol) {
             setSymbolResolutionPartialType(classSymbol, classDecl, classType);
         }
-        classType.details.flags |= 262144 /* ClassTypeFlags.PartiallyEvaluated */;
+        classType.details.flags |= 8192 /* ClassTypeFlags.PartiallyEvaluated */;
         classType.details.declaration = classDecl;
-        try {
+        return (0, cancellationUtils_1.invalidateTypeCacheIfCanceled)(() => {
             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
@@ -11783,29 +11793,26 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                     fileInfo.executionEnvironment.pythonVersion.isLessThan(pythonVersion_1.pythonVersion3_7)) {
                                     addError(localize_1.LocMessage.protocolIllegal(), arg.valueExpression);
                                 }
-                                classType.details.flags |= 16384 /* ClassTypeFlags.ProtocolClass */;
+                                classType.details.flags |= 512 /* ClassTypeFlags.ProtocolClass */;
                             }
                             if (types_1.ClassType.isBuiltIn(argType, 'property')) {
-                                classType.details.flags |= 4096 /* ClassTypeFlags.PropertyClass */;
+                                classType.details.flags |= 128 /* ClassTypeFlags.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.isGreaterOrEqualTo(pythonVersion_1.pythonVersion3_6)) {
                                 if (types_1.ClassType.isBuiltIn(argType, 'NamedTuple')) {
                                     isNamedTupleSubclass = true;
-                                    classType.details.flags |=
-                                        4 /* ClassTypeFlags.DataClass */ |
-                                            32 /* ClassTypeFlags.SkipSynthesizedDataClassEq */ |
-                                            33554432 /* ClassTypeFlags.ReadOnlyInstanceVariables */;
+                                    classType.details.flags |= 524288 /* ClassTypeFlags.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 /* ClassTypeFlags.TypedDictClass */;
+                                classType.details.flags |= 4 /* ClassTypeFlags.TypedDictClass */;
                                 // Propagate the "effectively closed" flag from base classes.
                                 if (types_1.ClassType.isTypedDictEffectivelyClosed(argType)) {
-                                    classType.details.flags |= 512 /* ClassTypeFlags.TypedDictEffectivelyClosed */;
+                                    classType.details.flags |= 16 /* ClassTypeFlags.TypedDictEffectivelyClosed */;
                                 }
                             }
                             // Validate that the class isn't deriving from itself, creating a
@@ -11836,7 +11843,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     classType.details.baseClasses.push(argType);
                     if ((0, types_1.isInstantiableClass)(argType)) {
                         if (types_1.ClassType.isEnumClass(argType)) {
-                            classType.details.flags |= 2097152 /* ClassTypeFlags.EnumClass */;
+                            classType.details.flags |= 65536 /* ClassTypeFlags.EnumClass */;
                         }
                         // Determine if the class is abstract. Protocol classes support abstract methods
                         // because they are constructed by the _ProtocolMeta metaclass, which derives
@@ -11845,10 +11852,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         // 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 |= 2048 /* ClassTypeFlags.SupportsAbstractMethods */;
+                            classType.details.flags |= 64 /* ClassTypeFlags.SupportsAbstractMethods */;
                         }
                         if (types_1.ClassType.isPropertyClass(argType)) {
-                            classType.details.flags |= 4096 /* ClassTypeFlags.PropertyClass */;
+                            classType.details.flags |= 128 /* ClassTypeFlags.PropertyClass */;
                         }
                         if (types_1.ClassType.isFinal(argType)) {
                             const className = printObjectTypeForClass(argType);
@@ -11898,13 +11905,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             addError(localize_1.LocMessage.typedDictBoolParam().format({ name: arg.name.value }), arg.valueExpression);
                         }
                         else if (arg.name.value === 'total' && !constArgValue) {
-                            classType.details.flags |= 1024 /* ClassTypeFlags.CanOmitDictValues */;
+                            classType.details.flags |= 32 /* ClassTypeFlags.CanOmitDictValues */;
                         }
                         else if (arg.name.value === 'closed' && constArgValue) {
                             // This is an experimental feature because PEP 728 hasn't been accepted yet.
                             if (AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.enableExperimentalFeatures) {
                                 classType.details.flags |=
-                                    256 /* ClassTypeFlags.TypedDictMarkedClosed */ | 512 /* ClassTypeFlags.TypedDictEffectivelyClosed */;
+                                    8 /* ClassTypeFlags.TypedDictMarkedClosed */ | 16 /* ClassTypeFlags.TypedDictEffectivelyClosed */;
                             }
                         }
                     }
@@ -12037,7 +12044,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                 param.category === 0 /* ParameterCategory.Simple */ &&
                                 !param.defaultValue);
                             if (genericParams.length > 0) {
-                                classType.details.flags |= 32768 /* ClassTypeFlags.PseudoGenericClass */;
+                                classType.details.flags |= 1024 /* ClassTypeFlags.PseudoGenericClass */;
                                 // Create a type parameter for each simple, named parameter
                                 // in the __init__ method.
                                 classType.details.typeParameters = genericParams.map((param) => {
@@ -12058,7 +12065,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             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 |= 524288 /* ClassTypeFlags.HasCustomClassGetItem */;
+                    classType.details.flags |= 16384 /* ClassTypeFlags.HasCustomClassGetItem */;
                 }
             }
             // Determine the effective metaclass.
@@ -12071,17 +12078,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     classType.details.declaredMetaclass = metaclassType;
                     if ((0, types_1.isInstantiableClass)(metaclassType)) {
                         if ((0, enums_1.isEnumMetaclass)(metaclassType)) {
-                            classType.details.flags |= 2097152 /* ClassTypeFlags.EnumClass */;
+                            classType.details.flags |= 65536 /* ClassTypeFlags.EnumClass */;
                         }
                         if (types_1.ClassType.isBuiltIn(metaclassType, 'ABCMeta')) {
-                            classType.details.flags |= 2048 /* ClassTypeFlags.SupportsAbstractMethods */;
+                            classType.details.flags |= 64 /* ClassTypeFlags.SupportsAbstractMethods */;
                         }
                     }
                 }
             }
             const effectiveMetaclass = computeEffectiveMetaclass(classType, node.name);
             // Clear the "partially constructed" flag.
-            classType.details.flags &= ~262144 /* ClassTypeFlags.PartiallyEvaluated */;
+            classType.details.flags &= ~8192 /* ClassTypeFlags.PartiallyEvaluated */;
             // Now determine the decorated type of the class.
             let decoratedType = classType;
             let foundUnknown = false;
@@ -12118,7 +12125,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
             }
             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.
@@ -12146,8 +12152,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 (0, typedDicts_1.synthesizeTypedDictClassMethods)(evaluatorInterface, node, classType);
             }
             // Synthesize dataclass methods.
-            if (types_1.ClassType.isDataClass(classType)) {
-                const skipSynthesizedInit = types_1.ClassType.isSkipSynthesizedDataClassInit(classType);
+            if (types_1.ClassType.isDataClass(classType) || isNamedTupleSubclass) {
+                const skipSynthesizedInit = types_1.ClassType.isDataClassSkipGenerateInit(classType);
                 let hasExistingInitMethod = skipSynthesizedInit;
                 // See if there's already a non-synthesized __init__ method.
                 // We shouldn't override it.
@@ -12213,15 +12219,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             // Update the decorated class type.
             writeTypeCache(node, { type: decoratedType }, 0 /* EvaluatorFlags.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;
-        }
+        });
     }
     // 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
@@ -12637,7 +12635,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // Evaluates the type of a "def" statement without applying an async
     // modifier or any decorators.
     function getTypeOfFunctionPredecorated(node) {
-        var _a, _b, _c;
+        var _a;
         const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
         // Is this type already cached?
         const cachedFunctionType = readTypeCache(node.name, 0 /* EvaluatorFlags.None */);
@@ -12692,299 +12690,303 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (functionDecl && functionSymbol) {
             setSymbolResolutionPartialType(functionSymbol.symbol, functionDecl, functionType);
         }
-        writeTypeCache(node.name, { type: functionType }, /* flags */ undefined);
-        // Is this an "__init__" method within a pseudo-generic class? If so,
-        // we'll add generic types to the constructor's parameters.
-        const addGenericParamTypes = containingClassType &&
-            types_1.ClassType.isPseudoGenericClass(containingClassType) &&
-            node.name.value === '__init__';
-        const paramTypes = [];
-        // Determine if the first parameter should be skipped for comment-based
-        // function annotations.
-        let firstCommentAnnotationIndex = 0;
-        if (containingClassType && (functionType.details.flags & 4 /* FunctionTypeFlags.StaticMethod */) === 0) {
-            firstCommentAnnotationIndex = 1;
-        }
-        // If there is a function annotation comment, validate that it has the correct
-        // number of parameter annotations.
-        if (node.functionAnnotationComment && !node.functionAnnotationComment.isParamListEllipsis) {
-            const expected = node.parameters.length - firstCommentAnnotationIndex;
-            const received = node.functionAnnotationComment.paramTypeAnnotations.length;
-            // For methods with "self" or "cls" parameters, the annotation list
-            // can either include or exclude the annotation for the first parameter.
-            if (firstCommentAnnotationIndex > 0 && received === node.parameters.length) {
-                firstCommentAnnotationIndex = 0;
-            }
-            else if (received !== expected) {
-                addError(localize_1.LocMessage.annotatedParamCountMismatch().format({
-                    expected,
-                    received,
-                }), node.functionAnnotationComment);
-            }
-        }
-        // If this function uses PEP 695 syntax for type parameters,
-        // accumulate the list of type parameters upfront.
-        const typeParametersSeen = [];
-        if (node.typeParameters) {
-            functionType.details.typeParameters = evaluateTypeParameterList(node.typeParameters).map((typeParam) => (0, typeUtils_1.convertToInstance)(typeParam));
-        }
-        else {
-            functionType.details.typeParameters = typeParametersSeen;
-        }
-        let paramsArePositionOnly = true;
-        const isFirstParamClsOrSelf = containingClassType &&
-            (types_1.FunctionType.isClassMethod(functionType) ||
-                types_1.FunctionType.isInstanceMethod(functionType) ||
-                types_1.FunctionType.isConstructorMethod(functionType));
-        const firstNonClsSelfParamIndex = isFirstParamClsOrSelf ? 1 : 0;
-        node.parameters.forEach((param, index) => {
-            let paramType;
-            let annotatedType;
-            let paramTypeNode;
-            if (param.name) {
-                if (index === 0 && isFirstParamClsOrSelf) {
-                    // Mark "self/cls" as accessed.
-                    markParamAccessed(param);
-                }
-                else if (types_1.FunctionType.isAbstractMethod(functionType)) {
-                    // Mark all parameters in abstract methods as accessed.
-                    markParamAccessed(param);
-                }
-                else if (containingClassType && types_1.ClassType.isProtocolClass(containingClassType)) {
-                    // Mark all parameters in protocol methods as accessed.
-                    markParamAccessed(param);
-                }
-            }
-            if (param.typeAnnotation) {
-                paramTypeNode = param.typeAnnotation;
-            }
-            else if (param.typeAnnotationComment) {
-                paramTypeNode = param.typeAnnotationComment;
+        return (0, cancellationUtils_1.invalidateTypeCacheIfCanceled)(() => {
+            var _a, _b;
+            writeTypeCache(node.name, { type: functionType }, /* flags */ undefined);
+            // Is this an "__init__" method within a pseudo-generic class? If so,
+            // we'll add generic types to the constructor's parameters.
+            const addGenericParamTypes = containingClassType &&
+                types_1.ClassType.isPseudoGenericClass(containingClassType) &&
+                node.name.value === '__init__';
+            const paramTypes = [];
+            // Determine if the first parameter should be skipped for comment-based
+            // function annotations.
+            let firstCommentAnnotationIndex = 0;
+            if (containingClassType && (functionType.details.flags & 4 /* FunctionTypeFlags.StaticMethod */) === 0) {
+                firstCommentAnnotationIndex = 1;
+            }
+            // If there is a function annotation comment, validate that it has the correct
+            // number of parameter annotations.
+            if (node.functionAnnotationComment && !node.functionAnnotationComment.isParamListEllipsis) {
+                const expected = node.parameters.length - firstCommentAnnotationIndex;
+                const received = node.functionAnnotationComment.paramTypeAnnotations.length;
+                // For methods with "self" or "cls" parameters, the annotation list
+                // can either include or exclude the annotation for the first parameter.
+                if (firstCommentAnnotationIndex > 0 && received === node.parameters.length) {
+                    firstCommentAnnotationIndex = 0;
+                }
+                else if (received !== expected) {
+                    addError(localize_1.LocMessage.annotatedParamCountMismatch().format({
+                        expected,
+                        received,
+                    }), node.functionAnnotationComment);
+                }
+            }
+            // If this function uses PEP 695 syntax for type parameters,
+            // accumulate the list of type parameters upfront.
+            const typeParametersSeen = [];
+            if (node.typeParameters) {
+                functionType.details.typeParameters = evaluateTypeParameterList(node.typeParameters).map((typeParam) => (0, typeUtils_1.convertToInstance)(typeParam));
             }
-            else if (node.functionAnnotationComment && !node.functionAnnotationComment.isParamListEllipsis) {
-                const adjustedIndex = index - firstCommentAnnotationIndex;
-                if (adjustedIndex >= 0 && adjustedIndex < node.functionAnnotationComment.paramTypeAnnotations.length) {
-                    paramTypeNode = node.functionAnnotationComment.paramTypeAnnotations[adjustedIndex];
-                }
+            else {
+                functionType.details.typeParameters = typeParametersSeen;
             }
-            if (paramTypeNode) {
-                if ((functionInfo.flags & 524288 /* FunctionTypeFlags.NoTypeCheck */) !== 0) {
-                    annotatedType = types_1.UnknownType.create();
+            let paramsArePositionOnly = true;
+            const isFirstParamClsOrSelf = containingClassType &&
+                (types_1.FunctionType.isClassMethod(functionType) ||
+                    types_1.FunctionType.isInstanceMethod(functionType) ||
+                    types_1.FunctionType.isConstructorMethod(functionType));
+            const firstNonClsSelfParamIndex = isFirstParamClsOrSelf ? 1 : 0;
+            node.parameters.forEach((param, index) => {
+                let paramType;
+                let annotatedType;
+                let paramTypeNode;
+                if (param.name) {
+                    if (index === 0 && isFirstParamClsOrSelf) {
+                        // Mark "self/cls" as accessed.
+                        markParamAccessed(param);
+                    }
+                    else if (types_1.FunctionType.isAbstractMethod(functionType)) {
+                        // Mark all parameters in abstract methods as accessed.
+                        markParamAccessed(param);
+                    }
+                    else if (containingClassType && types_1.ClassType.isProtocolClass(containingClassType)) {
+                        // Mark all parameters in protocol methods as accessed.
+                        markParamAccessed(param);
+                    }
                 }
-                else {
-                    annotatedType = getTypeOfParameterAnnotation(paramTypeNode, param.category);
+                if (param.typeAnnotation) {
+                    paramTypeNode = param.typeAnnotation;
                 }
-                if (annotatedType) {
-                    (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParametersSeen, (0, typeUtils_1.getTypeVarArgumentsRecursive)(annotatedType), functionType.details.typeVarScopeId);
+                else if (param.typeAnnotationComment) {
+                    paramTypeNode = param.typeAnnotationComment;
                 }
-                if ((0, types_1.isVariadicTypeVar)(annotatedType) && !annotatedType.isVariadicUnpacked) {
-                    addError(localize_1.LocMessage.unpackedTypeVarTupleExpected().format({
-                        name1: annotatedType.details.name,
-                        name2: annotatedType.details.name,
-                    }), paramTypeNode);
-                    annotatedType = types_1.UnknownType.create();
+                else if (node.functionAnnotationComment && !node.functionAnnotationComment.isParamListEllipsis) {
+                    const adjustedIndex = index - firstCommentAnnotationIndex;
+                    if (adjustedIndex >= 0 &&
+                        adjustedIndex < node.functionAnnotationComment.paramTypeAnnotations.length) {
+                        paramTypeNode = node.functionAnnotationComment.paramTypeAnnotations[adjustedIndex];
+                    }
                 }
-            }
-            if (!annotatedType && addGenericParamTypes) {
-                if (index > 0 && param.category === 0 /* ParameterCategory.Simple */ && param.name && !param.defaultValue) {
-                    const typeParamName = getPseudoGenericTypeVarName(param.name.value);
-                    annotatedType = containingClassType.details.typeParameters.find((param) => param.details.name === typeParamName);
+                if (paramTypeNode) {
+                    if ((functionInfo.flags & 524288 /* FunctionTypeFlags.NoTypeCheck */) !== 0) {
+                        annotatedType = types_1.UnknownType.create();
+                    }
+                    else {
+                        annotatedType = getTypeOfParameterAnnotation(paramTypeNode, param.category);
+                    }
+                    if (annotatedType) {
+                        (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParametersSeen, (0, typeUtils_1.getTypeVarArgumentsRecursive)(annotatedType), functionType.details.typeVarScopeId);
+                    }
+                    if ((0, types_1.isVariadicTypeVar)(annotatedType) && !annotatedType.isVariadicUnpacked) {
+                        addError(localize_1.LocMessage.unpackedTypeVarTupleExpected().format({
+                            name1: annotatedType.details.name,
+                            name2: annotatedType.details.name,
+                        }), paramTypeNode);
+                        annotatedType = types_1.UnknownType.create();
+                    }
                 }
-            }
-            if (annotatedType) {
-                const adjustedAnnotatedType = adjustParameterAnnotatedType(param, annotatedType);
-                if (adjustedAnnotatedType !== annotatedType) {
-                    annotatedType = adjustedAnnotatedType;
+                if (!annotatedType && addGenericParamTypes) {
+                    if (index > 0 && param.category === 0 /* ParameterCategory.Simple */ && param.name && !param.defaultValue) {
+                        const typeParamName = getPseudoGenericTypeVarName(param.name.value);
+                        annotatedType = containingClassType.details.typeParameters.find((param) => param.details.name === typeParamName);
+                    }
                 }
-            }
-            let defaultValueType;
-            if (param.defaultValue) {
-                // If this is a stub file, a protocol, an overload, or a class
-                // whose body is a placeholder implementation, treat a "...", as
-                // an "Any" value.
-                let treatEllipsisAsAny = fileInfo.isStubFile || ParseTreeUtils.isSuiteEmpty(node.suite);
-                if (containingClassType && types_1.ClassType.isProtocolClass(containingClassType)) {
-                    treatEllipsisAsAny = true;
+                if (annotatedType) {
+                    const adjustedAnnotatedType = adjustParameterAnnotatedType(param, annotatedType);
+                    if (adjustedAnnotatedType !== annotatedType) {
+                        annotatedType = adjustedAnnotatedType;
+                    }
                 }
-                if (types_1.FunctionType.isOverloaded(functionType) || types_1.FunctionType.isAbstractMethod(functionType)) {
-                    treatEllipsisAsAny = true;
+                let defaultValueType;
+                if (param.defaultValue) {
+                    // If this is a stub file, a protocol, an overload, or a class
+                    // whose body is a placeholder implementation, treat a "...", as
+                    // an "Any" value.
+                    let treatEllipsisAsAny = fileInfo.isStubFile || ParseTreeUtils.isSuiteEmpty(node.suite);
+                    if (containingClassType && types_1.ClassType.isProtocolClass(containingClassType)) {
+                        treatEllipsisAsAny = true;
+                    }
+                    if (types_1.FunctionType.isOverloaded(functionType) || types_1.FunctionType.isAbstractMethod(functionType)) {
+                        treatEllipsisAsAny = true;
+                    }
+                    defaultValueType = getTypeOfExpression(param.defaultValue, treatEllipsisAsAny ? 1 /* EvaluatorFlags.ConvertEllipsisToAny */ : 0 /* EvaluatorFlags.None */, (0, typeUtils_1.makeInferenceContext)(annotatedType)).type;
                 }
-                defaultValueType = getTypeOfExpression(param.defaultValue, treatEllipsisAsAny ? 1 /* EvaluatorFlags.ConvertEllipsisToAny */ : 0 /* EvaluatorFlags.None */, (0, typeUtils_1.makeInferenceContext)(annotatedType)).type;
-            }
-            if (annotatedType) {
-                // If there was both a type annotation and a default value, verify
-                // that the default value matches the annotation.
-                if (param.defaultValue && defaultValueType) {
-                    const diagAddendum = new diagnostic_1.DiagnosticAddendum();
-                    const typeVarContext = new typeVarContext_1.TypeVarContext(functionType.details.typeVarScopeId);
-                    if (containingClassType && containingClassType.details.typeVarScopeId !== undefined) {
-                        if (node.name.value === '__init__' || node.name.value === '__new__') {
-                            typeVarContext.addSolveForScope(containingClassType.details.typeVarScopeId);
+                if (annotatedType) {
+                    // If there was both a type annotation and a default value, verify
+                    // that the default value matches the annotation.
+                    if (param.defaultValue && defaultValueType) {
+                        const diagAddendum = new diagnostic_1.DiagnosticAddendum();
+                        const typeVarContext = new typeVarContext_1.TypeVarContext(functionType.details.typeVarScopeId);
+                        if (containingClassType && containingClassType.details.typeVarScopeId !== undefined) {
+                            if (node.name.value === '__init__' || node.name.value === '__new__') {
+                                typeVarContext.addSolveForScope(containingClassType.details.typeVarScopeId);
+                            }
+                        }
+                        if (!assignType(annotatedType, defaultValueType, diagAddendum, typeVarContext)) {
+                            addDiagnostic(diagnosticRules_1.DiagnosticRule.reportArgumentType, localize_1.LocMessage.paramAssignmentMismatch().format({
+                                sourceType: printType(defaultValueType),
+                                paramType: printType(annotatedType),
+                            }) + diagAddendum.getString(), param.defaultValue);
                         }
                     }
-                    if (!assignType(annotatedType, defaultValueType, diagAddendum, typeVarContext)) {
-                        addDiagnostic(diagnosticRules_1.DiagnosticRule.reportArgumentType, localize_1.LocMessage.paramAssignmentMismatch().format({
-                            sourceType: printType(defaultValueType),
-                            paramType: printType(annotatedType),
-                        }) + diagAddendum.getString(), param.defaultValue);
-                    }
-                }
-                paramType = annotatedType;
-            }
-            // Determine whether we need to insert an implied position-only parameter.
-            // This is needed when a function's parameters are named using the old-style
-            // way of specifying position-only parameters.
-            if (index >= firstNonClsSelfParamIndex) {
-                let isImplicitPositionOnlyParam = false;
-                if (param.category === 0 /* ParameterCategory.Simple */ && param.name) {
-                    if ((0, symbolNameUtils_1.isPrivateName)(param.name.value) &&
-                        !node.parameters.some((p) => p.category === 0 /* ParameterCategory.Simple */ && !p.name)) {
-                        isImplicitPositionOnlyParam = true;
-                        // If the parameter name indicates an implicit position-only parameter
-                        // but we have already seen non-position-only parameters, report an error.
-                        if (!paramsArePositionOnly &&
-                            functionType.details.parameters.every((p) => p.category === 0 /* ParameterCategory.Simple */)) {
-                            addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.positionOnlyAfterNon(), param.name);
+                    paramType = annotatedType;
+                }
+                // Determine whether we need to insert an implied position-only parameter.
+                // This is needed when a function's parameters are named using the old-style
+                // way of specifying position-only parameters.
+                if (index >= firstNonClsSelfParamIndex) {
+                    let isImplicitPositionOnlyParam = false;
+                    if (param.category === 0 /* ParameterCategory.Simple */ && param.name) {
+                        if ((0, symbolNameUtils_1.isPrivateName)(param.name.value) &&
+                            !node.parameters.some((p) => p.category === 0 /* ParameterCategory.Simple */ && !p.name)) {
+                            isImplicitPositionOnlyParam = true;
+                            // If the parameter name indicates an implicit position-only parameter
+                            // but we have already seen non-position-only parameters, report an error.
+                            if (!paramsArePositionOnly &&
+                                functionType.details.parameters.every((p) => p.category === 0 /* ParameterCategory.Simple */)) {
+                                addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.positionOnlyAfterNon(), param.name);
+                            }
                         }
                     }
+                    else {
+                        paramsArePositionOnly = false;
+                    }
+                    if (paramsArePositionOnly &&
+                        !isImplicitPositionOnlyParam &&
+                        functionType.details.parameters.length > firstNonClsSelfParamIndex) {
+                        types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
+                    }
+                    if (!isImplicitPositionOnlyParam) {
+                        paramsArePositionOnly = false;
+                    }
+                }
+                // If there was no annotation for the parameter, infer its type if possible.
+                let isTypeInferred = false;
+                if (!paramTypeNode) {
+                    isTypeInferred = true;
+                    const inferredType = inferParameterType(node, functionType.details.flags, index, containingClassType);
+                    if (inferredType) {
+                        paramType = inferredType;
+                    }
+                }
+                const functionParam = {
+                    category: param.category,
+                    name: param.name ? param.name.value : undefined,
+                    hasDefault: !!param.defaultValue,
+                    defaultValueExpression: param.defaultValue,
+                    defaultType: defaultValueType,
+                    type: paramType !== null && paramType !== void 0 ? paramType : types_1.UnknownType.create(),
+                    typeAnnotation: paramTypeNode,
+                    hasDeclaredType: !!paramTypeNode,
+                    isTypeInferred,
+                };
+                types_1.FunctionType.addParameter(functionType, functionParam);
+                if (functionParam.hasDeclaredType) {
+                    (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParametersSeen, (0, typeUtils_1.getTypeVarArgumentsRecursive)(functionParam.type), functionType.details.typeVarScopeId);
+                }
+                if (param.name) {
+                    const variadicParamType = transformVariadicParamType(node, param.category, functionParam.type);
+                    paramTypes.push(variadicParamType);
                 }
                 else {
-                    paramsArePositionOnly = false;
+                    paramTypes.push(functionParam.type);
                 }
-                if (paramsArePositionOnly &&
-                    !isImplicitPositionOnlyParam &&
-                    functionType.details.parameters.length > firstNonClsSelfParamIndex) {
-                    types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
+            });
+            if (paramsArePositionOnly && functionType.details.parameters.length > firstNonClsSelfParamIndex) {
+                types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
+            }
+            // Update the types for the nodes associated with the parameters.
+            paramTypes.forEach((paramType, index) => {
+                const paramNameNode = node.parameters[index].name;
+                if (paramNameNode) {
+                    if ((0, types_1.isUnknown)(paramType)) {
+                        functionType.details.flags |= 16384 /* FunctionTypeFlags.UnannotatedParams */;
+                    }
+                    writeTypeCache(paramNameNode, { type: paramType }, 0 /* EvaluatorFlags.None */);
                 }
-                if (!isImplicitPositionOnlyParam) {
-                    paramsArePositionOnly = false;
-                }
-            }
-            // If there was no annotation for the parameter, infer its type if possible.
-            let isTypeInferred = false;
-            if (!paramTypeNode) {
-                isTypeInferred = true;
-                const inferredType = inferParameterType(node, functionType.details.flags, index, containingClassType);
-                if (inferredType) {
-                    paramType = inferredType;
-                }
-            }
-            const functionParam = {
-                category: param.category,
-                name: param.name ? param.name.value : undefined,
-                hasDefault: !!param.defaultValue,
-                defaultValueExpression: param.defaultValue,
-                defaultType: defaultValueType,
-                type: paramType !== null && paramType !== void 0 ? paramType : types_1.UnknownType.create(),
-                typeAnnotation: paramTypeNode,
-                hasDeclaredType: !!paramTypeNode,
-                isTypeInferred,
-            };
-            types_1.FunctionType.addParameter(functionType, functionParam);
-            if (functionParam.hasDeclaredType) {
-                (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParametersSeen, (0, typeUtils_1.getTypeVarArgumentsRecursive)(functionParam.type), functionType.details.typeVarScopeId);
+            });
+            // If the function ends in P.args and P.kwargs parameters, make it exempt from
+            // args/kwargs compatibility checks. This is important for protocol comparisons.
+            if (paramTypes.length >= 2) {
+                const paramType1 = paramTypes[paramTypes.length - 2];
+                const paramType2 = paramTypes[paramTypes.length - 1];
+                if ((0, types_1.isParamSpec)(paramType1) &&
+                    paramType1.paramSpecAccess === 'args' &&
+                    (0, types_1.isParamSpec)(paramType2) &&
+                    paramType2.paramSpecAccess === 'kwargs') {
+                    functionType.details.flags |= 32768 /* FunctionTypeFlags.GradualCallableForm */;
+                }
+            }
+            // If the function contains an *args and a **kwargs parameter and both
+            // are annotated as Any or are unannotated, make it exempt from
+            // args/kwargs compatibility checks.
+            const variadicsWithAnyType = functionType.details.parameters.filter((param) => param.category !== 0 /* ParameterCategory.Simple */ && param.name && (0, types_1.isAnyOrUnknown)(param.type));
+            if (variadicsWithAnyType.length >= 2) {
+                functionType.details.flags |= 32768 /* FunctionTypeFlags.GradualCallableForm */;
             }
-            if (param.name) {
-                const variadicParamType = transformVariadicParamType(node, param.category, functionParam.type);
-                paramTypes.push(variadicParamType);
+            // If there was a defined return type, analyze that first so when we
+            // walk the contents of the function, return statements can be
+            // validated against this type.
+            const returnTypeAnnotationNode = (_a = node.returnTypeAnnotation) !== null && _a !== void 0 ? _a : (_b = node.functionAnnotationComment) === null || _b === void 0 ? void 0 : _b.returnTypeAnnotation;
+            if (returnTypeAnnotationNode) {
+                // Temporarily set the return type to unknown in case of recursion.
+                functionType.details.declaredReturnType = types_1.UnknownType.create();
+                const returnType = getTypeOfAnnotation(returnTypeAnnotationNode, {
+                    associateTypeVarsWithScope: true,
+                });
+                functionType.details.declaredReturnType = returnType;
             }
             else {
-                paramTypes.push(functionParam.type);
-            }
-        });
-        if (paramsArePositionOnly && functionType.details.parameters.length > firstNonClsSelfParamIndex) {
-            types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
-        }
-        // Update the types for the nodes associated with the parameters.
-        paramTypes.forEach((paramType, index) => {
-            const paramNameNode = node.parameters[index].name;
-            if (paramNameNode) {
-                if ((0, types_1.isUnknown)(paramType)) {
-                    functionType.details.flags |= 16384 /* FunctionTypeFlags.UnannotatedParams */;
+                // If there was no return type annotation and this is a type stub,
+                // we have no opportunity to infer the return type, so we'll indicate
+                // that it's unknown.
+                if (fileInfo.isStubFile) {
+                    // Special-case the __init__ method, which is commonly left without
+                    // an annotated return type, but we can assume it returns None.
+                    if (node.name.value === '__init__') {
+                        functionType.details.declaredReturnType = getNoneType();
+                    }
+                    else {
+                        functionType.details.declaredReturnType = types_1.UnknownType.create();
+                    }
                 }
-                writeTypeCache(paramNameNode, { type: paramType }, 0 /* EvaluatorFlags.None */);
             }
-        });
-        // If the function ends in P.args and P.kwargs parameters, make it exempt from
-        // args/kwargs compatibility checks. This is important for protocol comparisons.
-        if (paramTypes.length >= 2) {
-            const paramType1 = paramTypes[paramTypes.length - 2];
-            const paramType2 = paramTypes[paramTypes.length - 1];
-            if ((0, types_1.isParamSpec)(paramType1) &&
-                paramType1.paramSpecAccess === 'args' &&
-                (0, types_1.isParamSpec)(paramType2) &&
-                paramType2.paramSpecAccess === 'kwargs') {
-                functionType.details.flags |= 32768 /* FunctionTypeFlags.GradualCallableForm */;
+            // Accumulate any type parameters used in the return type.
+            if (functionType.details.declaredReturnType && returnTypeAnnotationNode) {
+                (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParametersSeen, (0, typeUtils_1.getTypeVarArgumentsRecursive)(functionType.details.declaredReturnType), functionType.details.typeVarScopeId);
             }
-        }
-        // If the function contains an *args and a **kwargs parameter and both
-        // are annotated as Any or are unannotated, make it exempt from
-        // args/kwargs compatibility checks.
-        const variadicsWithAnyType = functionType.details.parameters.filter((param) => param.category !== 0 /* ParameterCategory.Simple */ && param.name && (0, types_1.isAnyOrUnknown)(param.type));
-        if (variadicsWithAnyType.length >= 2) {
-            functionType.details.flags |= 32768 /* FunctionTypeFlags.GradualCallableForm */;
-        }
-        // If there was a defined return type, analyze that first so when we
-        // walk the contents of the function, return statements can be
-        // validated against this type.
-        const returnTypeAnnotationNode = (_b = node.returnTypeAnnotation) !== null && _b !== void 0 ? _b : (_c = node.functionAnnotationComment) === null || _c === void 0 ? void 0 : _c.returnTypeAnnotation;
-        if (returnTypeAnnotationNode) {
-            // Temporarily set the return type to unknown in case of recursion.
-            functionType.details.declaredReturnType = types_1.UnknownType.create();
-            const returnType = getTypeOfAnnotation(returnTypeAnnotationNode, {
-                associateTypeVarsWithScope: true,
-            });
-            functionType.details.declaredReturnType = returnType;
-        }
-        else {
-            // If there was no return type annotation and this is a type stub,
-            // we have no opportunity to infer the return type, so we'll indicate
-            // that it's unknown.
-            if (fileInfo.isStubFile) {
-                // Special-case the __init__ method, which is commonly left without
-                // an annotated return type, but we can assume it returns None.
-                if (node.name.value === '__init__') {
-                    functionType.details.declaredReturnType = getNoneType();
-                }
-                else {
-                    functionType.details.declaredReturnType = types_1.UnknownType.create();
+            // If the return type is explicitly annotated as a generator, mark the
+            // function as a generator even though it may not contain a "yield" statement.
+            // This is important for generator functions declared in stub files, abstract
+            // methods or protocol definitions.
+            if (fileInfo.isStubFile || ParseTreeUtils.isSuiteEmpty(node.suite)) {
+                if (functionType.details.declaredReturnType &&
+                    (0, types_1.isClassInstance)(functionType.details.declaredReturnType) &&
+                    types_1.ClassType.isBuiltIn(functionType.details.declaredReturnType, [
+                        'Generator',
+                        'AsyncGenerator',
+                        'AwaitableGenerator',
+                    ])) {
+                    functionType.details.flags |= 16 /* FunctionTypeFlags.Generator */;
                 }
             }
-        }
-        // Accumulate any type parameters used in the return type.
-        if (functionType.details.declaredReturnType && returnTypeAnnotationNode) {
-            (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParametersSeen, (0, typeUtils_1.getTypeVarArgumentsRecursive)(functionType.details.declaredReturnType), functionType.details.typeVarScopeId);
-        }
-        // If the return type is explicitly annotated as a generator, mark the
-        // function as a generator even though it may not contain a "yield" statement.
-        // This is important for generator functions declared in stub files, abstract
-        // methods or protocol definitions.
-        if (fileInfo.isStubFile || ParseTreeUtils.isSuiteEmpty(node.suite)) {
-            if (functionType.details.declaredReturnType &&
-                (0, types_1.isClassInstance)(functionType.details.declaredReturnType) &&
-                types_1.ClassType.isBuiltIn(functionType.details.declaredReturnType, [
-                    'Generator',
-                    'AsyncGenerator',
-                    'AwaitableGenerator',
-                ])) {
-                functionType.details.flags |= 16 /* FunctionTypeFlags.Generator */;
-            }
-        }
-        // Validate the default types for all type parameters.
-        functionType.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, functionType.details.typeParameters.slice(0, index), functionType.details.typeVarScopeId);
+            // Validate the default types for all type parameters.
+            functionType.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, functionType.details.typeParameters.slice(0, index), functionType.details.typeVarScopeId);
+            });
+            // Clear the "partially evaluated" flag to indicate that the functionType
+            // is fully evaluated.
+            functionType.details.flags &= ~131072 /* FunctionTypeFlags.PartiallyEvaluated */;
+            writeTypeCache(node.name, { type: functionType }, 0 /* EvaluatorFlags.None */);
+            return functionType;
         });
-        // Clear the "partially evaluated" flag to indicate that the functionType
-        // is fully evaluated.
-        functionType.details.flags &= ~131072 /* FunctionTypeFlags.PartiallyEvaluated */;
-        writeTypeCache(node.name, { type: functionType }, 0 /* EvaluatorFlags.None */);
-        return functionType;
     }
     function markParamAccessed(param) {
         if (param.name) {
@@ -13297,8 +13299,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                         const iteratorTypeResult = getTypeOfExpression(yieldNode.expression);
                                         if ((0, types_1.isClassInstance)(iteratorTypeResult.type) &&
                                             types_1.ClassType.isBuiltIn(iteratorTypeResult.type, 'Coroutine')) {
+                                            const yieldType = iteratorTypeResult.type.typeArguments &&
+                                                iteratorTypeResult.type.typeArguments.length > 0
+                                                ? iteratorTypeResult.type.typeArguments[0]
+                                                : types_1.UnknownType.create();
                                             // Handle old-style (pre-await) Coroutines.
-                                            inferredYieldTypes.push();
+                                            inferredYieldTypes.push(yieldType);
                                             useAwaitableGenerator = true;
                                         }
                                         else {
@@ -13324,9 +13330,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                 }
                             });
                         }
-                        if (inferredYieldTypes.length === 0) {
-                            inferredYieldTypes.push(getNoneType());
-                        }
                         const inferredYieldType = (0, types_1.combineTypes)(inferredYieldTypes);
                         // Inferred yield types need to be wrapped in a Generator or
                         // AwaitableGenerator to produce the final result.
@@ -16397,7 +16400,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     let flags = 0 /* AssignTypeFlags.Default */;
                     if ((primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.type) === 1 /* DeclarationType.Variable */ &&
                         !isFinalVariableDeclaration(primaryDecl) &&
-                        !types_1.ClassType.isFrozenDataClass(destType)) {
+                        !types_1.ClassType.isDataClassFrozen(destType)) {
                         // Class and instance variables that are mutable need to
                         // enforce invariance. We will exempt variables that are
                         // private or protected, since these are presumably
@@ -19221,7 +19224,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // evaluating (and caching) the inferred return type if there is no defined return type.
         getFunctionEffectiveReturnType(memberType);
         const specializedFunction = (0, typeUtils_1.applySolvedTypeVars)(memberType, typeVarContext);
-        return types_1.FunctionType.clone(specializedFunction, stripFirstParam, baseType, (0, typeUtils_1.getTypeVarScopeId)(baseType));
+        // If this is a constructor method, provide the base type's TypeVar scope ID
+        // so any TypeVars in this type can be solved.
+        let baseTypeTypeVarScopeId;
+        if (types_1.FunctionType.isConstructorMethod(specializedFunction) || specializedFunction.details.name === '__init__') {
+            baseTypeTypeVarScopeId = (0, typeUtils_1.getTypeVarScopeId)(baseType);
+        }
+        return types_1.FunctionType.clone(specializedFunction, stripFirstParam, baseType, baseTypeTypeVarScopeId);
     }
     function isFinalVariable(symbol) {
         return symbol.getDeclarations().some((decl) => isFinalVariableDeclaration(decl));