@zzzen/pyright-internal 1.2.0-dev.20230219 → 1.2.0-dev.20230305

package/dist/analyzer/typeEvaluator.js

@@ -298,8 +298,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
     }
     function isTypeCached(node) {
-        const cachedEntry = readTypeCacheEntry(node);
-        return cachedEntry !== undefined && !cachedEntry.typeResult.isIncomplete;
+        const cacheEntry = readTypeCacheEntry(node);
+        if (!cacheEntry) {
+            return false;
+        }
+        return (!cacheEntry.typeResult.isIncomplete || cacheEntry.incompleteGenerationCount === incompleteGenerationCount);
     }
     function readTypeCache(node, flags) {
         var _a, _b;
@@ -689,7 +692,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     typeResult.type = types_1.UnknownType.create();
                 }
             }
-            if (!types_1.TypeBase.isInstantiable(typeResult.type)) {
+            if (!(0, typeUtils_1.isEffectivelyInstantiable)(typeResult.type)) {
                 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;
@@ -997,6 +1000,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (options === null || options === void 0 ? void 0 : options.notParsedByInterpreter) {
             evaluatorFlags |= 524288 /* NotParsedByInterpreter */;
         }
+        if (options === null || options === void 0 ? void 0 : options.allowRequired) {
+            evaluatorFlags |= 1048576 /* AllowRequired */;
+        }
         if ((0, analyzerFileInfo_1.isAnnotationEvaluationPostponed)(fileInfo)) {
             evaluatorFlags |= 4 /* AllowForwardReferences */;
         }
@@ -1493,7 +1499,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 /* honorCodeFlow */ false);
                 if (symbolWithScope) {
                     const symbol = symbolWithScope.symbol;
-                    return symbol.getDeclarations().find((decl) => (0, declarationUtils_1.isExplicitTypeAliasDeclaration)(decl)) !== undefined;
+                    return symbol.getDeclarations().find((decl) => isExplicitTypeAliasDeclaration(decl)) !== undefined;
                 }
             }
         }
@@ -1501,6 +1507,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     }
     // Determines whether the specified expression is a symbol with a declared type.
     function getDeclaredTypeForExpression(expression, usage) {
+        var _a, _b;
         let symbol;
         let classOrObjectBase;
         let memberAccessClass;
@@ -1513,7 +1520,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     // Handle the case where the symbol is a class-level variable
                     // where the type isn't declared in this class but is in
                     // a parent class.
-                    if (getDeclaredTypeOfSymbol(symbol, expression) === undefined &&
+                    if (!((_a = getDeclaredTypeOfSymbol(symbol, expression)) === null || _a === void 0 ? void 0 : _a.type) &&
                         symbolWithScope.scope.type === 2 /* Class */) {
                         const enclosingClass = ParseTreeUtils.getEnclosingClassOrFunction(expression);
                         if (enclosingClass && enclosingClass.nodeType === 10 /* Class */) {
@@ -1587,7 +1594,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
         }
         if (symbol) {
-            let declaredType = getDeclaredTypeOfSymbol(symbol);
+            let declaredType = (_b = getDeclaredTypeOfSymbol(symbol)) === null || _b === void 0 ? void 0 : _b.type;
             if (declaredType) {
                 // If it's a descriptor, we need to get the setter type.
                 if ((0, types_1.isClassInstance)(declaredType)) {
@@ -2027,7 +2034,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const diag = new diagnostic_1.DiagnosticAddendum();
         if ((0, types_1.isUnion)(type)) {
             (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
-                if (!types_1.TypeBase.isInstantiable(subtype)) {
+                if (!(0, typeUtils_1.isEffectivelyInstantiable)(subtype)) {
                     diag.addMessage(localize_1.Localizer.DiagnosticAddendum.typeNotClass().format({ type: printType(subtype) }));
                 }
             });
@@ -2035,7 +2042,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeExpectedClass().format({ type: printType(type) }) + diag.getString(), node);
     }
     function assignTypeToNameNode(nameNode, type, isTypeIncomplete, ignoreEmptyContainers, srcExpression, allowAssignmentToFinalVar = false, expectedTypeDiagAddendum) {
-        var _a, _b;
+        var _a, _b, _c;
         const nameValue = nameNode.value;
         const symbolWithScope = lookUpSymbolRecursive(nameNode, nameValue, /* honorCodeFlow */ false);
         if (!symbolWithScope) {
@@ -2044,7 +2051,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             return;
         }
         const declarations = symbolWithScope.symbol.getDeclarations();
-        let declaredType = getDeclaredTypeOfSymbol(symbolWithScope.symbol);
+        let declaredType = (_a = getDeclaredTypeOfSymbol(symbolWithScope.symbol)) === null || _a === void 0 ? void 0 : _a.type;
         const fileInfo = AnalyzerNodeInfo.getFileInfo(nameNode);
         // If this is a class scope and there is no type declared for this class variable,
         // see if a parent class has a type declared.
@@ -2062,7 +2069,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         // We found an existing declared type. Make sure the type is assignable.
         let destType = type;
-        if (declaredType) {
+        const isTypeAlias = !!declaredType && (0, types_1.isClassInstance)(declaredType) && types_1.ClassType.isBuiltIn(declaredType, 'TypeAlias');
+        if (declaredType && !isTypeAlias) {
             let diagAddendum = new diagnostic_1.DiagnosticAddendum();
             if (!assignType(declaredType, type, diagAddendum)) {
                 // If there was an expected type mismatch, use that diagnostic
@@ -2073,7 +2081,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeAssignmentMismatch().format({
                     sourceType: printType(type),
                     destType: printType(declaredType),
-                }) + diagAddendum.getString(), srcExpression !== null && srcExpression !== void 0 ? srcExpression : nameNode, (_b = (_a = diagAddendum.getEffectiveTextRange()) !== null && _a !== void 0 ? _a : srcExpression) !== null && _b !== void 0 ? _b : nameNode);
+                }) + diagAddendum.getString(), srcExpression !== null && srcExpression !== void 0 ? srcExpression : nameNode, (_c = (_b = diagAddendum.getEffectiveTextRange()) !== null && _b !== void 0 ? _b : srcExpression) !== null && _c !== void 0 ? _c : nameNode);
                 // Replace the assigned type with the (unnarrowed) declared type.
                 destType = declaredType;
             }
@@ -2091,7 +2099,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if ((scope === null || scope === void 0 ? void 0 : scope.type) === 2 /* Class */) {
                 if (types_1.TypeBase.isInstance(destType) &&
                     !(0, symbolNameUtils_1.isConstantName)(nameValue) &&
-                    !(0, symbolUtils_1.isFinalVariable)(symbolWithScope.symbol)) {
+                    !isFinalVariable(symbolWithScope.symbol)) {
                     destType = stripLiteralValue(destType);
                 }
             }
@@ -2105,7 +2113,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     addDiagnostic(fileInfo.diagnosticRuleSet.reportConstantRedefinition, diagnosticRules_1.DiagnosticRule.reportConstantRedefinition, localize_1.Localizer.Diagnostic.constantRedefinition().format({ name: nameValue }), nameNode);
                 }
             }
-            else if (varDecl.isFinal && !allowAssignmentToFinalVar) {
+            else if (isFinalVariableDeclaration(varDecl) && !allowAssignmentToFinalVar) {
                 addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.finalReassigned().format({ name: nameValue }), nameNode);
             }
         }
@@ -2160,6 +2168,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         writeTypeCache(target, { type, isIncomplete: isTypeIncomplete }, 0 /* None */);
     }
     function assignTypeToMemberVariable(node, srcType, isTypeIncomplete, isInstanceMember, srcExprNode) {
+        var _a;
         const memberName = node.memberName.value;
         const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
         const classDef = ParseTreeUtils.getEnclosingClass(node);
@@ -2218,7 +2227,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
                 else {
                     // Is the target a property?
-                    const declaredType = getDeclaredTypeOfSymbol(memberInfo.symbol);
+                    const declaredType = (_a = getDeclaredTypeOfSymbol(memberInfo.symbol)) === null || _a === void 0 ? void 0 : _a.type;
                     if (declaredType && !(0, typeUtils_1.isProperty)(declaredType)) {
                         // Handle the case where there is a class variable defined with the same
                         // name, but there's also now an instance variable introduced. Combine the
@@ -3117,6 +3126,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // type arguments. If so, it fills in these type arguments with Unknown
     // and optionally reports an error.
     function reportMissingTypeArguments(node, type, flags) {
+        var _a;
         if ((flags & 2 /* DoNotSpecialize */) !== 0) {
             return type;
         }
@@ -3130,7 +3140,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
             }
             if (!type.typeArguments) {
-                type = createSpecializedClassType(type, /* typeArgs */ undefined, flags, node);
+                type = (_a = createSpecializedClassType(type, /* typeArgs */ undefined, flags, node)) === null || _a === void 0 ? void 0 : _a.type;
             }
         }
         // Is this a generic type alias that needs to be specialized?
@@ -3348,7 +3358,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return typeResult;
     }
     function getTypeOfMemberAccessWithBaseType(node, baseTypeResult, usage, flags) {
-        var _a, _b;
+        var _a, _b, _c;
         let baseType = baseTypeResult.type;
         const memberName = node.memberName.value;
         let diag = new diagnostic_1.DiagnosticAddendum();
@@ -3356,6 +3366,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         let type;
         let isIncomplete = !!baseTypeResult.isIncomplete;
         let isAsymmetricDescriptor;
+        const isRequired = false;
+        const isNotRequired = false;
         // If the base type was incomplete and unbound, don't proceed
         // because false positive errors will be generated.
         if (baseTypeResult.isIncomplete && (0, types_1.isUnbound)(baseTypeResult.type)) {
@@ -3514,7 +3526,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                     if (!type) {
                         if (!isIncomplete) {
-                            addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.moduleUnknownMember().format({ name: memberName }), node.memberName);
+                            addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.moduleUnknownMember().format({
+                                memberName,
+                                moduleName: baseType.moduleName,
+                            }), node.memberName);
                         }
                         type = evaluatorOptions.evaluateUnknownImportsAsAny ? types_1.AnyType.create() : types_1.UnknownType.create();
                     }
@@ -3628,7 +3643,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // Should we specialize the class?
         if ((flags & 2 /* DoNotSpecialize */) === 0) {
             if ((0, types_1.isInstantiableClass)(type) && !type.typeArguments) {
-                type = createSpecializedClassType(type, /* typeArgs */ undefined, flags, node);
+                type = (_b = createSpecializedClassType(type, /* typeArgs */ undefined, flags, node)) === null || _b === void 0 ? void 0 : _b.type;
             }
         }
         if (usage.method === 'get') {
@@ -3639,7 +3654,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // It can also come up in cases like "isinstance(x, (list, dict))".
             if ((0, types_1.isInstantiableClass)(type)) {
                 const argNode = ParseTreeUtils.getParentNodeOfType(node, 1 /* Argument */);
-                if (argNode && ((_b = argNode === null || argNode === void 0 ? void 0 : argNode.parent) === null || _b === void 0 ? void 0 : _b.nodeType) === 9 /* Call */) {
+                if (argNode && ((_c = argNode === null || argNode === void 0 ? void 0 : argNode.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 9 /* Call */) {
                     skipPartialUnknownCheck = true;
                 }
             }
@@ -3648,10 +3663,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 /* ignoreEmptyContainers */ false);
             }
         }
-        return { type, isIncomplete, isAsymmetricDescriptor };
+        return { type, isIncomplete, isAsymmetricDescriptor, isRequired, isNotRequired };
     }
     function getTypeOfClassMemberName(errorNode, classType, isAccessedThroughObject, memberName, usage, diag, flags, bindToType) {
-        var _a, _b;
+        var _a, _b, _c;
         let classLookupFlags = 0 /* Default */;
         if (flags & 1 /* AccessClassMembersOnly */) {
             classLookupFlags |= 8 /* SkipInstanceVariables */;
@@ -3692,7 +3707,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     if (containingClassType &&
                         (0, types_1.isInstantiableClass)(containingClassType) &&
                         types_1.ClassType.isSameGenericClass(containingClassType, classType)) {
-                        type = (_b = getDeclaredTypeOfSymbol(memberInfo.symbol)) !== null && _b !== void 0 ? _b : types_1.UnknownType.create();
+                        type = (_c = (_b = getDeclaredTypeOfSymbol(memberInfo.symbol)) === null || _b === void 0 ? void 0 : _b.type) !== null && _c !== void 0 ? _c : types_1.UnknownType.create();
                         if (type && (0, types_1.isInstantiableClass)(memberInfo.classType)) {
                             type = (0, typeUtils_1.partiallySpecializeType)(type, memberInfo.classType);
                         }
@@ -3703,8 +3718,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // Determine whether to replace Self variables with a specific
                 // class. Avoid doing this if there's a "bindToType" specified
                 // because that case is used for super() calls where we want
-                // to leave the Self type generic (not specialized).
-                const selfClass = bindToType ? undefined : classType;
+                // to leave the Self type generic (not specialized). We'll also
+                // skip this for __new__ methods because they are not bound
+                // to the class but rather assume the type of the cls argument.
+                const selfClass = bindToType || memberName === '__new__' ? undefined : classType;
                 const typeResult = getTypeOfMemberInternal(memberInfo, selfClass);
                 if (typeResult) {
                     type = typeResult.type;
@@ -4030,7 +4047,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                 }
                 // Check for an attempt to overwrite a final member variable.
-                const finalVarTypeDecl = memberInfo === null || memberInfo === void 0 ? void 0 : memberInfo.symbol.getDeclarations().find((decl) => (0, declarationUtils_1.isFinalVariableDeclaration)(decl));
+                const finalVarTypeDecl = memberInfo === null || memberInfo === void 0 ? void 0 : memberInfo.symbol.getDeclarations().find((decl) => isFinalVariableDeclaration(decl));
                 if (finalVarTypeDecl && !ParseTreeUtils.isNodeContainedWithin(errorNode, finalVarTypeDecl.node)) {
                     // If a Final instance variable is declared in the class body but is
                     // being assigned within an __init__ method, it's allowed.
@@ -4251,20 +4268,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (baseTypeResult.isIncomplete) {
             indexTypeResult.isIncomplete = true;
         }
-        // Handle "Required" and "NotRequired" specially.
-        if ((flags & 1048576 /* AllowRequired */) !== 0) {
-            if ((0, types_1.isInstantiableClass)(baseTypeResult.type)) {
-                if (types_1.ClassType.isBuiltIn(baseTypeResult.type, 'Required')) {
-                    indexTypeResult.isRequired = true;
-                }
-                else if (types_1.ClassType.isBuiltIn(baseTypeResult.type, 'NotRequired')) {
-                    indexTypeResult.isNotRequired = true;
-                }
-            }
-        }
         return indexTypeResult;
     }
-    function adjustTypeArgumentsForVariadicTypeVar(typeArgs, typeParameters, typeVarScopeId, errorNode) {
+    function adjustTypeArgumentsForVariadicTypeVar(typeArgs, typeParameters, errorNode) {
         const variadicIndex = typeParameters.findIndex((param) => (0, types_1.isVariadicTypeVar)(param));
         // Do we need to adjust the type arguments to map to a variadic type
         // param at the end of the list?
@@ -4336,7 +4342,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // Handles index expressions that are providing type arguments for a
     // generic type alias.
     function createSpecializedTypeAlias(node, baseType, flags) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!((_a = baseType.typeAliasInfo) === null || _a === void 0 ? void 0 : _a.typeParameters) ||
             (baseType.typeAliasInfo.typeParameters.length === 0 && baseType.typeAliasInfo.typeArguments)) {
             return undefined;
@@ -4350,7 +4356,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             return undefined;
         }
         const typeParameters = baseType.typeAliasInfo.typeParameters;
-        let typeArgs = adjustTypeArgumentsForVariadicTypeVar(getTypeArgs(node, flags), typeParameters, baseType.typeAliasInfo.typeVarScopeId, node);
+        let typeArgs = adjustTypeArgumentsForVariadicTypeVar(getTypeArgs(node, flags), typeParameters, node);
         // PEP 612 says that if the class has only one type parameter consisting
         // of a ParamSpec, the list of arguments does not need to be enclosed in
         // a list. We'll handle that case specially here. Presumably this applies to
@@ -4366,13 +4372,26 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 ];
             }
         }
-        if (typeArgs.length > typeParameters.length &&
-            !typeParameters.some((typeVar) => typeVar.details.isVariadic && !typeVar.isVariadicInUnion)) {
-            addError(localize_1.Localizer.Diagnostic.typeArgsTooMany().format({
-                name: printType(baseType),
-                expected: typeParameters.length,
-                received: typeArgs.length,
-            }), typeArgs[typeParameters.length].node);
+        if (!typeParameters.some((typeVar) => typeVar.details.isVariadic && !typeVar.isVariadicInUnion)) {
+            let minTypeArgCount = typeParameters.length;
+            const firstNonDefaultParam = typeParameters.findIndex((param) => !!param.details.defaultType);
+            if (firstNonDefaultParam >= 0) {
+                minTypeArgCount = firstNonDefaultParam;
+            }
+            if (typeArgs.length > typeParameters.length) {
+                addError(localize_1.Localizer.Diagnostic.typeArgsTooMany().format({
+                    name: printType(baseType),
+                    expected: typeParameters.length,
+                    received: typeArgs.length,
+                }), typeArgs[typeParameters.length].node);
+            }
+            else if (typeArgs.length < minTypeArgCount) {
+                addError(localize_1.Localizer.Diagnostic.typeArgsTooFew().format({
+                    name: printType(baseType),
+                    expected: typeParameters.length,
+                    received: typeArgs.length,
+                }), node.items[node.items.length - 1]);
+            }
         }
         // Handle the mypy_extensions.FlexibleAlias type specially.
         if ((0, types_1.isInstantiableClass)(baseType) &&
@@ -4455,15 +4474,31 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 else {
                     typeArgType = types_1.UnknownType.create();
                 }
+                if ((flags & 16384 /* EnforceTypeVarVarianceConsistency */) !== 0) {
+                    if ((0, types_1.isTypeVar)(typeArgType)) {
+                        const usageVariances = inferTypeParameterVarianceForTypeAlias(baseType);
+                        if (usageVariances && index < usageVariances.length) {
+                            const usageVariance = usageVariances[index];
+                            if (!(0, typeUtils_1.isVarianceOfTypeArgumentCompatible)(typeArgType, usageVariance)) {
+                                const messageDiag = diag.createAddendum();
+                                messageDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.varianceMismatchForTypeAlias().format({
+                                    typeVarName: printType(typeArgType),
+                                    typeAliasParam: printType(typeParameters[index]),
+                                }));
+                                messageDiag.addTextRange(typeArgs[index].node);
+                            }
+                        }
+                    }
+                }
                 (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, param, typeArgType, diag, typeVarContext, 128 /* RetainLiteralsForTypeVar */);
             }
         });
         if (!diag.isEmpty()) {
-            addError(localize_1.Localizer.Diagnostic.typeNotSpecializable().format({ type: printType(baseType) }) + diag.getString(), node);
+            addError(localize_1.Localizer.Diagnostic.typeNotSpecializable().format({ type: printType(baseType) }) + diag.getString(), node, (_b = diag.getEffectiveTextRange()) !== null && _b !== void 0 ? _b : node);
         }
         const primarySignatureContext = typeVarContext.getPrimarySignature();
         const aliasTypeArgs = [];
