@zzzen/pyright-internal 1.2.0-dev.20230903 → 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;
@@ -1243,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,
@@ -1261,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() };
@@ -1489,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;
                                 }
@@ -1506,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
@@ -1517,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;
                 }
@@ -2212,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);
@@ -2351,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 }], 
@@ -3230,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
@@ -3696,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) {
@@ -3746,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 */;
                                 }
                             }
                         }
@@ -3848,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) {
@@ -3869,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) => {
@@ -4111,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;
@@ -4248,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') {
@@ -4663,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({
@@ -4899,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({
@@ -5269,7 +5293,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         matchingSubtype = subtype;
                     }
                 }
-            });
+            }, 
+            /* sortSubtypes */ true);
             effectiveExpectedType = matchingSubtype;
         }
         let expectedTypeDiagAddendum;
@@ -6106,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);
             }
@@ -6610,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),
@@ -7563,7 +7597,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             return subtype;
                         }
                         return undefined;
-                    });
+                    }, 
+                    /* sortSubtypes */ true);
                     if ((0, types_1.isClassInstance)(filteredType)) {
                         effectiveExpectedType = filteredType;
                     }
@@ -8676,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;
@@ -8933,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) => {
@@ -9027,7 +9066,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         matchingSubtypeResult = subtypeResult;
                     }
                 }
-            });
+            }, 
+            /* sortSubtypes */ true);
             effectiveExpectedType = matchingSubtype;
         }
         let expectedTypeDiagAddendum = undefined;
@@ -9344,7 +9384,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         matchingSubtypeResult = subtypeResult;
                     }
                 }
-            });
+            }, 
+            /* sortSubtypes */ true);
             effectiveExpectedType = matchingSubtype;
         }
         let expectedTypeDiagAddendum;
@@ -11812,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) {
@@ -11824,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)) {
@@ -11887,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);
@@ -11912,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) {
@@ -11945,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.
@@ -11992,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) ||
@@ -12181,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();
@@ -12234,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
@@ -14228,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);
                         }
@@ -14245,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);
                         }
@@ -14311,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) {
@@ -15778,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.
@@ -16187,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) {