@zzzen/pyright-internal 1.2.0-dev.20230827 → 1.2.0-dev.20230910

package/dist/analyzer/typeEvaluator.js

@@ -728,7 +728,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             const isEmptyVariadic = (0, types_1.isClassInstance)(typeResult.type) &&
                 types_1.ClassType.isTupleClass(typeResult.type) &&
                 ((_a = typeResult.type.tupleTypeArguments) === null || _a === void 0 ? void 0 : _a.length) === 0;
-            if (!isEmptyVariadic) {
+            const isEllipsis = (0, types_1.isClassInstance)(typeResult.type) && types_1.ClassType.isBuiltIn(typeResult.type, 'ellipsis');
+            if (!isEmptyVariadic && !isEllipsis) {
                 addExpectedClassDiagnostic(typeResult.type, node);
                 typeResult.type = types_1.UnknownType.create();
                 typeResult.typeErrors = true;
@@ -886,13 +887,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;
@@ -910,18 +916,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;
@@ -1236,8 +1244,19 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // to handle the case where we're fetching the object member from a
     // metaclass but binding to the class.
     function getTypeOfObjectMember(errorNode, objectType, memberName, usage = { method: 'get' }, diag = undefined, memberAccessFlags = 0 /* None */, bindToType) {
-        const memberInfo = getTypeOfClassMemberName(errorNode, types_1.ClassType.cloneAsInstantiable(objectType), 
-        /* isAccessedThroughObject */ true, memberName, usage, diag, memberAccessFlags | 8 /* DisallowClassVarWrites */, bindToType);
+        let memberInfo = getTypeOfClassMemberName(errorNode, types_1.ClassType.cloneAsInstantiable(objectType), 
+        /* isAccessedThroughObject */ true, memberName, usage, diag, memberAccessFlags | 16 /* DisallowClassVarWrites */, bindToType);
+        if (!memberInfo) {
+            const metaclass = objectType.details.effectiveMetaclass;
+            if (metaclass &&
+                (0, types_1.isInstantiableClass)(metaclass) &&
+                !types_1.ClassType.isBuiltIn(metaclass, 'type') &&
+                !types_1.ClassType.isSameGenericClass(metaclass, objectType)) {
+                memberInfo = getTypeOfClassMemberName(errorNode, metaclass, 
+                /* isAccessedThroughObject */ false, memberName, usage, 
+                /* diag */ undefined, memberAccessFlags | 2 /* AccessInstanceMembersOnly */, types_1.ClassType.cloneAsInstantiable(objectType));
+            }
+        }
         if (memberInfo) {
             return {
                 type: memberInfo.type,
@@ -1254,7 +1273,7 @@ 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;
+        let considerMetaclassOnly = (memberAccessFlags & 64 /* 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() };
@@ -1482,7 +1501,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             const classTypeInfo = getTypeOfClass(enclosingClass);
                             if (classTypeInfo) {
                                 const classMemberInfo = (0, typeUtils_1.lookUpClassMember)(classTypeInfo.classType, expression.value, 8 /* SkipInstanceVariables */ |
-                                    16 /* DeclaredTypesOnly */);
+                                    32 /* DeclaredTypesOnly */);
                                 if (classMemberInfo) {
                                     symbol = classMemberInfo.symbol;
                                 }
@@ -1499,7 +1518,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 const baseType = makeTopLevelTypeVarsConcrete(getTypeOfExpression(expression.leftExpression, 16777218 /* MemberAccessBaseDefaults */).type);
                 let classMemberInfo;
                 if ((0, types_1.isClassInstance)(baseType)) {
-                    classMemberInfo = (0, typeUtils_1.lookUpObjectMember)(baseType, expression.memberName.value, 16 /* DeclaredTypesOnly */);
+                    classMemberInfo = (0, typeUtils_1.lookUpObjectMember)(baseType, expression.memberName.value, 32 /* DeclaredTypesOnly */);
                     classOrObjectBase = baseType;
                     memberAccessClass = classMemberInfo === null || classMemberInfo === void 0 ? void 0 : classMemberInfo.classType;
                     // If this is an instance member (e.g. a dataclass field), don't
@@ -1510,7 +1529,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     useDescriptorSetterType = true;
                 }
                 else if ((0, types_1.isInstantiableClass)(baseType)) {
-                    classMemberInfo = (0, typeUtils_1.lookUpClassMember)(baseType, expression.memberName.value, 8 /* SkipInstanceVariables */ | 16 /* DeclaredTypesOnly */);
+                    classMemberInfo = (0, typeUtils_1.lookUpClassMember)(baseType, expression.memberName.value, 8 /* SkipInstanceVariables */ | 32 /* DeclaredTypesOnly */);
                     classOrObjectBase = baseType;
                     memberAccessClass = classMemberInfo === null || classMemberInfo === void 0 ? void 0 : classMemberInfo.classType;
                 }
@@ -2205,7 +2224,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
             }
             // Look up the member info again, now that we've potentially updated it.
-            memberInfo = (0, typeUtils_1.lookUpClassMember)(classTypeInfo.classType, memberName, 16 /* DeclaredTypesOnly */);
+            memberInfo = (0, typeUtils_1.lookUpClassMember)(classTypeInfo.classType, memberName, 32 /* DeclaredTypesOnly */);
             if (!memberInfo && srcExprNode && !isTypeIncomplete) {
                 reportPossibleUnknownAssignment(fileInfo.diagnosticRuleSet.reportUnknownMemberType, diagnosticRules_1.DiagnosticRule.reportUnknownMemberType, node.memberName, srcType, node, 
                 /* ignoreEmptyContainers */ true);
@@ -2344,8 +2363,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // If this is a TypeVarTuple *Ts, convert it to an unpacked tuple
             // *tuple[*Ts].
             if ((0, types_1.isVariadicTypeVar)(subtype)) {
+                // If it's in a union, convert to type or object.
                 if (subtype.isVariadicInUnion) {
-                    return subtype;
+                    if (types_1.TypeBase.isInstantiable(subtype)) {
+                        if (typeClassType && (0, types_1.isInstantiableClass)(typeClassType)) {
+                            return typeClassType;
+                        }
+                    }
+                    else if (objectType) {
+                        return objectType;
+                    }
+                    return types_1.AnyType.create();
                 }
                 if (tupleClassType && (0, types_1.isInstantiableClass)(tupleClassType)) {
                     return (0, typeUtils_1.convertToInstance)((0, typeUtils_1.specializeTupleClass)(tupleClassType, [{ type: subtype, isUnbounded: false }], 
@@ -3223,9 +3251,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 nestedClassCount++;
             }
             else if (curNode.nodeType === 28 /* Function */) {
-                const functionTypeInfo = getTypeOfFunction(curNode);
-                if (functionTypeInfo) {
-                    const functionDetails = functionTypeInfo.functionType.details;
+                const functionType = getTypeOfFunctionPredecorated(curNode);
+                if (functionType) {
+                    const functionDetails = functionType.details;
                     typeParametersForScope = functionDetails.typeParameters;
                     // Was this type parameter "rescoped" to a callable found within the
                     // return type annotation? If so, it is not available for use within
@@ -3689,20 +3717,23 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (flags & 1 /* AccessClassMembersOnly */) {
             classLookupFlags |= 8 /* SkipInstanceVariables */;
         }
-        if (flags & 2 /* SkipBaseClasses */) {
+        if (flags & 2 /* AccessInstanceMembersOnly */) {
+            classLookupFlags |= 16 /* SkipClassVariables */;
+        }
+        if (flags & 4 /* SkipBaseClasses */) {
             classLookupFlags |= 2 /* SkipBaseClasses */;
         }
-        if (flags & 4 /* SkipObjectBaseClass */) {
+        if (flags & 8 /* SkipObjectBaseClass */) {
             classLookupFlags |= 4 /* SkipObjectBaseClass */;
         }
-        if (flags & 256 /* SkipTypeBaseClass */) {
-            classLookupFlags |= 32 /* SkipTypeBaseClass */;
+        if (flags & 512 /* SkipTypeBaseClass */) {
+            classLookupFlags |= 64 /* SkipTypeBaseClass */;
         }
-        if (flags & 128 /* SkipOriginalClass */) {
+        if (flags & 256 /* SkipOriginalClass */) {
             classLookupFlags |= 1 /* SkipOriginalClass */;
         }
         // Always look for a member with a declared type first.
-        let memberInfo = (0, typeUtils_1.lookUpClassMember)(classType, memberName, classLookupFlags | 16 /* DeclaredTypesOnly */);
+        let memberInfo = (0, typeUtils_1.lookUpClassMember)(classType, memberName, classLookupFlags | 32 /* DeclaredTypesOnly */);
         // If we couldn't find a symbol with a declared type, use
         // a symbol with an inferred type.
         if (!memberInfo) {
@@ -3739,7 +3770,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             if (typeResult) {
                                 if ((0, typeUtils_1.isDescriptorInstance)(typeResult.type, /* requireSetter */ true)) {
                                     type = typeResult.type;
-                                    flags &= 8 /* DisallowClassVarWrites */;
+                                    flags &= 16 /* DisallowClassVarWrites */;
                                 }
                             }
                         }
@@ -3841,7 +3872,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // No attribute of that name was found. If this is a member access
         // through an object, see if there's an attribute access override
         // method ("__getattr__", etc.).
-        if ((flags & (1 /* AccessClassMembersOnly */ | 64 /* SkipAttributeAccessOverride */)) ===
+        if ((flags & (1 /* AccessClassMembersOnly */ | 128 /* SkipAttributeAccessOverride */)) ===
             0) {
             const generalAttrType = applyAttributeAccessOverride(classType, errorNode, usage, memberName);
             if (generalAttrType) {
@@ -3862,7 +3893,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // if they apply. Also binds methods to the class/object through which it
     // is accessed.
     function applyDescriptorAccessMethod(type, memberInfo, baseTypeClass, bindToType, isAccessedThroughObject, flags, errorNode, memberName, usage, diag) {
-        const treatConstructorAsClassMember = (flags & 16 /* TreatConstructorAsClassMethod */) !== 0;
+        const treatConstructorAsClassMember = (flags & 32 /* TreatConstructorAsClassMethod */) !== 0;
         let isTypeValid = true;
         let isAsymmetricAccessor = false;
         type = (0, typeUtils_1.mapSubtypes)(type, (subtype) => {
@@ -4104,7 +4135,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
             if (usage.method === 'set') {
                 if (memberInfo === null || memberInfo === void 0 ? void 0 : memberInfo.symbol.isClassVar()) {
-                    if (flags & 8 /* DisallowClassVarWrites */) {
+                    if (flags & 16 /* DisallowClassVarWrites */) {
                         diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberSetClassVar().format({ name: memberName }));
                         isTypeValid = false;
                         return undefined;
@@ -4241,7 +4272,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // See if the class has a "__getattribute__" or "__getattr__" method.
             // If so, arbitrary members are supported.
             return (_a = getTypeOfClassMember(errorNode, classType, name, { method: 'get' }, 
-            /* diag */ undefined, 4 /* SkipObjectBaseClass */ | 64 /* SkipAttributeAccessOverride */)) === null || _a === void 0 ? void 0 : _a.type;
+            /* diag */ undefined, 8 /* SkipObjectBaseClass */ | 128 /* SkipAttributeAccessOverride */)) === null || _a === void 0 ? void 0 : _a.type;
         };
         let accessMemberType;
         if (usage.method === 'get') {
@@ -4656,7 +4687,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     (flags & 128 /* ExpectingInstantiableType */) === 0) {
                     const itemMethodType = getTypeOfClassMember(node, concreteSubtype, getIndexAccessMagicMethodName(usage), 
                     /* usage */ undefined, 
-                    /* diag */ undefined, 64 /* SkipAttributeAccessOverride */ | 32 /* ConsiderMetaclassOnly */);
+                    /* diag */ undefined, 128 /* SkipAttributeAccessOverride */ | 64 /* ConsiderMetaclassOnly */);
                     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({
@@ -4892,10 +4923,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const itemMethodType = (0, types_1.isClassInstance)(baseType)
             ? (_a = getTypeOfObjectMember(node, baseType, magicMethodName, 
             /* usage */ undefined, 
-            /* diag */ undefined, 64 /* SkipAttributeAccessOverride */)) === null || _a === void 0 ? void 0 : _a.type
+            /* diag */ undefined, 128 /* SkipAttributeAccessOverride */)) === null || _a === void 0 ? void 0 : _a.type
             : (_b = getTypeOfClassMember(node, baseType, magicMethodName, 
             /* usage */ undefined, 
-            /* diag */ undefined, 64 /* SkipAttributeAccessOverride */ | 32 /* ConsiderMetaclassOnly */)) === null || _b === void 0 ? void 0 : _b.type;
+            /* diag */ undefined, 128 /* SkipAttributeAccessOverride */ | 64 /* ConsiderMetaclassOnly */)) === null || _b === void 0 ? void 0 : _b.type;
         if (!itemMethodType) {
             const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
             addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.methodNotDefinedOnType().format({
@@ -5262,7 +5293,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         matchingSubtype = subtype;
                     }
                 }
-            });
+            }, 
+            /* sortSubtypes */ true);
             effectiveExpectedType = matchingSubtype;
         }
         let expectedTypeDiagAddendum;
@@ -6099,7 +6131,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if (!isDiagnosticSuppressedForNode(errorNode)) {
                 const functionName = typeResult.type.overloads[0].details.name || '<anonymous function>';
                 const diagAddendum = new diagnostic_1.DiagnosticAddendum();
-                const argTypes = argList.map((t) => printType(getTypeOfArgument(t).type));
+                const argTypes = argList.map((t) => {
+                    const typeString = printType(getTypeOfArgument(t).type);
+                    if (t.argumentCategory === 1 /* UnpackedList */) {
+                        return `*${typeString}`;
+                    }
+                    if (t.argumentCategory === 2 /* UnpackedDictionary */) {
+                        return `**${typeString}`;
+                    }
+                    return typeString;
+                });
                 diagAddendum.addMessage(localize_1.Localizer.DiagnosticAddendum.argumentTypes().format({ types: argTypes.join(', ') }));
                 addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.noOverload().format({ name: functionName }) + diagAddendum.getString(), errorNode);
             }
@@ -6603,7 +6644,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         var _a, _b;
         const memberType = (_a = getTypeOfObjectMember(errorNode, expandedCallType, '__call__', 
         /* usage */ undefined, 
-        /* diag */ undefined, 64 /* SkipAttributeAccessOverride */ | 1 /* AccessClassMembersOnly */)) === null || _a === void 0 ? void 0 : _a.type;
+        /* diag */ undefined, 128 /* 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),
@@ -7556,7 +7597,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             return subtype;
                         }
                         return undefined;
-                    });
+                    }, 
+                    /* sortSubtypes */ true);
                     if ((0, types_1.isClassInstance)(filteredType)) {
                         effectiveExpectedType = filteredType;
                     }
@@ -8242,15 +8284,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
@@ -8667,6 +8711,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 functionType.details.paramSpec = typeResult.type;
                 return functionType;
             }
+            if ((0, types_1.isClassInstance)(typeResult.type) && types_1.ClassType.isBuiltIn(typeResult.type, 'ellipsis')) {
+                types_1.FunctionType.addDefaultParameters(functionType);
+                return functionType;
+            }
         }
         addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.paramSpecDefaultNotTuple(), node);
         return undefined;
@@ -8924,12 +8972,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if ((0, types_1.isClassInstance)(concreteSubtype)) {
                 magicMethodType = (_a = getTypeOfObjectMember(errorNode, concreteSubtype, magicMethodName, 
                 /* usage */ undefined, 
-                /* diag */ undefined, 64 /* SkipAttributeAccessOverride */ | 1 /* AccessClassMembersOnly */)) === null || _a === void 0 ? void 0 : _a.type;
+                /* diag */ undefined, 128 /* SkipAttributeAccessOverride */ | 1 /* AccessClassMembersOnly */)) === null || _a === void 0 ? void 0 : _a.type;
             }
             else if ((0, types_1.isInstantiableClass)(concreteSubtype)) {
                 magicMethodType = (_b = getTypeOfClassMember(errorNode, concreteSubtype, magicMethodName, 
                 /* usage */ undefined, 
-                /* diag */ undefined, 64 /* SkipAttributeAccessOverride */ | 32 /* ConsiderMetaclassOnly */)) === null || _b === void 0 ? void 0 : _b.type;
+                /* diag */ undefined, 128 /* SkipAttributeAccessOverride */ | 64 /* ConsiderMetaclassOnly */)) === null || _b === void 0 ? void 0 : _b.type;
             }
             if (magicMethodType) {
                 const functionArgs = args.map((arg) => {
@@ -9018,7 +9066,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         matchingSubtypeResult = subtypeResult;
                     }
                 }
-            });
+            }, 
+            /* sortSubtypes */ true);
             effectiveExpectedType = matchingSubtype;
         }
         let expectedTypeDiagAddendum = undefined;
@@ -9335,7 +9384,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         matchingSubtypeResult = subtypeResult;
                     }
                 }