-        (_b = baseType.typeAliasInfo.typeParameters) === null || _b === void 0 ? void 0 : _b.forEach((typeParam) => {
+        (_c = baseType.typeAliasInfo.typeParameters) === null || _c === void 0 ? void 0 : _c.forEach((typeParam) => {
             let typeVarType;
             if ((0, types_1.isParamSpec)(typeParam)) {
                 const paramSpecType = primarySignatureContext.getParamSpecType(typeParam);
@@ -4489,9 +4524,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             return { type };
         }
         let isIncomplete = baseTypeResult.isIncomplete;
+        let isRequired = false;
+        let isNotRequired = false;
         const type = mapSubtypesExpandTypeVars(baseTypeResult.type, 
         /* conditionFilter */ undefined, (concreteSubtype, unexpandedSubtype) => {
-            var _a, _b;
+            var _a;
             if ((0, types_1.isAnyOrUnknown)(concreteSubtype)) {
                 return concreteSubtype;
             }
@@ -4558,7 +4595,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 const isClassVarAnnotation = (0, types_1.isInstantiableClass)(concreteSubtype) && types_1.ClassType.isBuiltIn(concreteSubtype, 'ClassVar');
                 let typeArgs = getTypeArgs(node, flags, isAnnotatedClass, hasCustomClassGetItem || !isGenericClass, isFinalAnnotation, isClassVarAnnotation);
                 if (!isAnnotatedClass) {
-                    typeArgs = adjustTypeArgumentsForVariadicTypeVar(typeArgs, concreteSubtype.details.typeParameters, (_b = (0, typeUtils_1.getTypeVarScopeId)(concreteSubtype)) !== null && _b !== void 0 ? _b : '', node);
+                    typeArgs = adjustTypeArgumentsForVariadicTypeVar(typeArgs, concreteSubtype.details.typeParameters, node);
                 }
                 // If this is a custom __class_getitem__, there's no need to specialize the class.
                 // Just return it as is.
@@ -4571,7 +4608,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }), node.baseExpression);
                     return concreteSubtype;
                 }
-                return createSpecializedClassType(concreteSubtype, typeArgs, flags, node);
+                const result = createSpecializedClassType(concreteSubtype, typeArgs, flags, node);
+                if (result.isRequired) {
+                    isRequired = true;
+                }
+                else if (result.isNotRequired) {
+                    isNotRequired = true;
+                }
+                return result.type;
             }
             if ((0, types_1.isClassInstance)(concreteSubtype)) {
                 const typeResult = getTypeOfIndexedObjectOrClass(node, concreteSubtype, usage);
@@ -4602,7 +4646,81 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
             });
         }
-        return { type, isIncomplete };
+        return { type, isIncomplete, isRequired, isNotRequired };
+    }
+    // Determines the effective variance of the type parameters for a generic
+    // type alias. Normally, variance is not important for type aliases, but
+    // it can be important in cases where the type alias is used to specify
+    // a base class in a class definition.
+    function inferTypeParameterVarianceForTypeAlias(type) {
+        // If this isn't a generic type alias, there's nothing to do.
+        if (!type.typeAliasInfo || !type.typeAliasInfo.typeParameters) {
+            return undefined;
+        }
+        // Is the usage variance info already cached?
+        if (type.typeAliasInfo.usageVariance) {
+            return type.typeAliasInfo.usageVariance;
+        }
+        const typeParams = type.typeAliasInfo.typeParameters;
+        // Start with all of the usage variances unknown.
+        const usageVariances = typeParams.map(() => 1 /* Unknown */);
+        // Prepopulate the cached value for the type alias to handle
+        // recursive type aliases.
+        type.typeAliasInfo.usageVariance = usageVariances;
+        // Traverse the type alias type definition and adjust the usage
+        // variances accordingly.
+        updateUsageVariancesRecursive(type, typeParams, usageVariances);
+        return usageVariances;
+    }
+    // Looks at uses of the type parameters within the type and adjusts the
+    // variances accordingly. For example, if the type is `Mapping[T1, T2]`,
+    // then T1 will be set to invariant and T2 will be set to covariant.
+    function updateUsageVariancesRecursive(type, typeAliasTypeParams, usageVariances, recursionCount = 0) {
+        if (recursionCount > types_1.maxTypeRecursionCount) {
+            return;
+        }
+        recursionCount++;
+        // Define a helper function that performs the actual usage variant update.
+        function updateUsageVarianceForType(type, variance) {
+            (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
+                const typeParamIndex = typeAliasTypeParams.findIndex((param) => (0, types_1.isTypeSame)(param, subtype));
+                if (typeParamIndex >= 0) {
+                    usageVariances[typeParamIndex] = (0, typeUtils_1.combineVariances)(usageVariances[typeParamIndex], variance);
+                }
+                else {
+                    updateUsageVariancesRecursive(subtype, typeAliasTypeParams, usageVariances, recursionCount);
+                }
+            });
+        }
+        (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
+            if (subtype.category === 5 /* Function */) {
+                if (subtype.specializedTypes) {
+                    subtype.specializedTypes.parameterTypes.forEach((paramType) => {
+                        updateUsageVarianceForType(paramType, 4 /* Contravariant */);
+                    });
+                    const returnType = subtype.specializedTypes.returnType;
+                    if (returnType) {
+                        updateUsageVarianceForType(returnType, 3 /* Covariant */);
+                    }
+                }
+            }
+            else if (subtype.category === 7 /* Class */) {
+                if (subtype.typeArguments) {
+                    // If the class includes type parameters that uses auto variance,
+                    // compute the calculated variance.
+                    inferTypeParameterVarianceForClass(subtype);
+                    // Is the class specialized using any type arguments that correspond to
+                    // the type alias' type parameters?
+                    subtype.typeArguments.forEach((typeArg, classParamIndex) => {
+                        var _a;
+                        if (classParamIndex < subtype.details.typeParameters.length) {
+                            const classTypeParam = subtype.details.typeParameters[classParamIndex];
+                            updateUsageVarianceForType(typeArg, (_a = classTypeParam.computedVariance) !== null && _a !== void 0 ? _a : classTypeParam.details.declaredVariance);
+                        }
+                    });
+                }
+            }
+        });
     }
     function makeTupleObject(entryTypes, isUnspecifiedLength = false) {
         if (tupleClassType && (0, types_1.isInstantiableClass)(tupleClassType)) {
@@ -4837,8 +4955,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             adjFlags &= ~(2 /* DoNotSpecialize */ |
                 32 /* DisallowParamSpec */ |
                 64 /* DisallowTypeVarTuple */ |
-                1048576 /* AllowRequired */ |
-                16384 /* EnforceTypeVarVarianceConsistency */);
+                1048576 /* AllowRequired */);
             if (!isAnnotatedClass) {
                 adjFlags |= 131072 /* DisallowClassVar */ | 16 /* DisallowFinal */;
             }
@@ -5195,7 +5312,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             return { type: types_1.UnknownType.create(/* isIncomplete */ true), isIncomplete: true };
         }
         const assertedType = (0, typeUtils_1.convertToInstance)(getTypeOfArgumentExpectingType(node.arguments[1]).type);
-        if (!(0, types_1.isTypeSame)(assertedType, arg0TypeResult.type, { treatAnySameAsUnknown: true })) {
+        if (!(0, types_1.isTypeSame)(assertedType, arg0TypeResult.type, { treatAnySameAsUnknown: true, ignorePseudoGeneric: true })) {
             addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.assertTypeTypeMismatch().format({
                 expected: printType(assertedType),
                 received: printType(arg0TypeResult.type),
@@ -5253,7 +5370,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
         }
         if (expectedRevealType) {
-            if (!(0, types_1.isTypeSame)(expectedRevealType, type)) {
+            if (!(0, types_1.isTypeSame)(expectedRevealType, type, { ignorePseudoGeneric: true })) {
                 const expectedRevealTypeText = printType(expectedRevealType);
                 addError(localize_1.Localizer.Diagnostic.revealTypeExpectedTypeMismatch().format({
                     expected: expectedRevealTypeText,
@@ -5411,9 +5528,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     type: resultIsInstance
                         ? types_1.ClassType.cloneAsInstance(lookupResults.classType)
                         : lookupResults.classType,
-                    bindToType: resultIsInstance && bindToType && (0, types_1.isInstantiableClass)(bindToType)
-                        ? types_1.ClassType.cloneAsInstance(bindToType)
-                        : bindToType,
+                    bindToType: bindToType
+                        ? types_1.TypeBase.cloneForCondition((0, typeUtils_1.synthesizeTypeVarForSelfCls)(bindToType, !resultIsInstance), bindToType.condition)
+                        : undefined,
                 };
             }
         }
@@ -5479,6 +5596,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     : typeVarContext;
                 const effectiveTypeVarContext = (_a = typeVarContextToClone === null || typeVarContextToClone === void 0 ? void 0 : typeVarContextToClone.clone()) !== null && _a !== void 0 ? _a : new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(overload));
                 effectiveTypeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeId)(overload));
+                if (overload.details.constructorTypeVarScopeId) {
+                    effectiveTypeVarContext.addSolveForScope(overload.details.constructorTypeVarScopeId);
+                }
                 effectiveTypeVarContext.unlock();
                 // Use speculative mode so we don't output any diagnostics or
                 // record any final types in the type cache.
@@ -5686,6 +5806,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             });
             const effectiveTypeVarContext = typeVarContext !== null && typeVarContext !== void 0 ? typeVarContext : new typeVarContext_1.TypeVarContext();
             effectiveTypeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeId)(lastMatch.overload));
+            if (lastMatch.overload.details.constructorTypeVarScopeId) {
+                effectiveTypeVarContext.addSolveForScope(lastMatch.overload.details.constructorTypeVarScopeId);
+            }
             effectiveTypeVarContext.unlock();
             return validateFunctionArgumentTypesWithExpectedType(errorNode, lastMatch, effectiveTypeVarContext, skipUnknownArgCheck, inferenceContext);
         };
@@ -6496,7 +6619,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // validation is left to the caller.
     // This logic is based on PEP 3102: https://www.python.org/dev/peps/pep-3102/
     function matchFunctionArgumentsToParameters(errorNode, argList, typeResult, overloadIndex) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const paramDetails = (0, typeUtils_1.getParameterListDetails)(typeResult.type);
         let argIndex = 0;
         let matchedUnpackedListOfUnknownLength = false;
@@ -6619,11 +6742,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         tooManyPositionals = true;
                     }
                     if (tooManyPositionals) {
-                        addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, positionParamLimitIndex === 1
-                            ? localize_1.Localizer.Diagnostic.argPositionalExpectedOne()
-                            : localize_1.Localizer.Diagnostic.argPositionalExpectedCount().format({
-                                expected: positionParamLimitIndex,
-                            }), (_b = argList[argIndex].valueExpression) !== null && _b !== void 0 ? _b : errorNode);
+                        if (!isDiagnosticSuppressedForNode(errorNode)) {
+                            addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, positionParamLimitIndex === 1
+                                ? localize_1.Localizer.Diagnostic.argPositionalExpectedOne()
+                                : localize_1.Localizer.Diagnostic.argPositionalExpectedCount().format({
+                                    expected: positionParamLimitIndex,
+                                }), (_b = argList[argIndex].valueExpression) !== null && _b !== void 0 ? _b : errorNode);
+                        }
                         reportedArgError = true;
                     }
                 }
@@ -6647,11 +6772,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // all positional parameters specified in the Concatenate must be
                 // filled explicitly.
                 if (typeResult.type.details.paramSpec && paramIndex < positionParamLimitIndex) {
-                    addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, positionParamLimitIndex === 1
-                        ? localize_1.Localizer.Diagnostic.argPositionalExpectedOne()
-                        : localize_1.Localizer.Diagnostic.argPositionalExpectedCount().format({
-                            expected: positionParamLimitIndex,
-                        }), (_c = argList[argIndex].valueExpression) !== null && _c !== void 0 ? _c : errorNode);
+                    if (!isDiagnosticSuppressedForNode(errorNode)) {
+                        addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, positionParamLimitIndex === 1
+                            ? localize_1.Localizer.Diagnostic.argPositionalExpectedOne()
+                            : localize_1.Localizer.Diagnostic.argPositionalExpectedCount().format({
+                                expected: positionParamLimitIndex,
+                            }), (_c = argList[argIndex].valueExpression) !== null && _c !== void 0 ? _c : errorNode);
+                    }
                     reportedArgError = true;
                 }
                 const argType = argTypeResult.type;
@@ -6710,7 +6837,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // It's not allowed to use unpacked arguments with a variadic *args
                 // parameter unless the argument is a variadic arg as well.
                 if (isParamVariadic && !isArgCompatibleWithVariadic) {
-                    addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.unpackedArgWithVariadicParam(), argList[argIndex].valueExpression || errorNode);
+                    if (!isDiagnosticSuppressedForNode(errorNode)) {
+                        addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.unpackedArgWithVariadicParam(), argList[argIndex].valueExpression || errorNode);
+                    }
                     reportedArgError = true;
                 }
                 else {
@@ -6723,7 +6852,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             paramType,
                             requiresTypeVarMatching: (0, typeUtils_1.requiresSpecialization)(paramType),
                             argument: funcArg,
-                            errorNode: argList[argIndex].valueExpression || errorNode,
+                            errorNode: (_f = argList[argIndex].valueExpression) !== null && _f !== void 0 ? _f : errorNode,
                             paramName,
                             isParamNameSynthesized: paramDetails.params[paramIndex].param.isNameSynthesized,
                             mapsToVarArgList: isParamVariadic && remainingArgCount > remainingParamCount,
@@ -6766,12 +6895,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         : 0 /* Simple */;
                     if (remainingArgCount <= remainingParamCount) {
                         if (remainingArgCount < remainingParamCount) {
-                            // Have we run out of arguments and still have parameters left to fill?
-                            addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, remainingArgCount === 1
-                                ? localize_1.Localizer.Diagnostic.argMorePositionalExpectedOne()
-                                : localize_1.Localizer.Diagnostic.argMorePositionalExpectedCount().format({
-                                    expected: remainingArgCount,
-                                }), argList[argIndex].valueExpression || errorNode);
+                            if (!isDiagnosticSuppressedForNode(errorNode)) {
+                                // Have we run out of arguments and still have parameters left to fill?
+                                addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, remainingArgCount === 1
+                                    ? localize_1.Localizer.Diagnostic.argMorePositionalExpectedOne()
+                                    : localize_1.Localizer.Diagnostic.argMorePositionalExpectedCount().format({
+                                        expected: remainingArgCount,
+                                    }), argList[argIndex].valueExpression || errorNode);
+                            }
                             reportedArgError = true;
                         }
                         paramIndex++;
@@ -6846,13 +6977,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 argsRemainingCount--;
             }
             if (argsRemainingCount > 0) {
-                addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, argsRemainingCount === 1
-                    ? localize_1.Localizer.Diagnostic.argMorePositionalExpectedOne()
-                    : localize_1.Localizer.Diagnostic.argMorePositionalExpectedCount().format({
-                        expected: argsRemainingCount,
-                    }), argList.length > positionalArgCount
-                    ? argList[positionalArgCount].valueExpression || errorNode
-                    : errorNode);
+                if (!isDiagnosticSuppressedForNode(errorNode)) {
+                    addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, argsRemainingCount === 1
+                        ? localize_1.Localizer.Diagnostic.argMorePositionalExpectedOne()
+                        : localize_1.Localizer.Diagnostic.argMorePositionalExpectedCount().format({
+                            expected: argsRemainingCount,
+                        }), argList.length > positionalArgCount
+                        ? argList[positionalArgCount].valueExpression || errorNode
+                        : errorNode);
+                }
                 reportedArgError = true;
             }
         }
@@ -6926,7 +7059,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             }
                         });
                         if (!diag.isEmpty()) {
-                            addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.unpackedTypedDictArgument() + diag.getString(), argList[argIndex].valueExpression || errorNode);
+                            if (!isDiagnosticSuppressedForNode(errorNode)) {
+                                addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.unpackedTypedDictArgument() + diag.getString(), argList[argIndex].valueExpression || errorNode);
+                            }
                             reportedArgError = true;
                         }
                     }
@@ -6972,7 +7107,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                                 }
                             }
                             if (!isValidMappingType) {
-                                addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.unpackedDictArgumentNotMapping(), argList[argIndex].valueExpression || errorNode);
+                                if (!isDiagnosticSuppressedForNode(errorNode)) {
+                                    addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet
+                                        .reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.unpackedDictArgumentNotMapping(), argList[argIndex].valueExpression || errorNode);
+                                }
                                 reportedArgError = true;
                             }
                         }
@@ -7004,7 +7142,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                                     paramType,
                                     requiresTypeVarMatching: (0, typeUtils_1.requiresSpecialization)(paramType),
                                     argument: argList[argIndex],
-                                    errorNode: argList[argIndex].valueExpression || errorNode,
+                                    errorNode: (_g = argList[argIndex].valueExpression) !== null && _g !== void 0 ? _g : errorNode,
                                     paramName: paramNameValue,
                                 });
                                 trySetActive(argList[argIndex], paramDetails.params[paramInfoIndex].param);
@@ -7021,7 +7159,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                                     paramType,
                                     requiresTypeVarMatching: (0, typeUtils_1.requiresSpecialization)(paramType),
                                     argument: argList[argIndex],
-                                    errorNode: argList[argIndex].valueExpression || errorNode,
+                                    errorNode: (_h = argList[argIndex].valueExpression) !== null && _h !== void 0 ? _h : errorNode,
                                     paramName: paramNameValue,
                                 });
                                 // Remember that this parameter has already received a value.