-            });
+            }, 
+            /* sortSubtypes */ true);
             effectiveExpectedType = matchingSubtype;
         }
         let expectedTypeDiagAddendum;
@@ -10141,7 +10191,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) &&
@@ -11803,8 +11853,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const initSubclassMethodInfo = getTypeOfClassMemberName(errorNode, classType, 
         /* isAccessedThroughObject */ false, '__init_subclass__', { method: 'get' }, 
         /* diag */ undefined, 1 /* AccessClassMembersOnly */ |
-            4 /* SkipObjectBaseClass */ |
-            128 /* SkipOriginalClass */, classType);
+            8 /* SkipObjectBaseClass */ |
+            256 /* SkipOriginalClass */, classType);
         if (initSubclassMethodInfo) {
             const initSubclassMethodType = initSubclassMethodInfo.type;
             if (initSubclassMethodType) {
@@ -11815,7 +11865,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         else if (classType.details.effectiveMetaclass && (0, types_1.isClass)(classType.details.effectiveMetaclass)) {
             // See if the metaclass has a `__new__` method that accepts keyword parameters.
-            const newMethodMember = (0, typeUtils_1.lookUpClassMember)(classType.details.effectiveMetaclass, '__new__', 32 /* SkipTypeBaseClass */);
+            const newMethodMember = (0, typeUtils_1.lookUpClassMember)(classType.details.effectiveMetaclass, '__new__', 64 /* SkipTypeBaseClass */);
             if (newMethodMember) {
                 const newMethodType = getTypeOfMember(newMethodMember);
                 if ((0, types_1.isFunction)(newMethodType)) {
@@ -11878,20 +11928,72 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         });
     }
     function getTypeOfFunction(node) {
-        var _a, _b;
-        const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
-        // Is this type already cached?
-        const cachedFunctionType = readTypeCache(node.name, 0 /* None */);
-        if (cachedFunctionType) {
-            if (!(0, types_1.isFunction)(cachedFunctionType)) {
+        // Is this predecorated function type cached?
+        let functionType = readTypeCache(node.name, 0 /* None */);
+        if (functionType) {
+            if (!(0, types_1.isFunction)(functionType)) {
                 // This can happen in certain rare circumstances where the
                 // function declaration falls within an unreachable code block.
                 return undefined;
             }
-            return {
-                functionType: cachedFunctionType,
-                decoratedType: readTypeCache(node, 0 /* None */) || types_1.UnknownType.create(),
-            };
+        }
+        else {
+            functionType = getTypeOfFunctionPredecorated(node);
+        }
+        // Is the decorated function type cached?
+        let decoratedType = readTypeCache(node, 0 /* None */);
+        if (decoratedType) {
+            return { functionType, decoratedType };
+        }
+        // Populate the cache with a temporary value to handle recursion.
+        writeTypeCache(node, { type: functionType }, /* flags */ undefined);
+        // If it's an async function, wrap the return type in an Awaitable or Generator.
+        // Set the "partially evaluated" flag around this logic to detect recursion.
+        functionType.details.flags |= 131072 /* PartiallyEvaluated */;
+        const preDecoratedType = node.isAsync ? createAsyncFunction(node, functionType) : functionType;
+        functionType.details.flags &= ~131072 /* PartiallyEvaluated */;
+        // Apply all of the decorators in reverse order.
+        decoratedType = preDecoratedType;
+        let foundUnknown = false;
+        for (let i = node.decorators.length - 1; i >= 0; i--) {
+            const decorator = node.decorators[i];
+            const newDecoratedType = (0, decorators_1.applyFunctionDecorator)(evaluatorInterface, decoratedType, functionType, decorator, node);
+            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) {
+                    const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
+                    addDiagnostic(fileInfo.diagnosticRuleSet.reportUntypedFunctionDecorator, diagnosticRules_1.DiagnosticRule.reportUntypedFunctionDecorator, localize_1.Localizer.Diagnostic.functionDecoratorTypeUnknown(), node.decorators[i].expression);
+                    foundUnknown = true;
+                }
+            }
+            else {
+                // Apply the decorator only if the type is known.
+                decoratedType = newDecoratedType;
+            }
+        }
+        // See if there are any overloads provided by previous function declarations.
+        if ((0, types_1.isFunction)(decoratedType)) {
+            if (types_1.FunctionType.isOverloaded(decoratedType)) {
+                // Mark all the parameters as accessed.
+                node.parameters.forEach((param) => {
+                    markParamAccessed(param);
+                });
+            }
+            decoratedType = (0, decorators_1.addOverloadsToFunctionType)(evaluatorInterface, node, decoratedType);
+        }
+        writeTypeCache(node, { type: decoratedType }, 0 /* None */);
+        return { functionType, decoratedType };
+    }
+    // Evaluates the type of a "def" statement without applying an async
+    // modifier or any decorators.
+    function getTypeOfFunctionPredecorated(node) {
+        var _a, _b, _c;
+        const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
+        // Is this type already cached?
+        const cachedFunctionType = readTypeCache(node.name, 0 /* None */);
+        if (cachedFunctionType && (0, types_1.isFunction)(cachedFunctionType)) {
+            return cachedFunctionType;
         }
         let functionDecl;
         const decl = AnalyzerNodeInfo.getDeclaration(node);
@@ -11903,11 +12005,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const containingClassNode = ParseTreeUtils.getEnclosingClass(node, /* stopAtFunction */ true);
         let containingClassType;
         if (containingClassNode) {
-            const classInfo = getTypeOfClass(containingClassNode);
-            if (!classInfo) {
-                return undefined;
-            }
-            containingClassType = classInfo.classType;
+            containingClassType = (_a = getTypeOfClass(containingClassNode)) === null || _a === void 0 ? void 0 : _a.classType;
         }
         let functionFlags = (0, decorators_1.getFunctionFlagsFromDecorators)(evaluatorInterface, node, !!containingClassNode);
         if (functionDecl === null || functionDecl === void 0 ? void 0 : functionDecl.isGenerator) {
@@ -11936,14 +12034,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             functionType.details.builtInName = node.name.value;
         }
         functionType.details.declaration = functionDecl;
-        // Allow recursion by registering the partially-constructed
-        // function type.
+        // Allow recursion by caching and registering the partially-constructed function type.
         const scope = ScopeUtils.getScopeForNode(node);
         const functionSymbol = scope === null || scope === void 0 ? void 0 : scope.lookUpSymbolRecursive(node.name.value);
         if (functionDecl && functionSymbol) {
             setSymbolResolutionPartialType(functionSymbol.symbol, functionDecl, functionType);
         }
-        writeTypeCache(node, { type: functionType }, /* flags */ undefined);
         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.
@@ -11983,14 +12079,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         else {
             functionType.details.typeParameters = typeParametersSeen;
         }
-        const markParamAccessed = (param) => {
-            if (param.name) {
-                const symbolWithScope = lookUpSymbolRecursive(param.name, param.name.value, /* honorCodeFlow */ false);
-                if (symbolWithScope) {
-                    setSymbolAccessed(fileInfo, symbolWithScope.symbol, param.name);
-                }
-            }
-        };
         let paramsArePositionOnly = true;
         const isFirstParamClsOrSelf = containingClassType &&
             (types_1.FunctionType.isClassMethod(functionType) ||
@@ -12172,7 +12260,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // 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;
+        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();
@@ -12225,43 +12313,19 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
             validateTypeParameterDefault(bestErrorNode, typeParam, functionType.details.typeParameters.slice(0, index));
         });
-        // If it's an async function, wrap the return type in an Awaitable or Generator.
-        const preDecoratedType = node.isAsync ? createAsyncFunction(node, functionType) : functionType;
         // Clear the "partially evaluated" flag to indicate that the functionType
         // is fully evaluated.
         functionType.details.flags &= ~131072 /* PartiallyEvaluated */;
-        // Apply all of the decorators in reverse order.
-        let decoratedType = preDecoratedType;
-        let foundUnknown = false;
-        for (let i = node.decorators.length - 1; i >= 0; i--) {
-            const decorator = node.decorators[i];
-            const newDecoratedType = (0, decorators_1.applyFunctionDecorator)(evaluatorInterface, decoratedType, functionType, decorator, node);
-            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.reportUntypedFunctionDecorator, diagnosticRules_1.DiagnosticRule.reportUntypedFunctionDecorator, localize_1.Localizer.Diagnostic.functionDecoratorTypeUnknown(), node.decorators[i].expression);
-                    foundUnknown = true;
-                }
-            }
-            else {
-                // Apply the decorator only if the type is known.
-                decoratedType = newDecoratedType;
-            }
-        }
-        // See if there are any overloads provided by previous function declarations.
-        if ((0, types_1.isFunction)(decoratedType)) {
-            if (types_1.FunctionType.isOverloaded(decoratedType)) {
-                // Mark all the parameters as accessed.
-                node.parameters.forEach((param) => {
-                    markParamAccessed(param);
-                });
+        writeTypeCache(node.name, { type: functionType }, 0 /* None */);
+        return functionType;
+    }
+    function markParamAccessed(param) {
+        if (param.name) {
+            const symbolWithScope = lookUpSymbolRecursive(param.name, param.name.value, /* honorCodeFlow */ false);
+            if (symbolWithScope) {
+                setSymbolAccessed(AnalyzerNodeInfo.getFileInfo(param), symbolWithScope.symbol, param.name);
             }
-            decoratedType = (0, decorators_1.addOverloadsToFunctionType)(evaluatorInterface, node, decoratedType);
         }
-        writeTypeCache(node.name, { type: functionType }, 0 /* None */);
-        writeTypeCache(node, { type: decoratedType }, 0 /* None */);
-        return { functionType, decoratedType };
     }
     // If the declared return type of a function contains type variables that
     // are found nowhere else in the signature and are contained within a
@@ -12852,6 +12916,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;
@@ -14211,7 +14283,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     if ((0, types_1.isInstantiableClass)(subtype)) {
                         // Try to find a member that has a declared type. If so, that
                         // overrides any inferred types.
-                        let member = (0, typeUtils_1.lookUpClassMember)(subtype, memberName, 16 /* DeclaredTypesOnly */);
+                        let member = (0, typeUtils_1.lookUpClassMember)(subtype, memberName, 32 /* DeclaredTypesOnly */);
                         if (!member) {
                             member = (0, typeUtils_1.lookUpClassMember)(subtype, memberName);
                         }
@@ -14228,7 +14300,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     else if ((0, types_1.isClassInstance)(subtype)) {
                         // Try to find a member that has a declared type. If so, that
                         // overrides any inferred types.
-                        let member = (0, typeUtils_1.lookUpObjectMember)(subtype, memberName, 16 /* DeclaredTypesOnly */);
+                        let member = (0, typeUtils_1.lookUpObjectMember)(subtype, memberName, 32 /* DeclaredTypesOnly */);
                         if (!member) {
                             member = (0, typeUtils_1.lookUpObjectMember)(subtype, memberName);
                         }
@@ -14294,7 +14366,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                     else if ((0, types_1.isInstantiableClass)(baseType)) {
                         const initMethodType = (_b = getTypeOfObjectMember(argNode.parent.leftExpression, types_1.ClassType.cloneAsInstance(baseType), '__init__', { method: 'get' }, 
-                        /* diag */ undefined, 4 /* SkipObjectBaseClass */)) === null || _b === void 0 ? void 0 : _b.type;
+                        /* diag */ undefined, 8 /* SkipObjectBaseClass */)) === null || _b === void 0 ? void 0 : _b.type;
                         if (initMethodType && (0, types_1.isFunction)(initMethodType)) {
                             const paramDecl = getDeclarationFromFunctionNamedParameter(initMethodType, paramName);
                             if (paramDecl) {
@@ -14844,6 +14916,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;
@@ -14862,12 +14935,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) {
@@ -14876,6 +14944,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 isIncomplete: false,
                 includesVariableDecl: false,
                 includesIllegalTypeAliasDecl: !decls.every((decl) => isPossibleTypeAliasDeclaration(decl)),
+                includesSpeculativeResult: false,
                 isRecursiveDefinition: false,
             };
             addToEffectiveTypeCache(result);
@@ -14902,22 +14971,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 */) {
@@ -14926,122 +14999,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
@@ -15595,72 +15679,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)) {
@@ -15674,13 +15751,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;
     }
@@ -15751,7 +15833,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (destType.typeArguments) {
             // If the dest type is specialized, make sure the specialized source
             // type arguments are assignable to the dest type arguments.
-            return assignTypeArguments(destType, curSrcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
+            return assignTypeArguments(destType, curSrcType, 
+            // Don't emit a diag addendum if we're in an invariant context. It's
+            // sufficient to simply indicate that the types are not the same
+            // in this case. Adding more information is unnecessary and confusing.
+            (flags & 1 /* EnforceInvariance */) === 0 ? diag : undefined, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
         }
         if (destTypeVarContext && curSrcType.typeArguments && !destTypeVarContext.isLocked()) {
             // Populate the typeVar map with type arguments of the source.
@@ -15939,7 +16025,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;
             }
@@ -16040,6 +16129,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;
@@ -16146,9 +16246,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         if ((0, types_1.isInstantiableClass)(destType)) {
             if ((0, types_1.isInstantiableClass)(expandedSrcType)) {
-                // PEP 544 says that if the dest type is a Type[Proto] class,
+                // PEP 544 says that if the dest type is a type[Proto] class,
                 // the source must be a "concrete" (non-protocol) class.
-                if (types_1.ClassType.isProtocolClass(destType)) {
+                if (types_1.ClassType.isProtocolClass(destType) &&
+                    (flags & 4096 /* IgnoreProtocolAssignmentCheck */) === 0) {
                     if (types_1.ClassType.isProtocolClass(expandedSrcType) &&
                         (0, types_1.isInstantiableClass)(srcType) &&
                         !srcType.includeSubclasses) {
@@ -17770,8 +17871,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),
@@ -17829,8 +17929,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),