@@ -7040,12 +7178,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         }
                     }
                     else if (argList[argIndex].argumentCategory === 0 /* Simple */) {
-                        const fileInfo = AnalyzerNodeInfo.getFileInfo(errorNode);
-                        addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, positionParamLimitIndex === 1
-                            ? localize_1.Localizer.Diagnostic.argPositionalExpectedOne()
-                            : localize_1.Localizer.Diagnostic.argPositionalExpectedCount().format({
-                                expected: positionParamLimitIndex,
-                            }), argList[argIndex].valueExpression || errorNode);
+                        if (!isDiagnosticSuppressedForNode(errorNode)) {
+                            const fileInfo = AnalyzerNodeInfo.getFileInfo(errorNode);
+                            addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, positionParamLimitIndex === 1
+                                ? localize_1.Localizer.Diagnostic.argPositionalExpectedOne()
+                                : localize_1.Localizer.Diagnostic.argPositionalExpectedCount().format({
+                                    expected: positionParamLimitIndex,
+                                }), argList[argIndex].valueExpression || errorNode);
+                        }
                         reportedArgError = true;
                     }
                     else if (argList[argIndex].argumentCategory === 1 /* UnpackedList */) {
@@ -7063,7 +7203,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                                     paramType: typeResult.type.details.paramSpec,
                                     requiresTypeVarMatching: false,
                                     argument: argList[argIndex],
-                                    errorNode: argList[argIndex].valueExpression || errorNode,
+                                    errorNode: (_j = argList[argIndex].valueExpression) !== null && _j !== void 0 ? _j : errorNode,
                                 });
                             }
                         }
@@ -7113,10 +7253,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     return !entry || entry.argsReceived < entry.argsNeeded;
                 });
                 if (unassignedParams.length > 0) {
-                    const missingParamNames = unassignedParams.map((p) => `"${p}"`).join(', ');
-                    addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, unassignedParams.length === 1
-                        ? localize_1.Localizer.Diagnostic.argMissingForParam().format({ name: missingParamNames })
-                        : localize_1.Localizer.Diagnostic.argMissingForParams().format({ names: missingParamNames }), errorNode);
+                    if (!isDiagnosticSuppressedForNode(errorNode)) {
+                        const missingParamNames = unassignedParams.map((p) => `"${p}"`).join(', ');
+                        addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, unassignedParams.length === 1
+                            ? localize_1.Localizer.Diagnostic.argMissingForParam().format({ name: missingParamNames })
+                            : localize_1.Localizer.Diagnostic.argMissingForParams().format({ names: missingParamNames }), errorNode);
+                    }
                     reportedArgError = true;
                 }
                 // Add any implicit (default) arguments that are needed for resolving
@@ -7142,7 +7284,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                                         argumentCategory: 0 /* Simple */,
                                         typeResult: { type: defaultArgType },
                                     },
-                                    errorNode: errorNode,
+                                    errorNode,
                                     paramName: param.name,
                                     isParamNameSynthesized: param.isNameSynthesized,
                                 });
@@ -7180,7 +7322,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             if (containsVariadicTypeVar &&
                                 argParam.argument.argumentCategory !== 1 /* UnpackedList */ &&
                                 !argParam.mapsToVarArgList) {
-                                addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeVarTupleMustBeUnpacked(), (_a = argParam.argument.valueExpression) !== null && _a !== void 0 ? _a : errorNode);
+                                if (!isDiagnosticSuppressedForNode(errorNode)) {
+                                    addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet
+                                        .reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeVarTupleMustBeUnpacked(), (_a = argParam.argument.valueExpression) !== null && _a !== void 0 ? _a : errorNode);
+                                }
                                 reportedArgError = true;
                             }
                             return {
@@ -8271,9 +8416,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         /* declaredMetaclass */ undefined, arg1Type.details.effectiveMetaclass);
         arg1Type.tupleTypeArguments.forEach((typeArg) => {
             const specializedType = makeTopLevelTypeVarsConcrete(typeArg.type);
-            if ((0, types_1.isInstantiableClass)(specializedType) ||
-                (0, types_1.isAnyOrUnknown)(specializedType) ||
-                ((0, types_1.isClassInstance)(specializedType) && types_1.ClassType.isBuiltIn(specializedType, 'type'))) {
+            if ((0, typeUtils_1.isEffectivelyInstantiable)(specializedType)) {
                 classType.details.baseClasses.push(specializedType);
             }
             else {
@@ -8545,9 +8688,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
         }
         const diag = new diagnostic_1.DiagnosticAddendum();
-        // Don't use literal math if either of the operand types are
-        // incomplete because we may be evaluating types within a loop,
-        // so the literal values may change each time.
+        // Don't use literal math if either of the operation is within a loop
+        // because the literal values may change each time.
         const isLiteralMathAllowed = !ParseTreeUtils.isWithinLoop(node);
         // Don't special-case tuple __add__ if the left type is a union. This
         // can result in an infinite loop if we keep creating new tuple types
@@ -8654,11 +8796,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         // If the LHS class didn't support the magic method for augmented
                         // assignment, fall back on the normal binary expression evaluator.
                         const binaryOperator = operatorMap[node.operator][1];
-                        // Don't use literal math if either of the operand types are
-                        // incomplete because we may be evaluating types within a loop,
-                        // so the literal values may change each time.
-                        const isLiteralMathAllowed = !leftTypeResult.isIncomplete &&
-                            !rightTypeResult.isIncomplete &&
+                        // Don't use literal math if either of the operation is within a loop
+                        // because the literal values may change each time.
+                        const isLiteralMathAllowed = !ParseTreeUtils.isWithinLoop(node) &&
                             (0, typeUtils_1.getUnionSubtypeCount)(leftType) * (0, typeUtils_1.getUnionSubtypeCount)(rightType) <
                                 maxLiteralMathSubtypeCount;
                         // Don't special-case tuple __add__ if the left type is a union. This
@@ -9207,6 +9347,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 if (!keyTypeResult.isIncomplete && !keyTypeResult.typeErrors) {
                     verifySetEntryOrDictKeyIsHashable(entryNode.keyExpression, keyType, /* isDictKey */ true);
                 }
+                if (expectedDiagAddendum && keyTypeResult.expectedTypeDiagAddendum) {
+                    expectedDiagAddendum.addAddendum(keyTypeResult.expectedTypeDiagAddendum);
+                }
                 let valueTypeResult;
                 if (expectedTypedDictEntries &&
                     (0, types_1.isClassInstance)(keyType) &&
@@ -9236,7 +9379,22 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 addUnknown = false;
             }
             else if (entryNode.nodeType === 16 /* DictionaryExpandEntry */) {
-                const unexpandedTypeResult = getTypeOfExpression(entryNode.expandExpression);
+                // Verify that the type supports the `keys` and `__getitem__` methods.
+                // This protocol is defined in the _typeshed stub. If we can't find
+                // it there, fall back on typing.Mapping.
+                let mappingType = getTypeshedType(node, 'SupportsKeysAndGetItem');
+                if (!mappingType) {
+                    mappingType = getTypingType(node, 'Mapping');
+                }
+                let expectedType;
+                if (expectedKeyType && expectedValueType) {
+                    if (mappingType && (0, types_1.isInstantiableClass)(mappingType)) {
+                        expectedType = types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForSpecialization(mappingType, [expectedKeyType, expectedValueType], 
+                        /* isTypeArgumentExplicit */ true));
+                    }
+                }
+                const unexpandedTypeResult = getTypeOfExpression(entryNode.expandExpression, 
+                /* flags */ undefined, (0, typeUtils_1.makeInferenceContext)(expectedType));
                 if (unexpandedTypeResult.isIncomplete) {
                     isIncomplete = true;
                 }
@@ -9260,20 +9418,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                 }
                 else {
-                    // Verify that the type supports the `keys` and `__getitem__` methods.
-                    // This protocol is defined in the _typeshed stub. If we can't find
-                    // it there, fall back on typing.Mapping.
-                    let mappingType = getTypeshedType(node, 'SupportsKeysAndGetItem');
-                    if (!mappingType) {
-                        mappingType = getTypingType(node, 'Mapping');
-                    }
                     if (mappingType && (0, types_1.isInstantiableClass)(mappingType)) {
                         const mappingTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(mappingType));
                         // Self-specialize the class.
                         mappingType = types_1.ClassType.cloneForSpecialization(mappingType, mappingType.details.typeParameters, 
                         /* isTypeArgumentExplicit */ true);
                         if (assignType(types_1.ClassType.cloneAsInstance(mappingType), unexpandedType, 
-                        /* diag */ undefined, mappingTypeVarContext)) {
+                        /* diag */ undefined, mappingTypeVarContext, 
+                        /* srcTypeVarContext */ undefined, 128 /* RetainLiteralsForTypeVar */)) {
                             const specializedMapping = (0, typeUtils_1.applySolvedTypeVars)(mappingType, mappingTypeVarContext);
                             const typeArgs = specializedMapping.typeArguments;
                             if (typeArgs && typeArgs.length >= 2) {
@@ -9538,7 +9690,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const typesToCombine = [];
         let isIncomplete = false;
         let typeErrors = false;
-        if (isNodeReachable(node.ifExpression)) {
+        const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
+        const constExprValue = (0, staticExpressions_1.evaluateStaticBoolExpression)(node.testExpression, fileInfo.executionEnvironment, fileInfo.definedConstants);
+        if (constExprValue !== false && isNodeReachable(node.ifExpression)) {
             const ifType = getTypeOfExpression(node.ifExpression, flags, inferenceContext);
             typesToCombine.push(ifType.type);
             if (ifType.isIncomplete) {
@@ -9548,7 +9702,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 typeErrors = true;
             }
         }
-        if (isNodeReachable(node.elseExpression)) {
+        if (constExprValue !== true && isNodeReachable(node.elseExpression)) {
             const elseType = getTypeOfExpression(node.elseExpression, flags, inferenceContext);
             typesToCombine.push(elseType.type);
             if (elseType.isIncomplete) {
@@ -10091,7 +10245,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (!validateTypeArg(typeArgs[0])) {
             typeArg0Type = types_1.UnknownType.create();
         }
-        else if (!types_1.TypeBase.isInstantiable(typeArg0Type)) {
+        else if (!(0, typeUtils_1.isEffectivelyInstantiable)(typeArg0Type)) {
             addExpectedClassDiagnostic(typeArg0Type, typeArgs[0].node);
             typeArg0Type = types_1.UnknownType.create();
         }
@@ -10291,16 +10445,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return (0, typeUtils_1.synthesizeTypeVarForSelfCls)(enclosingClassTypeResult.classType, /* isClsParam */ true);
     }
     function createRequiredType(classType, errorNode, isRequired, typeArgs, flags) {
-        var _a;
         // If no type arguments are provided, the resulting type
         // depends on whether we're evaluating a type annotation or
         // we're in some other context.
         if (!typeArgs && (flags & 256 /* ExpectingTypeAnnotation */) === 0) {
-            return classType;
+            return { type: classType };
         }
         if (!typeArgs || typeArgs.length !== 1) {
             addError(isRequired ? localize_1.Localizer.Diagnostic.requiredArgCount() : localize_1.Localizer.Diagnostic.notRequiredArgCount(), errorNode);
-            return classType;
+            return { type: classType };
         }
         const typeArgType = typeArgs[0].type;
         // Make sure this is used only in a dataclass.
@@ -10311,21 +10464,24 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             (0, types_1.isInstantiableClass)(classTypeInfo.classType) &&
             types_1.ClassType.isTypedDictClass(classTypeInfo.classType)) {
             // The only legal usage is when used in a type annotation statement.
-            if (((_a = errorNode.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 54 /* TypeAnnotation */ &&
-                errorNode.parent.typeAnnotation === errorNode) {
+            if (ParseTreeUtils.isNodeContainedWithinNodeType(errorNode, 54 /* TypeAnnotation */)) {
                 isUsageLegal = true;
             }
         }
         if ((flags & 1048576 /* AllowRequired */) !== 0) {
             isUsageLegal = true;
         }
+        // Nested Required/NotRequired are not allowed.
+        if (typeArgs[0].isRequired || typeArgs[0].isNotRequired) {
+            isUsageLegal = false;
+        }
         if (!isUsageLegal) {
             addError(isRequired
                 ? localize_1.Localizer.Diagnostic.requiredNotInTypedDict()
                 : localize_1.Localizer.Diagnostic.notRequiredNotInTypedDict(), errorNode);
-            return types_1.ClassType.cloneForSpecialization(classType, [(0, typeUtils_1.convertToInstance)(typeArgType)], !!typeArgs);
+            return { type: types_1.ClassType.cloneForSpecialization(classType, [(0, typeUtils_1.convertToInstance)(typeArgType)], !!typeArgs) };
         }
-        return typeArgType;
+        return { type: typeArgType, isRequired, isNotRequired: !isRequired };
     }
     function createUnpackType(classType, errorNode, typeArgs, flags) {
         // If no type arguments are provided, the resulting type
@@ -10402,9 +10558,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             addError(localize_1.Localizer.Diagnostic.annotatedTypeArgMissing(), errorNode);
         }
         if (!typeArgs || typeArgs.length === 0) {
-            return types_1.AnyType.create();
+            return { type: types_1.AnyType.create() };
         }
-        return types_1.TypeBase.cloneForAnnotated(typeArgs[0].type);
+        return {
+            type: types_1.TypeBase.cloneForAnnotated(typeArgs[0].type),
+            isRequired: typeArgs[0].isRequired,
+            isNotRequired: typeArgs[0].isNotRequired,
+        };
     }
     // Creates one of several "special" types that are defined in typing.pyi
     // but not declared in their entirety. This includes the likes of "Tuple",
@@ -10533,7 +10693,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if (!validateTypeArg(typeArg, { allowVariadicTypeVar: true, allowUnpackedTuples: true })) {
                 typeArgType = types_1.UnknownType.create();
             }
-            else if (!types_1.TypeBase.isInstantiable(typeArgType)) {
+            else if (!(0, typeUtils_1.isEffectivelyInstantiable)(typeArgType)) {
                 addExpectedClassDiagnostic(typeArgType, typeArg.node);
                 typeArgType = types_1.UnknownType.create();
             }
@@ -10797,7 +10957,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
         // If the entire statement has already been evaluated, don't
         // re-evaluate it.
-        if (readTypeCache(node, 0 /* None */)) {
+        if (isTypeCached(node)) {
             return;
         }
         let flags = 0 /* None */;
@@ -10844,7 +11004,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 let isSpeculativeTypeAlias = false;
                 if (isDeclaredTypeAlias(node.leftExpression)) {
                     typeAliasNameNode = node.leftExpression.valueExpression;
-                    if (!(0, declarationUtils_1.isLegalTypeAliasExpressionForm)(node.rightExpression)) {
+                    if (!isLegalTypeAliasExpressionForm(node.rightExpression)) {
                         addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeAliasIllegalExpressionForm(), node.rightExpression);
                     }
                 }
@@ -10941,7 +11101,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     }
     function isPossibleTypeAliasOrTypedDict(decl) {
         var _a;
-        if ((0, declarationUtils_1.isPossibleTypeAliasDeclaration)(decl)) {
+        if (isPossibleTypeAliasDeclaration(decl)) {
             return true;
         }
         if (decl.type === 1 /* Variable */ &&
@@ -10997,7 +11157,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             typeParameters = evaluateTypeParameterList(node.typeParameters);
             typeAliasTypeVar.details.recursiveTypeParameters = typeParameters;
         }
-        if (!(0, declarationUtils_1.isLegalTypeAliasExpressionForm)(node.expression)) {
+        if (!isLegalTypeAliasExpressionForm(node.expression)) {
             addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeAliasIllegalExpressionForm(), node.expression);
         }
         const aliasTypeResult = getTypeOfExpressionExpectingType(node.expression);
@@ -11025,7 +11185,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return aliasType;
     }
     function evaluateTypesForAugmentedAssignment(node) {
-        if (readTypeCache(node, 0 /* None */)) {
+        if (isTypeCached(node)) {
             return;
         }
         const destTypeResult = getTypeOfAugmentedAssignment(node, /* inferenceContext */ undefined);
@@ -11136,7 +11296,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     argType = (0, types_1.removeUnbound)(argType);
                 }
                 if (!(0, types_1.isAnyOrUnknown)(argType) && !(0, types_1.isUnbound)(argType)) {
-                    if (!(0, types_1.isInstantiableClass)(argType)) {
+                    if ((0, types_1.isClass)(argType) && types_1.TypeBase.isInstance(argType) && types_1.ClassType.isBuiltIn(argType, 'type')) {
+                        argType =
+                            argType.typeArguments && argType.typeArguments.length > 0
+                                ? argType.typeArguments[0]
+                                : types_1.UnknownType.create();
+                    }
+                    else if (!(0, types_1.isInstantiableClass)(argType)) {
                         addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.baseClassInvalid(), arg);
                         argType = types_1.UnknownType.create();
                     }
@@ -11566,7 +11732,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // Presumptively mark the variance inference as complete. This
         // prevents potential recursion.
         classType.details.requiresVarianceInference = false;
-        // Presumptively mark the computed variance to "in progress". We'll
+        // Presumptively mark the computed variance to "unknown". We'll
         // replace this below once the variance has been inferred.
         classType.details.typeParameters.forEach((param) => {
             if (param.details.declaredVariance === 0 /* Auto */) {
@@ -11603,13 +11769,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             /* isTypeArgumentExplicit */ true);
             const destType = types_1.ClassType.cloneForSpecialization(updatedClassType, destTypeArgs, 
             /* isTypeArgumentExplicit */ true);
-            const isDestSubtypeOfSrc = assignClassToSelf(srcType, destType);
+            const isDestSubtypeOfSrc = assignClassToSelf(srcType, destType, /* ignoreBaseClassVariance */ false);
             let inferredVariance;
             if (isDestSubtypeOfSrc) {
                 inferredVariance = 3 /* Covariant */;
             }
             else {
-                const isSrcSubtypeOfDest = assignClassToSelf(destType, srcType);
+                const isSrcSubtypeOfDest = assignClassToSelf(destType, srcType, /* ignoreBaseClassVariance */ false);
                 if (isSrcSubtypeOfDest) {
                     inferredVariance = 4 /* Contravariant */;
                 }
@@ -11626,9 +11792,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     function evaluateTypeParameterList(node) {
         const paramTypes = [];
         node.parameters.forEach((param) => {
+            var _a;
             const paramSymbol = AnalyzerNodeInfo.getTypeParameterSymbol(param.name);
             (0, debug_1.assert)(paramSymbol);
-            const typeOfParam = getDeclaredTypeOfSymbol(paramSymbol, param.name);
+            const typeOfParam = (_a = getDeclaredTypeOfSymbol(paramSymbol, param.name)) === null || _a === void 0 ? void 0 : _a.type;
             if (!typeOfParam || !(0, types_1.isTypeVar)(typeOfParam)) {
                 return;
             }
@@ -11937,10 +12104,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (functionDecl === null || functionDecl === void 0 ? void 0 : functionDecl.isGenerator) {
             functionFlags |= 16 /* Generator */;
         }
-        // Special-case magic method __class_getitem__, which is implicitly a class method.
-        if (containingClassNode && node.name.value === '__class_getitem__') {
-            functionFlags |= 2 /* ClassMethod */;
-        }
         if (fileInfo.isStubFile) {
             functionFlags |= 2048 /* StubDefinition */;
         }
@@ -12463,15 +12626,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     function getFunctionFlagsFromDecorators(node, isInClass) {
         const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
         let flags = 0 /* None */;
-        // The "__new__" magic method is not an instance method.
-        // It acts as a static method instead.
-        if (node.name.value === '__new__' && isInClass) {
-            flags |= 1 /* ConstructorMethod */;
-        }
-        // The "__init_subclass__" magic method is not an instance method.
-        // It acts an an implicit class method instead.
-        if (node.name.value === '__init_subclass__' && isInClass) {
-            flags |= 2 /* ClassMethod */;
+        if (isInClass) {
+            // The "__new__" magic method is not an instance method.
+            // It acts as a static method instead.
+            if (node.name.value === '__new__') {
+                flags |= 1 /* ConstructorMethod */;
+            }
+            // Several magic methods are treated as class methods implicitly
+            // by the runtime. Check for these here.
+            const implicitClassMethods = ['__init_subclass__', '__class_getitem__'];
+            if (implicitClassMethods.some((name) => node.name.value === name)) {
+                flags |= 2 /* ClassMethod */;
+            }
         }
         for (const decoratorNode of node.decorators) {
             // Some stub files (e.g. builtins.pyi) rely on forward declarations of decorators.
@@ -12928,7 +13094,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     }
     function evaluateTypesForForStatement(node) {
         var _a, _b;
-        if (readTypeCache(node, 0 /* None */)) {
+        if (isTypeCached(node)) {
             return;
         }
         const iteratorTypeResult = getTypeOfExpression(node.iterableExpression);
@@ -12939,7 +13105,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     function evaluateTypesForExceptStatement(node) {
         // This should be called only if the except node has a target exception.
         (0, debug_1.assert)(node.typeExpression !== undefined);
-        if (readTypeCache(node, 0 /* None */)) {
+        if (isTypeCached(node)) {
             return;
         }
         const exceptionTypeResult = getTypeOfExpression(node.typeExpression);
@@ -12987,7 +13153,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         writeTypeCache(node, { type: targetType }, 0 /* None */);
     }
     function evaluateTypesForWithStatement(node) {
-        if (readTypeCache(node, 0 /* None */)) {
+        if (isTypeCached(node)) {
             return;
         }
         const exprTypeResult = getTypeOfExpression(node.expression);
@@ -13053,7 +13219,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     }
     function evaluateTypesForImportAs(node) {
         var _a;
-        if (readTypeCache(node, 0 /* None */)) {
+        if (isTypeCached(node)) {
             return;
         }
         let symbolNameNode;
@@ -13085,7 +13251,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     }
     function evaluateTypesForImportFromAs(node) {
         var _a;
-        if (readTypeCache(node, 0 /* None */)) {
+        if (isTypeCached(node)) {
             return;
         }
         const aliasNode = node.alias || node.name;
@@ -13141,7 +13307,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         writeTypeCache(node, { type: symbolType }, 0 /* None */);
     }
     function evaluateTypesForMatchStatement(node) {
-        if (readTypeCache(node, 0 /* None */)) {
+        if (isTypeCached(node)) {
             return;
         }
         const subjectTypeResult = getTypeOfExpression(node.subjectExpression);
@@ -13156,19 +13322,23 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         writeTypeCache(node, { type: subjectType, isIncomplete: !!subjectTypeResult.isIncomplete }, 0 /* None */);
     }
     function evaluateTypesForCaseStatement(node) {
-        if (readTypeCache(node, 0 /* None */)) {
+        if (isTypeCached(node)) {
             return;
         }
         if (!node.parent || node.parent.nodeType !== 63 /* Match */) {
             (0, debug_1.fail)('Expected parent of case statement to be match statement');
             return;
         }
+        const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
         const subjectTypeResult = getTypeOfExpression(node.parent.subjectExpression);
         let subjectType = subjectTypeResult.type;
         // Apply negative narrowing for each of the cases prior to the current one
         // except for those that have a guard expression.
         for (const caseStatement of node.parent.cases) {
             if (caseStatement === node) {
+                if (fileInfo.diagnosticRuleSet.reportUnnecessaryComparison !== 'none') {
+                    (0, patternMatching_1.checkForUnusedPattern)(evaluatorInterface, node.pattern, subjectType);
+                }
                 break;
             }
             if (!caseStatement.guardExpression) {
@@ -13190,7 +13360,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         writeTypeCache(node, { type: subjectType, isIncomplete: !!subjectTypeResult.isIncomplete }, 0 /* None */);
     }
     function evaluateTypesForImportFrom(node) {
-        if (readTypeCache(node, 0 /* None */)) {
+        if (isTypeCached(node)) {
             return;
         }
         // Use the first element of the name parts as the symbol.
@@ -13764,22 +13934,22 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             const aliasedName = classType.aliasName || classType.details.name;
             switch (aliasedName) {
                 case 'Callable': {
-                    return createCallableType(typeArgs, errorNode);
+                    return { type: createCallableType(typeArgs, errorNode) };
                 }
                 case 'Never': {
                     if (typeArgs && typeArgs.length > 0) {
                         addError(localize_1.Localizer.Diagnostic.typeArgsExpectingNone().format({ name: 'Never' }), typeArgs[0].node);
                     }
-                    return types_1.NeverType.createNever();
+                    return { type: types_1.NeverType.createNever() };
                 }
                 case 'NoReturn': {
                     if (typeArgs && typeArgs.length > 0) {
                         addError(localize_1.Localizer.Diagnostic.typeArgsExpectingNone().format({ name: 'NoReturn' }), typeArgs[0].node);
                     }
-                    return types_1.NeverType.createNoReturn();
+                    return { type: types_1.NeverType.createNoReturn() };
                 }
                 case 'Optional': {
-                    return createOptionalType(classType, errorNode, typeArgs, flags);
+                    return { type: createOptionalType(classType, errorNode, typeArgs, flags) };
                 }
                 case 'Type': {
                     // PEP 484 says that Type[Any] should be considered
@@ -13788,56 +13958,58 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         (0, types_1.isAnyOrUnknown)(typeArgs[0].type) &&
                         typeClassType &&
                         (0, types_1.isInstantiableClass)(typeClassType)) {
-                        return typeClassType;
+                        return { type: typeClassType };
                     }
                     let typeType = createSpecialType(classType, typeArgs, 1);
                     if ((0, types_1.isInstantiableClass)(typeType)) {
                         typeType = (0, typeUtils_1.explodeGenericClass)(typeType);
                     }
-                    return typeType;
+                    return { type: typeType };
                 }
                 case 'ClassVar': {
-                    return createClassVarType(classType, errorNode, typeArgs, flags);
+                    return { type: createClassVarType(classType, errorNode, typeArgs, flags) };
                 }
                 case 'Protocol': {
-                    return createSpecialType(classType, typeArgs, 
-                    /* paramLimit */ undefined, 
-                    /* allowParamSpec */ true);
+                    return {
+                        type: createSpecialType(classType, typeArgs, 
+                        /* paramLimit */ undefined, 
+                        /* allowParamSpec */ true),
+                    };
                 }
                 case 'Tuple': {
-                    return createSpecialType(classType, typeArgs, /* paramLimit */ undefined);
+                    return { type: createSpecialType(classType, typeArgs, /* paramLimit */ undefined) };
                 }
                 case 'Union': {
-                    return createUnionType(classType, errorNode, typeArgs, flags);
+                    return { type: createUnionType(classType, errorNode, typeArgs, flags) };
                 }
                 case 'Generic': {
-                    return createGenericType(classType, errorNode, typeArgs, flags);
+                    return { type: createGenericType(classType, errorNode, typeArgs, flags) };
                 }
                 case 'Final': {
-                    return createFinalType(classType, errorNode, typeArgs, flags);
+                    return { type: createFinalType(classType, errorNode, typeArgs, flags) };
                 }
                 case 'Annotated': {
                     return createAnnotatedType(errorNode, typeArgs);
                 }
                 case 'Concatenate': {
-                    return createConcatenateType(errorNode, classType, typeArgs);
+                    return { type: createConcatenateType(errorNode, classType, typeArgs) };
                 }
                 case 'TypeGuard':
                 case 'StrictTypeGuard': {
-                    return createTypeGuardType(errorNode, classType, typeArgs, flags);
+                    return { type: createTypeGuardType(errorNode, classType, typeArgs, flags) };
                 }
                 case 'Unpack': {
-                    return createUnpackType(classType, errorNode, typeArgs, flags);
+                    return { type: createUnpackType(classType, errorNode, typeArgs, flags) };
                 }
                 case 'Required':
                 case 'NotRequired': {
                     return createRequiredType(classType, errorNode, aliasedName === 'Required', typeArgs, flags);
                 }
                 case 'Self': {
-                    return createSelfType(classType, errorNode, typeArgs);
+                    return { type: createSelfType(classType, errorNode, typeArgs) };
                 }
                 case 'LiteralString': {
-                    return createSpecialType(classType, typeArgs, 0);
+                    return { type: createSpecialType(classType, typeArgs, 0) };
                 }
             }
         }
@@ -13852,7 +14024,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // PEP 484 says that type[Any] should be considered
                 // equivalent to type.
                 if (typeArgs.length === 1 && (0, types_1.isAnyOrUnknown)(typeArgs[0].type)) {
-                    return classType;
+                    return { type: classType };
                 }
                 const typeClass = getTypingType(errorNode, 'Type');
                 if (typeClass && (0, types_1.isInstantiableClass)(typeClass)) {
@@ -13862,16 +14034,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     if ((0, types_1.isInstantiableClass)(typeType)) {
                         typeType = (0, typeUtils_1.explodeGenericClass)(typeType);
                     }
-                    return typeType;
+                    return { type: typeType };
                 }
             }
             // Handle "tuple" specially, since it needs to act like "Tuple"
             // in Python 3.9 and newer.
             if ((0, typeUtils_1.isTupleClass)(classType)) {
-                return createSpecialType(classType, typeArgs, 
-                /* paramLimit */ undefined, 
-                /* allowParamSpec */ undefined, 
-                /* isCallable */ true);
+                return {
+                    type: createSpecialType(classType, typeArgs, 
+                    /* paramLimit */ undefined, 
+                    /* allowParamSpec */ undefined, 
+                    /* isCallable */ true),
+                };
             }
         }
         let typeArgCount = typeArgs ? typeArgs.length : 0;
@@ -13880,7 +14054,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // If there are no type parameters or args, the class is already specialized.
         // No need to do any more work.
         if (typeParameters.length === 0 && typeArgCount === 0) {
-            return classType;
+            return { type: classType };
         }
         const variadicTypeParamIndex = typeParameters.findIndex((param) => (0, types_1.isVariadicTypeVar)(param));
         if (typeArgs) {
@@ -14043,7 +14217,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     const destType = typeParameters[index];
                     const declaredVariance = destType.details.declaredVariance;
                     if (!(0, typeUtils_1.isVarianceOfTypeArgumentCompatible)(adjustedTypeArgType, declaredVariance)) {
-                        diag.addMessage(localize_1.Localizer.DiagnosticAddendum.varianceMismatch().format({
+                        diag.addMessage(localize_1.Localizer.DiagnosticAddendum.varianceMismatchForClass().format({
                             typeVarName: printType(adjustedTypeArgType),
                             className: classType.details.name,
                         }));
@@ -14073,7 +14247,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             typeArgTypes = typeArgs.map((t) => (0, typeUtils_1.convertToInstance)(t.type));
         }
         const specializedClass = types_1.ClassType.cloneForSpecialization(classType, typeArgTypes, typeArgs !== undefined);
-        return specializedClass;
+        return { type: specializedClass };
     }
     function getTypeOfArgument(arg) {
         if (arg.typeResult) {
@@ -14494,59 +14668,63 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return declarations;
     }
     function getTypeForDeclaration(declaration) {
-        var _a, _b;
+        var _a, _b, _c;
         switch (declaration.type) {
             case 0 /* Intrinsic */: {
                 if (declaration.intrinsicType === 'Any') {
-                    return types_1.AnyType.create();
+                    return { type: types_1.AnyType.create() };
                 }
                 if (declaration.intrinsicType === 'class') {
                     const classNode = ParseTreeUtils.getEnclosingClass(declaration.node);
                     const classTypeInfo = getTypeOfClass(classNode);
-                    return classTypeInfo === null || classTypeInfo === void 0 ? void 0 : classTypeInfo.classType;
+                    return { type: classTypeInfo === null || classTypeInfo === void 0 ? void 0 : classTypeInfo.classType };
                 }
                 const strType = getBuiltInObject(declaration.node, 'str');
                 const intType = getBuiltInObject(declaration.node, 'int');
                 if ((0, types_1.isClassInstance)(intType) && (0, types_1.isClassInstance)(strType)) {
                     if (declaration.intrinsicType === 'str') {
-                        return strType;
+                        return { type: strType };
                     }
                     if (declaration.intrinsicType === 'str | None') {
-                        return (0, types_1.combineTypes)([strType, types_1.NoneType.createInstance()]);
+                        return { type: (0, types_1.combineTypes)([strType, types_1.NoneType.createInstance()]) };
                     }
                     if (declaration.intrinsicType === 'int') {
-                        return intType;
+                        return { type: intType };
                     }
                     if (declaration.intrinsicType === 'Iterable[str]') {
                         const iterableType = getBuiltInType(declaration.node, 'Iterable');
                         if ((0, types_1.isInstantiableClass)(iterableType)) {
-                            return types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForSpecialization(iterableType, [strType], 
-                            /* isTypeArgumentExplicit */ true));
+                            return {
+                                type: types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForSpecialization(iterableType, [strType], 
+                                /* isTypeArgumentExplicit */ true)),
+                            };
                         }
                     }
                     if (declaration.intrinsicType === 'Dict[str, Any]') {
                         const dictType = getBuiltInType(declaration.node, 'dict');
                         if ((0, types_1.isInstantiableClass)(dictType)) {
-                            return types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForSpecialization(dictType, [strType, types_1.AnyType.create()], 
-                            /* isTypeArgumentExplicit */ true));
+                            return {
+                                type: types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForSpecialization(dictType, [strType, types_1.AnyType.create()], 
+                                /* isTypeArgumentExplicit */ true)),
+                            };
                         }
                     }
                 }
-                return types_1.UnknownType.create();
+                return { type: types_1.UnknownType.create() };
             }
             case 6 /* Class */: {
                 const classTypeInfo = getTypeOfClass(declaration.node);
-                return classTypeInfo === null || classTypeInfo === void 0 ? void 0 : classTypeInfo.decoratedType;
+                return { type: classTypeInfo === null || classTypeInfo === void 0 ? void 0 : classTypeInfo.decoratedType };
             }
             case 7 /* SpecialBuiltInClass */: {
-                return getTypeOfAnnotation(declaration.node.typeAnnotation);
+                return { type: getTypeOfAnnotation(declaration.node.typeAnnotation) };
             }
             case 5 /* Function */: {
                 const functionTypeInfo = getTypeOfFunction(declaration.node);
-                return functionTypeInfo === null || functionTypeInfo === void 0 ? void 0 : functionTypeInfo.decoratedType;
+                return { type: functionTypeInfo === null || functionTypeInfo === void 0 ? void 0 : functionTypeInfo.decoratedType };
             }
             case 4 /* TypeAlias */: {
-                return getTypeOfTypeAlias(declaration.node);
+                return { type: getTypeOfTypeAlias(declaration.node) };
             }
             case 2 /* Parameter */: {
                 let typeAnnotationNode = declaration.node.typeAnnotation || declaration.node.typeAnnotationComment;
@@ -14565,19 +14743,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
                 if (typeAnnotationNode) {
                     const declaredType = getTypeOfParameterAnnotation(typeAnnotationNode, declaration.node.category);
-                    return transformVariadicParamType(declaration.node, declaration.node.category, adjustParameterAnnotatedType(declaration.node, declaredType));
+                    return {
+                        type: transformVariadicParamType(declaration.node, declaration.node.category, adjustParameterAnnotatedType(declaration.node, declaredType)),
+                    };
                 }
-                return undefined;
+                return { type: undefined };
             }
             case 3 /* TypeParameter */: {
-                return getTypeOfTypeParameter(declaration.node);
+                return { type: getTypeOfTypeParameter(declaration.node) };
             }
             case 1 /* Variable */: {
                 const typeAnnotationNode = declaration.typeAnnotationNode;
                 if (typeAnnotationNode) {
-                    const typeAliasNode = isDeclaredTypeAlias(typeAnnotationNode)
-                        ? ParseTreeUtils.getTypeAnnotationNode(typeAnnotationNode)
-                        : undefined;
                     let declaredType;
                     if (declaration.isRuntimeTypeExpression) {
                         declaredType = (0, typeUtils_1.convertToInstance)(getTypeOfExpressionExpectingType(typeAnnotationNode, {
@@ -14594,24 +14771,25 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             isVariableAnnotation: true,
                             allowClassVar: ParseTreeUtils.isClassVarAllowedForAssignmentTarget(declNode),
                             allowFinal: ParseTreeUtils.isFinalAllowedForAssignmentTarget(declNode),
+                            allowRequired: ParseTreeUtils.isRequiredAllowedForAssignmentTarget(declNode),
                         });
                     }
                     if (declaredType) {
                         // Apply enum transform if appropriate.
                         if (declaration.node.nodeType === 38 /* Name */) {
                             declaredType =
-                                (0, enums_1.transformTypeForPossibleEnumClass)(evaluatorInterface, declaration.node, () => declaredType) || declaredType;
+                                (_c = (0, enums_1.transformTypeForPossibleEnumClass)(evaluatorInterface, declaration.node, () => declaredType)) !== null && _c !== void 0 ? _c : declaredType;
                         }
-                        if (typeAliasNode && typeAliasNode.valueExpression.nodeType === 38 /* Name */) {
-                            declaredType = transformTypeForTypeAlias(declaredType, typeAliasNode.valueExpression, declaration.node);
+                        if ((0, types_1.isClassInstance)(declaredType) && types_1.ClassType.isBuiltIn(declaredType, 'TypeAlias')) {
+                            return { type: undefined, isTypeAlias: true };
                         }
-                        return declaredType;
+                        return { type: declaredType };
                     }
                 }
-                return undefined;
+                return { type: undefined };
             }
             case 8 /* Alias */: {
-                return undefined;
+                return { type: undefined };
             }
         }
     }
@@ -14780,8 +14958,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
         }
         const declaredType = getTypeForDeclaration(resolvedDecl);
-        if (declaredType) {
-            return declaredType;
+        if (declaredType.type) {
+            return declaredType.type;
         }
         // If this is part of a "py.typed" package, don't fall back on type inference
         // unless it's marked Final, is a constant, or is a declared type alias.
@@ -14801,7 +14979,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         isUnambiguousType = true;
                     }
                 }
-                if (resolvedDecl.isFinal || resolvedDecl.isConstant) {
+                if (isFinalVariableDeclaration(resolvedDecl) || resolvedDecl.isConstant) {
                     isUnambiguousType = true;
                 }
             }
@@ -14814,7 +14992,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             })) === null || _a === void 0 ? void 0 : _a.type;
         }
         if (resolvedDecl.type === 1 /* Variable */ && resolvedDecl.inferredTypeSource) {
-            const isTypeAlias = (0, declarationUtils_1.isExplicitTypeAliasDeclaration)(resolvedDecl) || isPossibleTypeAliasOrTypedDict(resolvedDecl);
+            const isTypeAlias = isExplicitTypeAliasDeclaration(resolvedDecl) || isPossibleTypeAliasOrTypedDict(resolvedDecl);
             // If this is a type alias, evaluate types for the entire assignment
             // statement rather than just the RHS of the assignment.
             const typeSource = isTypeAlias && resolvedDecl.inferredTypeSource.parent
@@ -14936,27 +15114,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     }
     function getEffectiveTypeOfSymbolForUsage(symbol, usageNode, useLastDecl = false) {
         var _a, _b;
-        // If there's a declared type, it takes precedence over inferred types.
-        if (symbol.hasTypedDeclarations()) {
-            const declaredType = getDeclaredTypeOfSymbol(symbol, usageNode);
-            const typedDecls = symbol.getTypedDeclarations();
-            let isIncomplete = false;
-            if (declaredType) {
-                if ((0, types_1.isFunction)(declaredType) && types_1.FunctionType.isPartiallyEvaluated(declaredType)) {
-                    isIncomplete = true;
-                }
-                else if ((0, types_1.isClass)(declaredType) && types_1.ClassType.isPartiallyEvaluated(declaredType)) {
-                    isIncomplete = true;
-                }
-            }
-            return {
-                type: declaredType !== null && declaredType !== void 0 ? declaredType : types_1.UnknownType.create(),
-                isIncomplete,
-                includesVariableDecl: typedDecls.some((decl) => decl.type === 1 /* Variable */),
-                includesIllegalTypeAliasDecl: !typedDecls.every((decl) => (0, declarationUtils_1.isPossibleTypeAliasDeclaration)(decl)),
-                isRecursiveDefinition: !declaredType,
-            };
-        }
         // Look in the cache to see if we've computed this already.
         let cacheEntries = effectiveTypeCache.get(symbol.id);
         const usageNodeId = usageNode ? usageNode.id : undefined;
@@ -14969,10 +15126,37 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
             }
         }
+        let declaredTypeInfo;
+        // If there's a declared type, it takes precedence over inferred types.
+        if (symbol.hasTypedDeclarations()) {
+            declaredTypeInfo = getDeclaredTypeOfSymbol(symbol, usageNode);
+            const declaredType = declaredTypeInfo === null || declaredTypeInfo === void 0 ? void 0 : declaredTypeInfo.type;
+            const hasMetadata = !!declaredTypeInfo.isTypeAlias;
+            if (declaredType || !hasMetadata) {
+                let isIncomplete = false;
+                if (declaredType) {
+                    if ((0, types_1.isFunction)(declaredType) && types_1.FunctionType.isPartiallyEvaluated(declaredType)) {
+                        isIncomplete = true;
+                    }
+                    else if ((0, types_1.isClass)(declaredType) && types_1.ClassType.isPartiallyEvaluated(declaredType)) {
+                        isIncomplete = true;
+                    }
+                }
+                const typedDecls = symbol.getTypedDeclarations();
+                const result = {
+                    type: declaredType !== null && declaredType !== void 0 ? declaredType : types_1.UnknownType.create(),
+                    isIncomplete,
+                    includesVariableDecl: typedDecls.some((decl) => decl.type === 1 /* Variable */),
+                    includesIllegalTypeAliasDecl: !typedDecls.every((decl) => isPossibleTypeAliasDeclaration(decl)),
+                    isRecursiveDefinition: !declaredType,
+                };
+                addToEffectiveTypeCache(result);
+                return result;
+            }
+        }
         // Infer the type.
         const typesToCombine = [];
         const decls = symbol.getDeclarations();
-        const isFinalVar = (0, symbolUtils_1.isFinalVariable)(symbol);
         let isIncomplete = false;
         let sawPendingEvaluation = false;
         let includesVariableDecl = false;
@@ -14980,13 +15164,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         let declIndexToConsider;
         // Limit the number of declarations to explore.
         if (decls.length > maxDeclarationsToUseForInference) {
-            return {
+            const result = {
                 type: types_1.UnknownType.create(),
                 isIncomplete: false,
                 includesVariableDecl: false,
-                includesIllegalTypeAliasDecl: !decls.every((decl) => (0, declarationUtils_1.isPossibleTypeAliasDeclaration)(decl)),
+                includesIllegalTypeAliasDecl: !decls.every((decl) => isPossibleTypeAliasDeclaration(decl)),
                 isRecursiveDefinition: false,
             };
+            addToEffectiveTypeCache(result);
+            return result;
         }
         // If the caller has requested that we use only the last decl, we
         // will use only the last one, but we'll ignore decls that are in
@@ -15036,7 +15222,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 const resolvedDecl = (_a = resolveAliasDeclaration(decl, 
                 /* resolveLocalNames */ true, 
                 /* allowExternallyHiddenAccess */ AnalyzerNodeInfo.getFileInfo(decl.node).isStubFile)) !== null && _a !== void 0 ? _a : decl;
-                const isExplicitTypeAlias = (0, declarationUtils_1.isExplicitTypeAliasDeclaration)(decl);
+                const isExplicitTypeAlias = isExplicitTypeAliasDeclaration(decl);
                 const isTypeAlias = isExplicitTypeAlias || isPossibleTypeAliasOrTypedDict(decl);
                 if (isExplicitTypeAlias) {
                     sawExplicitTypeAlias = true;
@@ -15047,14 +15233,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     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 (resolvedDecl.typeAliasAnnotation) {
-                        // Mark "TypeAlias" declaration as accessed.
-                        getTypeOfAnnotation(resolvedDecl.typeAliasAnnotation, {
-                            isVariableAnnotation: true,
-                            allowFinal: ParseTreeUtils.isFinalAllowedForAssignmentTarget(resolvedDecl.node),
-                            allowClassVar: ParseTreeUtils.isClassVarAllowedForAssignmentTarget(resolvedDecl.node),
-                        });
-                    }
                 }
                 if (pushSymbolResolution(symbol, decl)) {
                     try {
@@ -15070,7 +15248,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                                 if (!fileInfo.isTypingStubFile) {
                                     includesVariableDecl = true;
                                 }
-                                let isConstant = resolvedDecl.type === 1 /* Variable */ && !!resolvedDecl.isConstant;
+                                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) &&
@@ -15080,7 +15263,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                                 }
                                 // 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 && !isFinalVar) {
+                                if (types_1.TypeBase.isInstance(type) && !isExplicitTypeAlias && !isConstant) {
                                     type = stripLiteralValue(type);
                                 }
                             }
@@ -15124,17 +15307,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 type: (0, types_1.combineTypes)(typesToCombine),
                 isIncomplete,
                 includesVariableDecl,
-                includesIllegalTypeAliasDecl: !decls.every((decl) => (0, declarationUtils_1.isPossibleTypeAliasDeclaration)(decl)),
+                includesIllegalTypeAliasDecl: !decls.every((decl) => isPossibleTypeAliasDeclaration(decl)),
                 isRecursiveDefinition: false,
                 evaluationAttempts,
             };
             if (!includesSpeculativeResult) {
-                // 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);
+                addToEffectiveTypeCache(result);
             }
             return result;
         }
@@ -15142,19 +15320,33 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             type: types_1.UnboundType.create(),
             isIncomplete,
             includesVariableDecl,
-            includesIllegalTypeAliasDecl: !decls.every((decl) => (0, declarationUtils_1.isPossibleTypeAliasDeclaration)(decl)),
+            includesIllegalTypeAliasDecl: !decls.every((decl) => isPossibleTypeAliasDeclaration(decl)),
             isRecursiveDefinition: false,
         };
+        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
+    // explicit declared type, its type will need to be inferred instead. In some
+    // cases, non-type information (such as Final or ClassVar attributes) may be
+    // provided, but type inference is still required. In such cases, the attributes
+    // are returned as flags.
     function getDeclaredTypeOfSymbol(symbol, usageNode) {
         const synthesizedType = symbol.getSynthesizedType();
         if (synthesizedType) {
-            return synthesizedType;
+            return { type: synthesizedType };
         }
         let typedDecls = symbol.getTypedDeclarations();
         if (typedDecls.length === 0) {
             // There was no declaration with a defined type.
-            return undefined;
+            return { type: undefined };
         }
         // If there is more than one typed decl, filter out any that are not
         // reachable from the usage node (if specified). This can happen in
@@ -15175,7 +15367,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 return true;
             });
             if (filteredTypedDecls.length === 0) {
-                return types_1.UnboundType.create();
+                return { type: types_1.UnboundType.create() };
             }
             typedDecls = filteredTypedDecls;
         }
@@ -15191,12 +15383,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // for recursive symbol resolution, return it as the resolved type.
             const partialType = getSymbolResolutionPartialType(symbol, decl);
             if (partialType) {
-                return partialType;
+                return { type: partialType };
             }
             if (getIndexOfSymbolResolution(symbol, decl) < 0) {
                 if (pushSymbolResolution(symbol, decl)) {
                     try {
-                        const type = getTypeForDeclaration(decl);
+                        const declaredTypeInfo = getTypeForDeclaration(decl);
                         // If there was recursion detected, don't use this declaration.
                         // The exception is it's a class declaration because getTypeOfClass
                         // handles recursion by populating a partially-created class type
@@ -15204,7 +15396,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         // circular dependency between the "type" and "object" classes in
                         // builtins.pyi (since "object" is a "type" and "type" is an "object").
                         if (popSymbolResolution(symbol) || decl.type === 6 /* Class */) {
-                            return type;
+                            return declaredTypeInfo;
                         }
                     }
                     catch (e) {
@@ -15216,7 +15408,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
             declIndex--;
         }
-        return undefined;
+        return { type: undefined };
     }
     function inferReturnTypeIfNecessary(type) {
         if ((0, types_1.isFunction)(type)) {
@@ -15577,18 +15769,22 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return false;
     }
     // This function is used to validate or infer the variance of type
-    // parameters within a class.
-    function assignClassToSelf(destType, srcType, recursionCount = 0) {
+    // parameters within a class. If ignoreBaseClassVariance is set to false,
+    // the type parameters for the base class are honored. This is useful for
+    // variance inference (PEP 695). For validation of protocol variance, we
+    // want to ignore the variance for all base classes in the class hierarchy.
+    function assignClassToSelf(destType, srcType, ignoreBaseClassVariance = true, recursionCount = 0) {
         (0, debug_1.assert)(types_1.ClassType.isSameGenericClass(destType, srcType));
         (0, debug_1.assert)(destType.details.typeParameters.length > 0);
         const diag = new diagnostic_1.DiagnosticAddendum();
         const typeVarContext = new typeVarContext_1.TypeVarContext();
         let isAssignable = true;
         destType.details.fields.forEach((symbol, name) => {
+            var _a;
             if (isAssignable && symbol.isClassMember() && !symbol.isIgnoredForProtocolMatch()) {
                 const memberInfo = (0, typeUtils_1.lookUpClassMember)(srcType, name);
                 (0, debug_1.assert)(memberInfo !== undefined);
-                let destMemberType = getDeclaredTypeOfSymbol(symbol);
+                let destMemberType = (_a = getDeclaredTypeOfSymbol(symbol)) === null || _a === void 0 ? void 0 : _a.type;
                 if (destMemberType) {
                     const srcMemberType = getTypeOfMember(memberInfo);
                     destMemberType = (0, typeUtils_1.partiallySpecializeType)(destMemberType, destType);
@@ -15606,7 +15802,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         const primaryDecl = symbol.getDeclarations()[0];
                         // Class and instance variables that are mutable need to
                         // enforce invariance.
-                        const flags = (primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.type) === 1 /* Variable */ && !primaryDecl.isFinal
+                        const flags = (primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.type) === 1 /* Variable */ && !isFinalVariableDeclaration(primaryDecl)
                             ? 1 /* EnforceInvariance */
                             : 0 /* Default */;
                         if (!assignType(destMemberType, srcMemberType, diag, typeVarContext, 
@@ -15626,7 +15822,31 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 baseClass.details.typeParameters.length > 0) {
                 const specializedDestBaseClass = (0, typeUtils_1.specializeForBaseClass)(destType, baseClass);
                 const specializedSrcBaseClass = (0, typeUtils_1.specializeForBaseClass)(srcType, baseClass);
-                if (!assignClassToSelf(specializedDestBaseClass, specializedSrcBaseClass, recursionCount)) {
+                if (!ignoreBaseClassVariance) {
+                    specializedDestBaseClass.details.typeParameters.forEach((param, index) => {
+                        if (!param.details.isParamSpec &&
+                            !param.details.isVariadic &&
+                            !param.details.isSynthesized &&
+                            specializedSrcBaseClass.typeArguments &&
+                            index < specializedSrcBaseClass.typeArguments.length &&
+                            specializedDestBaseClass.typeArguments &&
+                            index < specializedDestBaseClass.typeArguments.length) {
+                            const paramVariance = param.details.declaredVariance;
+                            if ((0, types_1.isTypeVar)(specializedSrcBaseClass.typeArguments[index])) {
+                                if (paramVariance === 2 /* Invariant */ || paramVariance === 4 /* Contravariant */) {
+                                    isAssignable = false;
+                                }
+                            }
+                            else if ((0, types_1.isTypeVar)(specializedDestBaseClass.typeArguments[index])) {
+                                if (paramVariance === 2 /* Invariant */ || paramVariance === 3 /* Covariant */) {
+                                    isAssignable = false;
+                                }
+                            }
+                        }
+                    });
+                }
+                if (isAssignable &&
+                    !assignClassToSelf(specializedDestBaseClass, specializedSrcBaseClass, ignoreBaseClassVariance, recursionCount)) {
                     isAssignable = false;
                 }
             }
@@ -15723,12 +15943,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // specified inheritance chain, taking into account its type arguments.
     function assignClassWithTypeArgs(destType, srcType, inheritanceChain, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
         let curSrcType = srcType;
-        let curTypeVarContext = destTypeVarContext;
+        let curDestTypeVarContext = destTypeVarContext;
         let effectiveFlags = flags;
         inferTypeParameterVarianceForClass(destType);
         effectiveFlags |= 8 /* SkipSolveTypeVars */;
         if (!destTypeVarContext) {
-            curTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(destType));
+            curDestTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(destType));
             effectiveFlags &= ~8 /* SkipSolveTypeVars */;
         }
         else {
@@ -15739,6 +15959,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         for (let ancestorIndex = inheritanceChain.length - 1; ancestorIndex >= 0; ancestorIndex--) {
             const ancestorType = inheritanceChain[ancestorIndex];
+            const curSrcTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(curSrcType));
             // If we've hit an "unknown", all bets are off, and we need to assume
             // that the type is assignable.
             if ((0, types_1.isUnknown)(ancestorType)) {
@@ -15756,7 +15977,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // Handle built-in types that support arbitrary numbers
             // of type parameters like Tuple.
             if (ancestorIndex === 0 && destType.tupleTypeArguments && curSrcType.tupleTypeArguments) {
-                return assignTupleTypeArgs(destType, curSrcType, diag, curTypeVarContext, flags, recursionCount);
+                return assignTupleTypeArgs(destType, curSrcType, diag, curDestTypeVarContext, flags, recursionCount);
             }
             // If there are no type parameters on this class, we're done.
             const ancestorTypeParams = types_1.ClassType.getTypeParameters(ancestorType);
@@ -15768,12 +15989,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 return true;
             }
             // Validate that the type arguments match.
-            if (!verifyTypeArgumentsAssignable(ancestorType, curSrcType, diag, curTypeVarContext, 
-            /* srcTypeVarContext */ undefined, effectiveFlags, recursionCount)) {
+            if (!verifyTypeArgumentsAssignable(ancestorType, curSrcType, diag, curDestTypeVarContext, curSrcTypeVarContext, effectiveFlags, recursionCount)) {
                 return false;
             }
             // Allocate a new type var map for the next time through the loop.
-            curTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(ancestorType));
+            curDestTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(ancestorType));
             effectiveFlags &= ~8 /* SkipSolveTypeVars */;
         }
         if (destType.typeArguments) {
@@ -15799,12 +16019,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return true;
     }
     function getGetterTypeFromProperty(propertyClass, inferTypeIfNeeded) {
+        var _a;
         if (!types_1.ClassType.isPropertyClass(propertyClass)) {
             return undefined;
         }
         const fgetSymbol = propertyClass.details.fields.get('fget');
         if (fgetSymbol) {
-            const fgetType = getDeclaredTypeOfSymbol(fgetSymbol);
+            const fgetType = (_a = getDeclaredTypeOfSymbol(fgetSymbol)) === null || _a === void 0 ? void 0 : _a.type;
             if (fgetType && (0, types_1.isFunction)(fgetType)) {
                 return getFunctionEffectiveReturnType(fgetType, /* args */ undefined, inferTypeIfNeeded);
             }
@@ -16136,8 +16357,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if ((0, types_1.isUnion)(destType)) {
             return assignToUnionType(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, originalFlags, recursionCount);
         }
-        if ((0, types_1.isNoneInstance)(destType) && (0, types_1.isNoneInstance)(srcType)) {
-            return true;
+        if ((0, types_1.isNoneInstance)(destType)) {
+            if ((0, types_1.isNoneInstance)(srcType)) {
+                return true;
+            }
+            if ((0, types_1.isClassInstance)(srcType) && types_1.ClassType.isBuiltIn(srcType, 'NoneType')) {
+                return true;
+            }
         }
         if ((0, types_1.isNoneTypeClass)(destType)) {
             if ((0, types_1.isNoneTypeClass)(srcType)) {
@@ -16519,6 +16745,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     });
                 }
                 else if (remainingSrcSubtypes.length === 0) {
+                    if ((flags & 1024 /* PopulatingExpectedType */) !== 0) {
+                        // If we're populating an expected type, try not to leave
+                        // any TypeVars unsolved. Assign the full type to the remaining
+                        // dest TypeVars.
+                        remainingDestSubtypes.forEach((destSubtype) => {
+                            assignType(destSubtype, srcType, 
+                            /* diag */ undefined, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
+                        });
+                    }
                     // If we've assigned all of the source subtypes but one or more dest
                     // TypeVars have gone unmatched, treat this as success.
                     return true;
@@ -17521,14 +17756,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // When a value is assigned to a variable with a declared type,
     // we may be able to narrow the type based on the assignment.
     function narrowTypeBasedOnAssignment(declaredType, assignedType) {
-        const diag = new diagnostic_1.DiagnosticAddendum();
         const narrowedType = (0, typeUtils_1.mapSubtypes)(assignedType, (assignedSubtype) => {
             const narrowedSubtype = (0, typeUtils_1.mapSubtypes)(declaredType, (declaredSubtype) => {
                 // We can't narrow "Any".
                 if ((0, types_1.isAnyOrUnknown)(declaredType)) {
                     return declaredType;
                 }
-                if (assignType(declaredSubtype, assignedSubtype, diag)) {
+                if (assignType(declaredSubtype, assignedSubtype)) {
                     // If the source is generic and has unspecified type arguments,
                     // see if we can determine then based on the declared type.
                     if ((0, types_1.isInstantiableClass)(declaredSubtype) && (0, types_1.isInstantiableClass)(assignedSubtype)) {
@@ -18012,7 +18246,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         else if ((0, types_1.isOverloadedFunction)(memberType)) {
             const newOverloadType = types_1.OverloadedFunctionType.create([]);
-            memberType.overloads.forEach((overload) => {
+            // Don't bother binding the implementation.
+            types_1.OverloadedFunctionType.getOverloads(memberType).forEach((overload) => {
                 const boundMethod = bindFunctionToClassOrObject(baseType, overload, memberClass, 
                 /* errorNode */ undefined, recursionCount, treatConstructorAsClassMember, firstParamType);
                 if (boundMethod) {
@@ -18049,7 +18284,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             const memberTypeFirstParamType = types_1.FunctionType.getEffectiveParameterType(memberType, 0);
             // Fill out the typeVarContext for the "self" or "cls" parameter.
             typeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeId)(memberType));
-            const diag = new diagnostic_1.DiagnosticAddendum();
+            const diag = errorNode ? new diagnostic_1.DiagnosticAddendum() : undefined;
             if ((0, types_1.isTypeVar)(memberTypeFirstParamType) &&
                 memberTypeFirstParamType.details.boundType &&
                 (0, types_1.isClassInstance)(memberTypeFirstParamType.details.boundType) &&
@@ -18075,7 +18310,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             type: printType(baseType),
                             methodName: methodName,
                             paramName: memberTypeFirstParam.name,
-                        }) + diag.getString(), errorNode);
+                        }) + (diag === null || diag === void 0 ? void 0 : diag.getString()), errorNode);
                     }
                     else {
                         // If there was no errorNode, we couldn't report the error,
@@ -18092,6 +18327,60 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const specializedFunction = (0, typeUtils_1.applySolvedTypeVars)(memberType, typeVarContext);
         return types_1.FunctionType.clone(specializedFunction, stripFirstParam, baseType, (0, typeUtils_1.getTypeVarScopeId)(baseType));
     }
+    function isFinalVariable(symbol) {
+        return symbol.getDeclarations().some((decl) => isFinalVariableDeclaration(decl));
+    }
+    function isFinalVariableDeclaration(decl) {
+        return decl.type === 1 /* Variable */ && !!decl.isFinal;
+    }
+    function isExplicitTypeAliasDeclaration(decl) {
+        if (decl.type !== 1 /* Variable */ || !decl.typeAnnotationNode) {
+            return false;
+        }
+        if (decl.typeAnnotationNode.nodeType !== 38 /* Name */ &&
+            decl.typeAnnotationNode.nodeType !== 35 /* MemberAccess */ &&
+            decl.typeAnnotationNode.nodeType !== 48 /* StringList */) {
+            return false;
+        }
+        const type = getTypeOfAnnotation(decl.typeAnnotationNode, { isVariableAnnotation: true, allowClassVar: true });
+        return (0, types_1.isClassInstance)(type) && types_1.ClassType.isBuiltIn(type, 'TypeAlias');
+    }
+    function isPossibleTypeAliasDeclaration(decl) {
+        var _a;
+        if (decl.type !== 1 /* Variable */ || !decl.typeAliasName || decl.typeAnnotationNode) {
+            return false;
+        }
+        if (((_a = decl.node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) !== 3 /* Assignment */) {
+            return false;
+        }
+        // Perform a sanity check on the RHS expression. Some expression
+        // forms should never be considered legitimate for type aliases.
+        return isLegalTypeAliasExpressionForm(decl.node.parent.rightExpression);
+    }
+    function isLegalTypeAliasExpressionForm(node) {
+        switch (node.nodeType) {
+            case 0 /* Error */:
+            case 55 /* UnaryOperation */:
+            case 4 /* AssignmentExpression */:
+            case 54 /* TypeAnnotation */:
+            case 6 /* Await */:
+            case 51 /* Ternary */:
+            case 56 /* Unpack */:
+            case 52 /* Tuple */:
+            case 9 /* Call */:
+            case 32 /* ListComprehension */:
+            case 46 /* Slice */:
+            case 60 /* Yield */:
+            case 61 /* YieldFrom */:
+            case 30 /* Lambda */:
+            case 40 /* Number */:
+            case 15 /* Dictionary */:
+            case 31 /* List */:
+            case 45 /* Set */:
+                return false;
+        }
+        return true;
+    }
     function printObjectTypeForClass(type) {
         return TypePrinter.printObjectTypeForClass(type, evaluatorOptions.printTypeFlags, getFunctionEffectiveReturnType);
     }
@@ -18234,6 +18523,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         verifyTypeArgumentsAssignable,
         inferReturnTypeIfNecessary,
         inferTypeParameterVarianceForClass,
+        isFinalVariable,
+        isFinalVariableDeclaration,
+        isExplicitTypeAliasDeclaration,
         addError,
         addWarning,
         addInformation,