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

package/dist/analyzer/typeEvaluator.js

@@ -679,7 +679,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             case 3 /* ParseNodeType.Assignment */: {
                 typeResult = getTypeOfExpression(node.rightExpression, flags, inferenceContext, signatureTracker);
-                assignTypeToExpression(node.leftExpression, typeResult.type, !!typeResult.isIncomplete, node.rightExpression, 
+                assignTypeToExpression(node.leftExpression, typeResult, node.rightExpression, 
                 /* ignoreEmptyContainers */ true, 
                 /* allowAssignmentToFinalVar */ true);
                 break;
@@ -689,8 +689,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     addError(localize_1.LocMessage.walrusNotAllowed(), node);
                 }
                 typeResult = getTypeOfExpression(node.rightExpression, flags, inferenceContext, signatureTracker);
-                assignTypeToExpression(node.name, typeResult.type, !!typeResult.isIncomplete, node.rightExpression, 
-                /* ignoreEmptyContainers */ true);
+                assignTypeToExpression(node.name, typeResult, node.rightExpression, /* ignoreEmptyContainers */ true);
                 break;
             }
             case 60 /* ParseNodeType.Yield */: {
@@ -1271,9 +1270,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             const concreteSubtype = makeTopLevelTypeVarsConcrete(subtype);
             if ((0, types_1.isClassInstance)(concreteSubtype)) {
                 if (concreteSubtype.literalValue !== undefined) {
+                    let isLiteralFalsy;
+                    if (concreteSubtype.literalValue instanceof types_1.EnumLiteral) {
+                        isLiteralFalsy = !canBeTruthy(concreteSubtype);
+                    }
+                    else {
+                        isLiteralFalsy = !concreteSubtype.literalValue;
+                    }
                     // If the object is already definitely falsy, it's fine to
                     // include, otherwise it should be removed.
-                    return !concreteSubtype.literalValue ? subtype : undefined;
+                    return isLiteralFalsy ? subtype : undefined;
                 }
                 // If the object is a bool, make it "false", since
                 // "true" is a truthy value.
@@ -1307,9 +1313,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             const concreteSubtype = makeTopLevelTypeVarsConcrete(subtype);
             if ((0, types_1.isClassInstance)(concreteSubtype)) {
                 if (concreteSubtype.literalValue !== undefined) {
+                    let isLiteralTruthy;
+                    if (concreteSubtype.literalValue instanceof types_1.EnumLiteral) {
+                        isLiteralTruthy = !canBeFalsy(concreteSubtype);
+                    }
+                    else {
+                        isLiteralTruthy = !!concreteSubtype.literalValue;
+                    }
                     // If the object is already definitely truthy, it's fine to
                     // include, otherwise it should be removed.
-                    return concreteSubtype.literalValue ? subtype : undefined;
+                    return isLiteralTruthy ? subtype : undefined;
                 }
                 // If the object is a bool, make it "true", since
                 // "false" is a falsy value.
@@ -2022,7 +2035,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 errorRange = { start: 0, length: 0 };
             }
             const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
-            addDiagnosticForTextRange(fileInfo, fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.codeTooComplexToAnalyze(), errorRange);
+            addDiagnosticForTextRange(fileInfo, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.codeTooComplexToAnalyze(), errorRange);
             return true;
         }
         return false;
@@ -2163,7 +2176,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return diagnostic;
     }
-    function addDiagnosticForTextRange(fileInfo, diagLevel, rule, message, range) {
+    function addDiagnosticForTextRange(fileInfo, rule, message, range) {
+        const diagLevel = fileInfo.diagnosticRuleSet[rule];
         if (diagLevel === 'none') {
             return undefined;
         }
@@ -2184,7 +2198,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typeExpectedClass().format({ type: printType(type) }) + diag.getString(), node);
     }
-    function assignTypeToNameNode(nameNode, type, isTypeIncomplete, ignoreEmptyContainers, srcExpression, allowAssignmentToFinalVar = false, expectedTypeDiagAddendum) {
+    function assignTypeToNameNode(nameNode, typeResult, ignoreEmptyContainers, srcExpression, allowAssignmentToFinalVar = false, expectedTypeDiagAddendum) {
         var _a, _b, _c;
         const nameValue = nameNode.value;
         const symbolWithScope = lookUpSymbolRecursive(nameNode, nameValue, /* honorCodeFlow */ false);
@@ -2211,18 +2225,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
         }
         // We found an existing declared type. Make sure the type is assignable.
-        let destType = type;
+        let destType = typeResult.type;
         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 (!assignType(declaredType, typeResult.type, diagAddendum)) {
                 // If there was an expected type mismatch, use that diagnostic
                 // addendum because it will be more informative.
                 if (expectedTypeDiagAddendum) {
                     diagAddendum = expectedTypeDiagAddendum;
                 }
-                if (!isTypeIncomplete) {
-                    addDiagnostic(diagnosticRules_1.DiagnosticRule.reportAssignmentType, localize_1.LocMessage.typeAssignmentMismatch().format(printSrcDestTypes(type, declaredType)) +
+                if (!typeResult.isIncomplete) {
+                    addDiagnostic(diagnosticRules_1.DiagnosticRule.reportAssignmentType, localize_1.LocMessage.typeAssignmentMismatch().format(printSrcDestTypes(typeResult.type, declaredType)) +
                         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.
@@ -2230,7 +2244,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             else {
                 // Constrain the resulting type to match the declared type.
-                destType = narrowTypeBasedOnAssignment(nameNode, declaredType, type);
+                destType = narrowTypeBasedOnAssignment(nameNode, declaredType, typeResult).type;
             }
         }
         else {
@@ -2263,12 +2277,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.finalReassigned().format({ name: nameValue }), nameNode);
             }
         }
-        if (!isTypeIncomplete) {
+        if (!typeResult.isIncomplete) {
             reportPossibleUnknownAssignment(fileInfo.diagnosticRuleSet.reportUnknownVariableType, diagnosticRules_1.DiagnosticRule.reportUnknownVariableType, nameNode, destType, nameNode, ignoreEmptyContainers);
         }
-        writeTypeCache(nameNode, { type: destType, isIncomplete: isTypeIncomplete }, 0 /* EvaluatorFlags.None */);
+        writeTypeCache(nameNode, { type: destType, isIncomplete: typeResult.isIncomplete }, 0 /* EvaluatorFlags.None */);
     }
-    function assignTypeToMemberAccessNode(target, type, isTypeIncomplete, srcExpr, expectedTypeDiagAddendum) {
+    function assignTypeToMemberAccessNode(target, typeResult, srcExpr, expectedTypeDiagAddendum) {
         var _a;
         const baseTypeResult = getTypeOfExpression(target.leftExpression, 2 /* EvaluatorFlags.MemberAccessBaseDefaults */);
         const baseType = makeTopLevelTypeVarsConcrete(baseTypeResult.type);
@@ -2281,14 +2295,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if (classTypeResults && (0, types_1.isInstantiableClass)(classTypeResults.classType)) {
                     if ((0, types_1.isClassInstance)(baseType)) {
                         if (types_1.ClassType.isSameGenericClass(baseType, classTypeResults.classType)) {
-                            assignTypeToMemberVariable(target, type, isTypeIncomplete, 
-                            /* isInstanceMember */ true, srcExpr);
+                            assignTypeToMemberVariable(target, typeResult, /* isInstanceMember */ true, srcExpr);
                         }
                     }
                     else if ((0, types_1.isInstantiableClass)(baseType)) {
                         if (types_1.ClassType.isSameGenericClass(baseType, classTypeResults.classType)) {
-                            assignTypeToMemberVariable(target, type, isTypeIncomplete, 
-                            /* isInstanceMember */ false, srcExpr);
+                            assignTypeToMemberVariable(target, typeResult, /* isInstanceMember */ false, srcExpr);
                         }
                     }
                     // Assignments to instance or class variables through "self" or "cls" is not
@@ -2309,7 +2321,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         const setTypeResult = getTypeOfMemberAccessWithBaseType(target, baseTypeResult, {
             method: 'set',
-            setType: { type, isIncomplete: isTypeIncomplete },
+            setType: typeResult,
             setErrorNode: srcExpr,
             setExpectedTypeDiag: expectedTypeDiagAddendum,
         }, 0 /* EvaluatorFlags.None */);
@@ -2317,14 +2329,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             setAsymmetricDescriptorAssignment(target);
         }
         const resultToCache = {
-            type: (_a = setTypeResult.narrowedTypeForSet) !== null && _a !== void 0 ? _a : type,
-            isIncomplete: isTypeIncomplete,
+            type: (_a = setTypeResult.narrowedTypeForSet) !== null && _a !== void 0 ? _a : typeResult.type,
+            isIncomplete: typeResult.isIncomplete,
             memberAccessDeprecationInfo: setTypeResult.memberAccessDeprecationInfo,
         };
         writeTypeCache(target.memberName, resultToCache, 0 /* EvaluatorFlags.None */);
         writeTypeCache(target, resultToCache, 0 /* EvaluatorFlags.None */);
     }
-    function assignTypeToMemberVariable(node, srcType, isTypeIncomplete, isInstanceMember, srcExprNode) {
+    function assignTypeToMemberVariable(node, typeResult, isInstanceMember, srcExprNode) {
         var _a;
         const memberName = node.memberName.value;
         const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
@@ -2394,20 +2406,20 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             // The class variable is accessed in this case.
                             setSymbolAccessed(fileInfo, memberInfo.symbol, node.memberName);
                             const memberType = getTypeOfMember(memberInfo);
-                            srcType = (0, types_1.combineTypes)([srcType, memberType]);
+                            typeResult = { ...typeResult, type: (0, types_1.combineTypes)([typeResult.type, memberType]) };
                         }
                     }
                 }
             }
             // Look up the member info again, now that we've potentially updated it.
             memberInfo = (0, typeUtils_1.lookUpClassMember)(classTypeInfo.classType, memberName, 64 /* MemberAccessFlags.DeclaredTypesOnly */);
-            if (!memberInfo && srcExprNode && !isTypeIncomplete) {
-                reportPossibleUnknownAssignment(fileInfo.diagnosticRuleSet.reportUnknownMemberType, diagnosticRules_1.DiagnosticRule.reportUnknownMemberType, node.memberName, srcType, node, 
+            if (!memberInfo && srcExprNode && !typeResult.isIncomplete) {
+                reportPossibleUnknownAssignment(fileInfo.diagnosticRuleSet.reportUnknownMemberType, diagnosticRules_1.DiagnosticRule.reportUnknownMemberType, node.memberName, typeResult.type, node, 
                 /* ignoreEmptyContainers */ true);
             }
         }
     }
-    function assignTypeToTupleOrListNode(target, type, isTypeIncomplete, srcExpr) {
+    function assignTypeToTupleOrListNode(target, typeResult, srcExpr) {
         const targetExpressions = target.nodeType === 34 /* ParseNodeType.List */ ? target.entries : target.expressions;
         // Initialize the array of target types, one for each target.
         const targetTypes = new Array(targetExpressions.length);
@@ -2418,9 +2430,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // Do any of the targets use an unpack operator? If so, it will consume all of the
         // entries at that location.
         const unpackIndex = targetExpressions.findIndex((expr) => expr.nodeType === 56 /* ParseNodeType.Unpack */);
-        type = makeTopLevelTypeVarsConcrete(type);
+        typeResult = { ...typeResult, type: makeTopLevelTypeVarsConcrete(typeResult.type) };
         const diagAddendum = new diagnostic_1.DiagnosticAddendum();
-        (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
+        (0, typeUtils_1.doForEachSubtype)(typeResult.type, (subtype) => {
             var _a, _b;
             // Is this subtype a tuple?
             const tupleType = (0, typeUtils_1.getSpecializedTupleType)(subtype);
@@ -2475,7 +2487,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             else {
                 // The assigned expression isn't a tuple, so it had better
                 // be some iterable type.
-                const iterableType = (_b = (_a = getTypeOfIterator({ type: subtype, isIncomplete: isTypeIncomplete }, /* isAsync */ false, srcExpr)) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : types_1.UnknownType.create();
+                const iterableType = (_b = (_a = getTypeOfIterator({ type: subtype, isIncomplete: typeResult.isIncomplete }, 
+                /* isAsync */ false, srcExpr)) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : types_1.UnknownType.create();
                 for (let index = 0; index < targetExpressions.length; index++) {
                     targetTypes[index].push((0, typeUtils_1.addConditionToType)(iterableType, (0, typeUtils_1.getTypeCondition)(subtype)));
                 }
@@ -2485,7 +2498,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportAssignmentType, (target.nodeType === 34 /* ParseNodeType.List */
                 ? localize_1.LocMessage.listAssignmentMismatch()
                 : localize_1.LocMessage.tupleAssignmentMismatch()).format({
-                type: printType(type),
+                type: printType(typeResult.type),
             }) + diagAddendum.getString(), target);
         }
         // Assign the resulting types to the individual names in the tuple
@@ -2493,9 +2506,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         targetExpressions.forEach((expr, index) => {
             const typeList = targetTypes[index];
             const targetType = typeList.length === 0 ? types_1.UnknownType.create() : (0, types_1.combineTypes)(typeList);
-            assignTypeToExpression(expr, targetType, isTypeIncomplete, srcExpr, /* ignoreEmptyContainers */ true);
+            assignTypeToExpression(expr, { type: targetType, isIncomplete: typeResult.isIncomplete }, srcExpr, 
+            /* ignoreEmptyContainers */ true);
         });
-        writeTypeCache(target, { type, isIncomplete: isTypeIncomplete }, 0 /* EvaluatorFlags.None */);
+        writeTypeCache(target, typeResult, 0 /* EvaluatorFlags.None */);
     }
     // If the type includes promotion types, expand these to their constituent types.
     function expandPromotionTypes(node, type, excludeBytes = false) {
@@ -2546,11 +2560,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             // If this is a function that contains only a ParamSpec (no additional
             // parameters), convert it to a concrete type of (*args: Any, **kwargs: Any).
-            if (makeParamSpecsConcrete &&
-                (0, types_1.isFunction)(subtype) &&
-                subtype.details.parameters.length === 0 &&
-                subtype.details.paramSpec) {
-                return types_1.FunctionType.cloneForParamSpec(subtype, (0, typeUtils_1.getUnknownTypeForCallable)());
+            if (makeParamSpecsConcrete && (0, types_1.isFunction)(subtype)) {
+                const convertedType = (0, typeUtils_1.convertParamSpecValueToType)(subtype);
+                if ((0, types_1.isParamSpec)(convertedType)) {
+                    return types_1.FunctionType.applyParamSpecValue(subtype, (0, typeUtils_1.getUnknownTypeForCallable)());
+                }
             }
             if ((0, types_1.isTypeVar)(subtype) && subtype.details.isVariadic) {
                 // If it's in a union, convert to type or object.
@@ -2719,9 +2733,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             });
         }
     }
-    function assignTypeToExpression(target, type, isTypeIncomplete, srcExpr, ignoreEmptyContainers = false, allowAssignmentToFinalVar = false, expectedTypeDiagAddendum) {
+    function assignTypeToExpression(target, typeResult, srcExpr, ignoreEmptyContainers = false, allowAssignmentToFinalVar = false, expectedTypeDiagAddendum) {
         // Is the source expression a TypeVar() call?
-        if ((0, types_1.isTypeVar)(type)) {
+        if ((0, types_1.isTypeVar)(typeResult.type)) {
             if (srcExpr && srcExpr.nodeType === 9 /* ParseNodeType.Call */) {
                 const callType = getTypeOfExpression(srcExpr.leftExpression, 2 /* EvaluatorFlags.CallBaseDefaults */).type;
                 if ((0, types_1.isInstantiableClass)(callType) &&
@@ -2729,13 +2743,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         types_1.ClassType.isBuiltIn(callType, 'TypeVarTuple') ||
                         types_1.ClassType.isBuiltIn(callType, 'ParamSpec'))) {
                     const typeVarTarget = target.nodeType === 54 /* ParseNodeType.TypeAnnotation */ ? target.valueExpression : target;
-                    if (typeVarTarget.nodeType !== 38 /* ParseNodeType.Name */ || typeVarTarget.value !== type.details.name) {
-                        addError(type.details.isParamSpec
+                    if (typeVarTarget.nodeType !== 38 /* ParseNodeType.Name */ ||
+                        typeVarTarget.value !== typeResult.type.details.name) {
+                        addError(typeResult.type.details.isParamSpec
                             ? localize_1.LocMessage.paramSpecAssignedName().format({
-                                name: types_1.TypeVarType.getReadableName(type),
+                                name: types_1.TypeVarType.getReadableName(typeResult.type),
                             })
                             : localize_1.LocMessage.typeVarAssignedName().format({
-                                name: types_1.TypeVarType.getReadableName(type),
+                                name: types_1.TypeVarType.getReadableName(typeResult.type),
                             }), typeVarTarget);
                     }
                 }
@@ -2744,30 +2759,32 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // If the type was partially unbound, an error will have already been logged.
         // Remove the unbound before assigning to the target expression so the unbound
         // error doesn't propagate.
-        type = (0, types_1.removeUnbound)(type);
+        if ((0, types_1.findSubtype)(typeResult.type, (subtype) => (0, types_1.isUnbound)(subtype))) {
+            typeResult = { ...typeResult, type: (0, types_1.removeUnbound)(typeResult.type) };
+        }
         switch (target.nodeType) {
             case 38 /* ParseNodeType.Name */: {
-                assignTypeToNameNode(target, type, isTypeIncomplete, ignoreEmptyContainers, srcExpr, allowAssignmentToFinalVar, expectedTypeDiagAddendum);
+                assignTypeToNameNode(target, typeResult, ignoreEmptyContainers, srcExpr, allowAssignmentToFinalVar, expectedTypeDiagAddendum);
                 break;
             }
             case 35 /* ParseNodeType.MemberAccess */: {
-                assignTypeToMemberAccessNode(target, type, isTypeIncomplete, srcExpr, expectedTypeDiagAddendum);
+                assignTypeToMemberAccessNode(target, typeResult, srcExpr, expectedTypeDiagAddendum);
                 break;
             }
             case 27 /* ParseNodeType.Index */: {
                 const baseTypeResult = getTypeOfExpression(target.baseExpression, 2 /* EvaluatorFlags.IndexBaseDefaults */);
                 getTypeOfIndexWithBaseType(target, baseTypeResult, {
                     method: 'set',
-                    setType: { type, isIncomplete: isTypeIncomplete },
+                    setType: typeResult,
                     setErrorNode: srcExpr,
                     setExpectedTypeDiag: expectedTypeDiagAddendum,
                 }, 0 /* EvaluatorFlags.None */);
-                writeTypeCache(target, { type, isIncomplete: isTypeIncomplete }, 0 /* EvaluatorFlags.None */);
+                writeTypeCache(target, typeResult, 0 /* EvaluatorFlags.None */);
                 break;
             }
             case 34 /* ParseNodeType.List */:
             case 52 /* ParseNodeType.Tuple */: {
-                assignTypeToTupleOrListNode(target, type, isTypeIncomplete, srcExpr);
+                assignTypeToTupleOrListNode(target, typeResult, srcExpr);
                 break;
             }
             case 54 /* ParseNodeType.TypeAnnotation */: {
@@ -2782,23 +2799,25 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if (!isBareFinalOrClassVar) {
                     const isTypeAliasAnnotation = (0, types_1.isClassInstance)(annotationType) && types_1.ClassType.isBuiltIn(annotationType, 'TypeAlias');
                     if (!isTypeAliasAnnotation) {
-                        if (assignType(annotationType, type)) {
+                        if (assignType(annotationType, typeResult.type)) {
                             // Don't attempt to narrow based on the annotated type if the type
                             // is a enum because the annotated type in an enum doesn't reflect
                             // the type of the symbol.
-                            if (!(0, types_1.isClassInstance)(type) || !types_1.ClassType.isEnumClass(type)) {
-                                type = narrowTypeBasedOnAssignment(target, annotationType, type);
+                            if (!(0, types_1.isClassInstance)(typeResult.type) || !types_1.ClassType.isEnumClass(typeResult.type)) {
+                                typeResult = narrowTypeBasedOnAssignment(target, annotationType, typeResult);
                             }
                         }
                     }
                 }
-                assignTypeToExpression(target.valueExpression, type, isTypeIncomplete, srcExpr, ignoreEmptyContainers, allowAssignmentToFinalVar, expectedTypeDiagAddendum);
+                assignTypeToExpression(target.valueExpression, typeResult, srcExpr, ignoreEmptyContainers, allowAssignmentToFinalVar, expectedTypeDiagAddendum);
                 break;
             }
             case 56 /* ParseNodeType.Unpack */: {
                 if (target.expression.nodeType === 38 /* ParseNodeType.Name */) {
-                    assignTypeToNameNode(target.expression, getBuiltInObject(target.expression, 'list', [type]), 
-                    /* isIncomplete */ false, ignoreEmptyContainers, srcExpr);
+                    assignTypeToNameNode(target.expression, {
+                        type: getBuiltInObject(target.expression, 'list', [typeResult.type]),
+                        isIncomplete: typeResult.isIncomplete,
+                    }, ignoreEmptyContainers, srcExpr);
                 }
                 break;
             }
@@ -4014,7 +4033,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // descriptor-based accesses.
                 narrowedTypeForSet = isDescriptorApplied
                     ? usage.setType.type
-                    : narrowTypeBasedOnAssignment(errorNode, type, usage.setType.type);
+                    : narrowTypeBasedOnAssignment(errorNode, type, usage.setType).type;
             }
             // Verify that the assigned type is compatible.
             if (!assignType(type, usage.setType.type, diag === null || diag === void 0 ? void 0 : diag.createAddendum())) {
@@ -4301,7 +4320,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // If there's no declared return type on the getter, assume it's symmetric.
                 if (setterType.details.parameters.length >= 3 && getterType.details.declaredReturnType) {
                     const setterValueType = types_1.FunctionType.getEffectiveParameterType(setterType, 2);
-                    const getterReturnType = (_a = types_1.FunctionType.getSpecializedReturnType(getterType)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
+                    const getterReturnType = (_a = types_1.FunctionType.getEffectiveReturnType(getterType)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
                     if (!(0, types_1.isTypeSame)(setterValueType, getterReturnType)) {
                         isAsymmetric = true;
                     }
@@ -4333,7 +4352,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // If there's no declared return type on the getter, assume it's symmetric.
                 if (setterType.details.parameters.length >= 3 && getterType.details.declaredReturnType) {
                     const setterValueType = types_1.FunctionType.getEffectiveParameterType(setterType, 2);
-                    const getterReturnType = (_a = types_1.FunctionType.getSpecializedReturnType(getterType)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
+                    const getterReturnType = (_a = types_1.FunctionType.getEffectiveReturnType(getterType)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
                     if (!(0, types_1.isTypeSame)(setterValueType, getterReturnType)) {
                         isAsymmetric = true;
                     }
@@ -4699,11 +4718,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             if (index === concatTypeArgs.length - 1) {
                                 types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
                                 if ((0, types_1.isParamSpec)(typeArg)) {
-                                    functionType.details.paramSpec = typeArg;
+                                    types_1.FunctionType.addParamSpecVariadics(functionType, typeArg);
                                 }
                                 else if ((0, typeUtils_1.isEllipsisType)(typeArg)) {
                                     types_1.FunctionType.addDefaultParameters(functionType);
-                                    functionType.details.flags |= 32768 /* FunctionTypeFlags.SkipArgsKwargsCompatibilityCheck */;
+                                    functionType.details.flags |= 32768 /* FunctionTypeFlags.GradualCallableForm */;
                                 }
                             }
                             else {
@@ -4720,7 +4739,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, param, functionType, diag, typeVarContext, 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */);
                 }
                 else if ((0, typeUtils_1.isEllipsisType)(typeArgType)) {
-                    const functionType = types_1.FunctionType.createSynthesizedInstance('', 65536 /* FunctionTypeFlags.ParamSpecValue */ | 32768 /* FunctionTypeFlags.SkipArgsKwargsCompatibilityCheck */);
+                    const functionType = types_1.FunctionType.createSynthesizedInstance('', 65536 /* FunctionTypeFlags.ParamSpecValue */ | 32768 /* FunctionTypeFlags.GradualCallableForm */);
                     types_1.FunctionType.addDefaultParameters(functionType);
                     (0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, param, functionType, diag, typeVarContext);
                 }
@@ -5822,24 +5841,26 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         const type = typeResult.type;
         const exprString = ParseTreeUtils.printExpression(arg0Value);
         const typeString = printType(type, { expandTypeAlias: true });
-        if (expectedText !== undefined) {
-            if (expectedText !== typeString) {
-                addError(localize_1.LocMessage.revealTypeExpectedTextMismatch().format({
-                    expected: expectedText,
-                    received: typeString,
-                }), expectedTextNode !== null && expectedTextNode !== void 0 ? expectedTextNode : arg0Value);
+        if (!typeResult.isIncomplete) {
+            if (expectedText !== undefined) {
+                if (expectedText !== typeString) {
+                    addError(localize_1.LocMessage.revealTypeExpectedTextMismatch().format({
+                        expected: expectedText,
+                        received: typeString,
+                    }), expectedTextNode !== null && expectedTextNode !== void 0 ? expectedTextNode : arg0Value);
+                }
             }
-        }
-        if (expectedRevealType) {
-            if (!(0, types_1.isTypeSame)(expectedRevealType, type, { ignorePseudoGeneric: true })) {
-                const expectedRevealTypeText = printType(expectedRevealType);
-                addError(localize_1.LocMessage.revealTypeExpectedTypeMismatch().format({
-                    expected: expectedRevealTypeText,
-                    received: typeString,
-                }), expectedRevealTypeNode !== null && expectedRevealTypeNode !== void 0 ? expectedRevealTypeNode : arg0Value);
+            if (expectedRevealType) {
+                if (!(0, types_1.isTypeSame)(expectedRevealType, type, { ignorePseudoGeneric: true })) {
+                    const expectedRevealTypeText = printType(expectedRevealType);
+                    addError(localize_1.LocMessage.revealTypeExpectedTypeMismatch().format({
+                        expected: expectedRevealTypeText,
+                        received: typeString,
+                    }), expectedRevealTypeNode !== null && expectedRevealTypeNode !== void 0 ? expectedRevealTypeNode : arg0Value);
+                }
             }
+            addInformation(localize_1.LocAddendum.typeOfSymbol().format({ name: exprString, type: typeString }), node.arguments[0]);
         }
-        addInformation(localize_1.LocAddendum.typeOfSymbol().format({ name: exprString, type: typeString }), node.arguments[0]);
         return { type, isIncomplete: typeResult.isIncomplete };
     }
     function getTypeOfRevealLocals(node) {
@@ -7074,6 +7095,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         let reportedArgError = false;
         let isTypeIncomplete = !!typeResult.isIncomplete;
         let isVariadicTypeVarFullyMatched = false;
+        const paramSpec = types_1.FunctionType.getParamSpecFromArgsKwargs(typeResult.type);
         // Expand any unpacked tuples in the arg list.
         argList = expandArgList(argList, signatureTracker);
         // Build a map of parameters by name.
@@ -7099,6 +7121,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         let paramSpecArgList;
         let paramSpecTarget;
         let hasParamSpecArgsKwargs = false;
+        // Determine how many positional args are being passed before
+        // we see a keyword arg.
+        let positionalArgCount = argList.findIndex((arg) => arg.argumentCategory === 2 /* ArgumentCategory.UnpackedDictionary */ || arg.name !== undefined);
+        if (positionalArgCount < 0) {
+            positionalArgCount = argList.length;
+        }
         if (varArgListParamIndex !== undefined && varArgDictParamIndex !== undefined) {
             (0, debug_1.assert)(paramDetails.params[varArgListParamIndex], 'varArgListParamIndex params entry is undefined');
             const varArgListParam = paramDetails.params[varArgListParamIndex].param;
@@ -7120,16 +7148,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
                 else {
                     positionalOnlyLimitIndex = varArgListParamIndex;
+                    positionalArgCount = varArgListParamIndex;
+                    positionParamLimitIndex = varArgListParamIndex;
                 }
             }
         }
-        else if (typeResult.type.details.paramSpec) {
-            const paramSpecScopeId = typeResult.type.details.paramSpec.scopeId;
-            if ((_c = (0, typeUtils_1.getTypeVarScopeIds)(typeResult.type)) === null || _c === void 0 ? void 0 : _c.some((id) => id === paramSpecScopeId)) {
+        else if (paramSpec) {
+            if ((_c = (0, typeUtils_1.getTypeVarScopeIds)(typeResult.type)) === null || _c === void 0 ? void 0 : _c.some((id) => id === paramSpec.scopeId)) {
                 hasParamSpecArgsKwargs = true;
                 paramSpecArgList = [];
-                paramSpecTarget = types_1.TypeVarType.cloneForParamSpecAccess(typeResult.type.details.paramSpec, 
-                /* access */ undefined);
+                paramSpecTarget = paramSpec;
             }
         }
         // If there are keyword arguments present after a *args argument,
@@ -7159,12 +7187,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (positionParamLimitIndex < 0) {
             positionParamLimitIndex = paramDetails.params.length;
         }
-        // Determine how many positional args are being passed before
-        // we see a keyword arg.
-        let positionalArgCount = argList.findIndex((arg) => arg.argumentCategory === 2 /* ArgumentCategory.UnpackedDictionary */ || arg.name !== undefined);
-        if (positionalArgCount < 0) {
-            positionalArgCount = argList.length;
-        }
         let validateArgTypeParams = [];
         let activeParam;
         function trySetActive(arg, param) {
@@ -7541,13 +7563,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             reportedArgError = true;
                         }
                     }
-                    else if (typeResult.type.details.paramSpec &&
-                        (0, parameterUtils_1.isParamSpecKwargsArgument)(typeResult.type.details.paramSpec, argType)) {
+                    else if (paramSpec && (0, parameterUtils_1.isParamSpecKwargsArgument)(paramSpec, argType)) {
                         unpackedDictionaryArgType = types_1.AnyType.create();
                         if (!paramSpecArgList) {
                             validateArgTypeParams.push({
                                 paramCategory: 2 /* ParameterCategory.KwargsDict */,
-                                paramType: typeResult.type.details.paramSpec,
+                                paramType: paramSpec,
                                 requiresTypeVarMatching: false,
                                 argument: argList[argIndex],
                                 argType: (0, types_1.isParamSpec)(argType) ? undefined : types_1.AnyType.create(),
@@ -7685,17 +7706,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     else if (argList[argIndex].argumentCategory === 1 /* ArgumentCategory.UnpackedList */) {
                         // Handle the case where a *args: P.args (or *args: Any) is passed as an
                         // argument to a function that accepts a ParamSpec.
-                        if (typeResult.type.details.paramSpec) {
+                        if (paramSpec) {
                             const argTypeResult = getTypeOfArgument(argList[argIndex], 
                             /* inferenceContext */ undefined, signatureTracker);
                             const argType = argTypeResult.type;
                             if (argTypeResult.isIncomplete) {
                                 isTypeIncomplete = true;
                             }
-                            if ((0, parameterUtils_1.isParamSpecArgsArgument)(typeResult.type.details.paramSpec, argType)) {
+                            if ((0, parameterUtils_1.isParamSpecArgsArgument)(paramSpec, argType)) {
                                 validateArgTypeParams.push({
                                     paramCategory: 1 /* ParameterCategory.ArgsList */,
-                                    paramType: typeResult.type.details.paramSpec,
+                                    paramType: paramSpec,
                                     requiresTypeVarMatching: false,
                                     argument: argList[argIndex],
                                     argType: (0, types_1.isParamSpec)(argType) ? undefined : types_1.AnyType.create(),
@@ -7904,7 +7925,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             (0, types_1.isAnyOrUnknown)(inferenceContext.expectedType) ||
             (0, types_1.isNever)(inferenceContext.expectedType) ||
             !type.details.declaredReturnType ||
-            !(0, typeUtils_1.requiresSpecialization)((_a = types_1.FunctionType.getSpecializedReturnType(type)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create())) {
+            !(0, typeUtils_1.requiresSpecialization)((_a = types_1.FunctionType.getEffectiveReturnType(type)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create())) {
             return validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, signatureTracker, skipUnknownArgCheck);
         }
         const effectiveReturnType = getFunctionEffectiveReturnType(type);
@@ -7995,6 +8016,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         let specializedInitSelfType;
         let anyOrUnknownArgument;
         const typeCondition = (0, typeUtils_1.getTypeCondition)(type);
+        const paramSpec = types_1.FunctionType.getParamSpecFromArgsKwargs(type);
         // Check for an attempt to invoke an unimplemented abstract method.
         if (type.boundToType && !type.boundToType.includeSubclasses && type.details.methodClass) {
             const abstractSymbolInfo = getAbstractSymbolInfo(type.details.methodClass, type.details.name);
@@ -8015,7 +8037,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
             }
             // The type annotation for the "self" parameter in an __init__ method to
-            // can incluence the type being constructed.
+            // can influence the type being constructed.
             if (type.details.name === '__init__' &&
                 type.strippedFirstParamType &&
                 type.boundToType &&
@@ -8124,14 +8146,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     ? (0, typeUtils_1.preserveUnknown)(argResult.argType, anyOrUnknownArgument)
                     : argResult.argType;
             }
-            if (type.details.paramSpec) {
+            if (paramSpec) {
                 if (argParam.argument.argumentCategory === 1 /* ArgumentCategory.UnpackedList */) {
-                    if ((0, parameterUtils_1.isParamSpecArgsArgument)(type.details.paramSpec, argResult.argType)) {
+                    if ((0, parameterUtils_1.isParamSpecArgsArgument)(paramSpec, argResult.argType)) {
                         sawParamSpecArgs = true;
                     }
                 }
                 if (argParam.argument.argumentCategory === 2 /* ArgumentCategory.UnpackedDictionary */) {
-                    if ((0, parameterUtils_1.isParamSpecKwargsArgument)(type.details.paramSpec, argResult.argType)) {
+                    if ((0, parameterUtils_1.isParamSpecKwargsArgument)(paramSpec, argResult.argType)) {
                         sawParamSpecKwargs = true;
                     }
                 }
@@ -8147,10 +8169,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             paramSpecTypeVarContext = paramSpecArgResult.typeVarContexts;
         }
-        else if (type.details.paramSpec) {
+        else if (paramSpec) {
             if (!sawParamSpecArgs || !sawParamSpecKwargs) {
                 if (!isTypeIncomplete) {
-                    addDiagnostic(diagnosticRules_1.DiagnosticRule.reportCallIssue, localize_1.LocMessage.paramSpecArgsMissing().format({ type: printType(type.details.paramSpec) }), errorNode);
+                    addDiagnostic(diagnosticRules_1.DiagnosticRule.reportCallIssue, localize_1.LocMessage.paramSpecArgsMissing().format({ type: printType(paramSpec) }), errorNode);
                 }
                 argumentErrors = true;
                 argumentMatchScore += 1;
@@ -8373,39 +8395,42 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             });
             return { argumentErrors: true, typeVarContexts: [srcTypeVarContext] };
         }
+        const functionParamSpec = types_1.FunctionType.getParamSpecFromArgsKwargs(functionType);
+        const functionWithoutParamSpec = types_1.FunctionType.cloneRemoveParamSpecArgsKwargs(functionType);
         // Handle the recursive case where we're passing (*args: P.args, **kwargs: P.args)
         // a remaining function of type (*P).
-        if (functionType.details.paramSpec &&
-            functionType.details.parameters.length === 0 &&
-            (0, types_1.isTypeSame)(functionType.details.paramSpec, paramSpec)) {
+        if (functionParamSpec &&
+            functionWithoutParamSpec.details.parameters.length === 0 &&
+            (0, types_1.isTypeSame)(functionParamSpec, paramSpec)) {
             // If there are any arguments other than *args: P.args or **kwargs: P.kwargs,
             // report an error.
-            let sawArgs = false;
-            let sawKwargs = false;
+            let argsCount = 0;
+            let kwargsCount = 0;
             let argumentErrors = false;
             let argErrorNode;
             for (const arg of argList) {
                 const argType = (_a = getTypeOfArgument(arg, /* inferenceContext */ undefined, signatureTracker)) === null || _a === void 0 ? void 0 : _a.type;
-                const isArgTypeCompatible = argType && ((0, types_1.isTypeSame)(argType, paramSpec, { ignoreTypeFlags: true }) || (0, types_1.isAnyOrUnknown)(argType));
-                if (arg.argumentCategory === 1 /* ArgumentCategory.UnpackedList */ && !sawArgs && isArgTypeCompatible) {
-                    sawArgs = true;
+                if (arg.argumentCategory === 1 /* ArgumentCategory.UnpackedList */) {
+                    if ((0, parameterUtils_1.isParamSpecArgsArgument)(paramSpec, argType)) {
+                        argsCount++;
+                    }
                 }
-                else if (arg.argumentCategory === 2 /* ArgumentCategory.UnpackedDictionary */ &&
-                    !sawKwargs &&
-                    isArgTypeCompatible) {
-                    sawKwargs = true;
+                else if (arg.argumentCategory === 2 /* ArgumentCategory.UnpackedDictionary */) {
+                    if ((0, parameterUtils_1.isParamSpecKwargsArgument)(paramSpec, argType)) {
+                        kwargsCount++;
+                    }
                 }
                 else {
                     argErrorNode = argErrorNode !== null && argErrorNode !== void 0 ? argErrorNode : arg.valueExpression;
                     argumentErrors = true;
                 }
             }
-            if (!sawArgs || !sawKwargs) {
+            if (argsCount !== 1 || kwargsCount !== 1) {
                 argumentErrors = true;
             }
             if (argumentErrors) {
                 addDiagnostic(diagnosticRules_1.DiagnosticRule.reportCallIssue, localize_1.LocMessage.paramSpecArgsMissing().format({
-                    type: printType(functionType.details.paramSpec),
+                    type: printType(functionParamSpec),
                 }), argErrorNode !== null && argErrorNode !== void 0 ? argErrorNode : errorNode);
             }
             return { argumentErrors, typeVarContexts: [srcTypeVarContext] };
@@ -8438,7 +8463,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // the solved TypeVars if the typeVarContext has more than one signature.
                 // This will expand the ParamSpec into an overload, which will cause problems.
                 const skipApplySolvedTypeVars = (0, types_1.isFunction)(argParam.paramType) &&
-                    !!argParam.paramType.details.paramSpec &&
+                    types_1.FunctionType.getParamSpecFromArgsKwargs(argParam.paramType) &&
                     typeVarContext.getSignatureContexts().length > 1;
                 if (!skipApplySolvedTypeVars) {
                     expectedType = (0, typeUtils_1.applySolvedTypeVars)(expectedType, typeVarContext, {
@@ -8957,7 +8982,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         const functionType = types_1.FunctionType.createSynthesizedInstance('', 65536 /* FunctionTypeFlags.ParamSpecValue */);
         if (node.nodeType === 21 /* ParseNodeType.Ellipsis */) {
             types_1.FunctionType.addDefaultParameters(functionType);
-            functionType.details.flags |= 32768 /* FunctionTypeFlags.SkipArgsKwargsCompatibilityCheck */;
+            functionType.details.flags |= 32768 /* FunctionTypeFlags.GradualCallableForm */;
             return functionType;
         }
         if (node.nodeType === 34 /* ParseNodeType.List */) {
@@ -8991,7 +9016,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 return undefined;
             }
             if ((0, types_1.isParamSpec)(typeResult.type)) {
-                functionType.details.paramSpec = typeResult.type;
+                types_1.FunctionType.addParamSpecVariadics(functionType, typeResult.type);
                 return functionType;
             }
             if ((0, types_1.isClassInstance)(typeResult.type) &&
@@ -9944,7 +9969,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (enclosingFunction) {
             const functionTypeInfo = getTypeOfFunction(enclosingFunction);
             if (functionTypeInfo) {
-                const returnType = types_1.FunctionType.getSpecializedReturnType(functionTypeInfo.functionType);
+                const returnType = types_1.FunctionType.getEffectiveReturnType(functionTypeInfo.functionType);
                 if (returnType) {
                     expectedYieldType = (0, typeUtils_1.getGeneratorYieldType)(returnType, !!enclosingFunction.isAsync);
                     const generatorTypeArgs = (0, typeUtils_1.getGeneratorTypeArgs)(returnType);
@@ -10229,16 +10254,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             const iterableType = stripLiteralValue(iterableTypeResult.type);
             const itemTypeResult = (_a = getTypeOfIterator({ type: iterableType, isIncomplete: iterableTypeResult.isIncomplete }, !!node.isAsync, node.iterableExpression)) !== null && _a !== void 0 ? _a : { type: types_1.UnknownType.create(), isIncomplete: iterableTypeResult.isIncomplete };
             const targetExpr = node.targetExpression;
-            assignTypeToExpression(targetExpr, itemTypeResult.type, !!itemTypeResult.isIncomplete, node.iterableExpression);
+            assignTypeToExpression(targetExpr, itemTypeResult, node.iterableExpression);
         }
         else {
             (0, debug_1.assert)(node.nodeType === 13 /* ParseNodeType.ComprehensionIf */);
             // Evaluate the test expression to validate it and mark symbols
-            // as referenced. Don't bother doing this if we're in speculative
-            // mode because it doesn't affect the element type.
-            if (!isSpeculativeModeInUse(node.testExpression)) {
-                getTypeOfExpression(node.testExpression);
-            }
+            // as referenced. This doesn't affect the type of the evaluated
+            // comprehension, but it is important for evaluating intermediate
+            // expressions such as assignment expressions that can affect other
+            // subexpressions.
+            getTypeOfExpression(node.testExpression);
         }
         return isIncomplete;
     }
@@ -10370,6 +10395,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // The second argument, if present, should specify the return type.
     function createCallableType(classType, typeArgs, errorNode) {
         const functionType = types_1.FunctionType.createInstantiable(0 /* FunctionTypeFlags.None */);
+        let paramSpec;
         functionType.specialForm = classType;
         functionType.details.declaredReturnType = types_1.UnknownType.create();
         functionType.details.typeVarScopeId = ParseTreeUtils.getScopeIdForNode(errorNode);
@@ -10424,10 +10450,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             else if ((0, typeUtils_1.isEllipsisType)(typeArgs[0].type)) {
                 types_1.FunctionType.addDefaultParameters(functionType);
-                functionType.details.flags |= 32768 /* FunctionTypeFlags.SkipArgsKwargsCompatibilityCheck */;
+                functionType.details.flags |= 32768 /* FunctionTypeFlags.GradualCallableForm */;
             }
             else if ((0, types_1.isParamSpec)(typeArgs[0].type)) {
-                functionType.details.paramSpec = typeArgs[0].type;
+                paramSpec = typeArgs[0].type;
             }
             else {
                 if ((0, types_1.isInstantiableClass)(typeArgs[0].type) && types_1.ClassType.isBuiltIn(typeArgs[0].type, 'Concatenate')) {
@@ -10437,11 +10463,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             if (index === concatTypeArgs.length - 1) {
                                 types_1.FunctionType.addPositionOnlyParameterSeparator(functionType);
                                 if ((0, types_1.isParamSpec)(typeArg)) {
-                                    functionType.details.paramSpec = typeArg;
+                                    paramSpec = typeArg;
                                 }
                                 else if ((0, typeUtils_1.isEllipsisType)(typeArg)) {
                                     types_1.FunctionType.addDefaultParameters(functionType);
-                                    functionType.details.flags |= 32768 /* FunctionTypeFlags.SkipArgsKwargsCompatibilityCheck */;
+                                    functionType.details.flags |= 32768 /* FunctionTypeFlags.GradualCallableForm */;
                                 }
                             }
                             else {
@@ -10477,7 +10503,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         else {
             types_1.FunctionType.addDefaultParameters(functionType, /* useUnknown */ true);
-            functionType.details.flags |= 32768 /* FunctionTypeFlags.SkipArgsKwargsCompatibilityCheck */;
+            functionType.details.flags |= 32768 /* FunctionTypeFlags.GradualCallableForm */;
+        }
+        if (paramSpec) {
+            types_1.FunctionType.addParamSpecVariadics(functionType, paramSpec);
         }
         return functionType;
     }
@@ -10866,8 +10895,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         return createSpecialType(classType, typeArgs, /* paramLimit */ undefined, /* allowParamSpec */ true);
     }
     function createAnnotatedType(classType, errorNode, typeArgs) {
-        if (typeArgs && typeArgs.length < 2) {
-            addError(localize_1.LocMessage.annotatedTypeArgMissing(), errorNode);
+        if (typeArgs) {
+            if (typeArgs.length < 2) {
+                addError(localize_1.LocMessage.annotatedTypeArgMissing(), errorNode);
+            }
+            else {
+                validateAnnotatedMetadata(errorNode, typeArgs[0].type, typeArgs.slice(1));
+            }
         }
         if (!typeArgs || typeArgs.length === 0) {
             return { type: types_1.AnyType.create() };
@@ -10882,6 +10916,46 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             isNotRequired: typeArgs[0].isNotRequired,
         };
     }
+    // Enforces metadata consistency as specified in PEP 746.
+    function validateAnnotatedMetadata(errorNode, annotatedType, metaArgs) {
+        var _a;
+        // This is an experimental feature because PEP 746 hasn't been accepted.
+        if (!AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.enableExperimentalFeatures) {
+            return;
+        }
+        for (const metaArg of metaArgs) {
+            if ((0, types_1.isClass)(metaArg.type)) {
+                const supportsTypeMethod = (_a = getTypeOfBoundMember(
+                /* errorNode */ undefined, metaArg.type, '__supports_type__')) === null || _a === void 0 ? void 0 : _a.type;
+                if (!supportsTypeMethod) {
+                    continue;
+                }
+                // "Call" the __supports_type__ method to determine if the type is supported.
+                const callResult = useSpeculativeMode(errorNode, () => validateCallArguments(errorNode, [
+                    {
+                        argumentCategory: 0 /* ArgumentCategory.Simple */,
+                        typeResult: { type: (0, typeUtils_1.convertToInstance)(annotatedType) },
+                    },
+                ], { type: supportsTypeMethod }, 
+                /* typeVarContext */ undefined, 
+                /* skipUnknownArgCheck */ true, 
+                /* inferenceContext */ undefined, 
+                /* signatureTracker */ undefined));
+                if (callResult.isTypeIncomplete || !callResult.returnType) {
+                    continue;
+                }
+                // If there are no errors and the return type is potentially truthy,
+                // we know that the type is supported by this metadata object.
+                if (!callResult.argumentErrors && canBeTruthy(callResult.returnType)) {
+                    continue;
+                }
+                addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeArguments, localize_1.LocMessage.annotatedMetadataInconsistent().format({
+                    metadataType: printType(metaArg.type),
+                    type: printType((0, typeUtils_1.convertToInstance)(annotatedType)),
+                }), metaArg.node);
+            }
+        }
+    }
     // Creates one of several "special" types that are defined in typing.pyi
     // but not declared in their entirety. This includes the likes of "Tuple",
     // "Dict", etc.
@@ -11113,10 +11187,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             // Determine if there are any generic type parameters associated
             // with this type alias.
             typeParameters = [];
-            (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
-                (0, debug_1.assert)(typeParameters !== undefined);
-                (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(subtype));
-            });
+            (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(type));
             // Don't include any synthesized type variables.
             typeParameters = typeParameters.filter((typeVar) => !typeVar.details.isSynthesized);
         }
@@ -11461,7 +11532,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
             }
         }
-        assignTypeToExpression(node.leftExpression, rightHandType, isIncomplete, node.rightExpression, 
+        assignTypeToExpression(node.leftExpression, { type: rightHandType, isIncomplete }, node.rightExpression, 
         /* ignoreEmptyContainers */ true, 
         /* allowAssignmentToFinalVar */ true, expectedTypeDiagAddendum);
         writeTypeCache(node, { type: rightHandType, isIncomplete }, 0 /* EvaluatorFlags.None */);
@@ -12843,7 +12914,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 paramType1.paramSpecAccess === 'args' &&
                 (0, types_1.isParamSpec)(paramType2) &&
                 paramType2.paramSpecAccess === 'kwargs') {
-                functionType.details.flags |= 32768 /* FunctionTypeFlags.SkipArgsKwargsCompatibilityCheck */;
+                functionType.details.flags |= 32768 /* FunctionTypeFlags.GradualCallableForm */;
             }
         }
         // If the function contains an *args and a **kwargs parameter and both
@@ -12851,7 +12922,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // args/kwargs compatibility checks.
         const variadicsWithAnyType = functionType.details.parameters.filter((param) => param.category !== 0 /* ParameterCategory.Simple */ && param.name && (0, types_1.isAnyOrUnknown)(param.type));
         if (variadicsWithAnyType.length >= 2) {
-            functionType.details.flags |= 32768 /* FunctionTypeFlags.SkipArgsKwargsCompatibilityCheck */;
+            functionType.details.flags |= 32768 /* FunctionTypeFlags.GradualCallableForm */;
         }
         // If there was a defined return type, analyze that first so when we
         // walk the contents of the function, return statements can be
@@ -13322,7 +13393,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         const iteratorTypeResult = getTypeOfExpression(node.iterableExpression);
         const iteratedType = (_b = (_a = getTypeOfIterator(iteratorTypeResult, !!node.isAsync, node.iterableExpression)) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : types_1.UnknownType.create();
-        assignTypeToExpression(node.targetExpression, iteratedType, !!iteratorTypeResult.isIncomplete, node.targetExpression);
+        assignTypeToExpression(node.targetExpression, { type: iteratedType, isIncomplete: iteratorTypeResult.isIncomplete }, node.targetExpression);
         writeTypeCache(node, { type: iteratedType, isIncomplete: !!iteratorTypeResult.isIncomplete }, 0 /* EvaluatorFlags.None */);
     }
     function evaluateTypesForExceptStatement(node) {
@@ -13371,7 +13442,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             targetType = getBuiltInObject(node, 'BaseExceptionGroup', [targetType]);
         }
         if (node.name) {
-            assignTypeToExpression(node.name, targetType, /* isIncomplete */ false, node.name);
+            assignTypeToExpression(node.name, { type: targetType }, node.name);
         }
         writeTypeCache(node, { type: targetType }, 0 /* EvaluatorFlags.None */);
     }
@@ -13433,7 +13504,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typeNotUsableWith().format({ type: printType(subtype), method: exitMethodName }), node.expression);
         });
         if (node.target) {
-            assignTypeToExpression(node.target, scopedType, !!exprTypeResult.isIncomplete, node.target);
+            assignTypeToExpression(node.target, { type: scopedType, isIncomplete: exprTypeResult.isIncomplete }, node.target);
         }
         writeTypeCache(node, { type: scopedType, isIncomplete: !!exprTypeResult.isIncomplete }, 0 /* EvaluatorFlags.None */);
     }
@@ -13466,7 +13537,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 symbolType = cachedModuleType;
             }
         }
-        assignTypeToNameNode(symbolNameNode, symbolType, /* isIncomplete */ false, /* ignoreEmptyContainers */ false);
+        assignTypeToNameNode(symbolNameNode, { type: symbolType }, /* ignoreEmptyContainers */ false);
         writeTypeCache(node, { type: symbolType }, 0 /* EvaluatorFlags.None */);
     }
     function evaluateTypesForImportFromAs(node) {
@@ -13532,7 +13603,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 symbolType = types_1.UnknownType.create();
             }
         }
-        assignTypeToNameNode(aliasNode, symbolType, /* isIncomplete */ false, /* ignoreEmptyContainers */ false);
+        assignTypeToNameNode(aliasNode, { type: symbolType }, /* ignoreEmptyContainers */ false);
         writeTypeCache(node, { type: symbolType }, 0 /* EvaluatorFlags.None */);
     }
     function evaluateTypesForMatchStatement(node) {
@@ -13630,9 +13701,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     symbolType = cachedModuleType;
                 }
             }
-            assignTypeToNameNode(symbolNameNode, symbolType, 
-            /* isIncomplete */ false, 
-            /* ignoreEmptyContainers */ false);
+            assignTypeToNameNode(symbolNameNode, { type: symbolType }, /* ignoreEmptyContainers */ false);
             writeTypeCache(node, { type: symbolType }, 0 /* EvaluatorFlags.None */);
         }
     }
@@ -14052,7 +14121,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     return;
                 }
                 case 4 /* ParseNodeType.AssignmentExpression */: {
-                    getTypeOfExpression(curNode);
+                    evaluateTypesForExpressionInContext(curNode);
                     return;
                 }
                 case 5 /* ParseNodeType.AugmentedAssignment */: {
@@ -14469,7 +14538,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     const functionType = types_1.FunctionType.createSynthesizedInstance('', 65536 /* FunctionTypeFlags.ParamSpecValue */);
                     if ((0, typeUtils_1.isEllipsisType)(typeArg.type)) {
                         types_1.FunctionType.addDefaultParameters(functionType);
-                        functionType.details.flags |= 32768 /* FunctionTypeFlags.SkipArgsKwargsCompatibilityCheck */;
+                        functionType.details.flags |= 32768 /* FunctionTypeFlags.GradualCallableForm */;
                         typeArgTypes.push(functionType);
                         typeVarContext.setTypeVarType(typeParam, (0, typeUtils_1.convertTypeToParamSpecValue)(functionType));
                         return;
@@ -14497,12 +14566,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             concatTypeArgs.forEach((typeArg, index) => {
                                 if (index === concatTypeArgs.length - 1) {
                                     if ((0, types_1.isParamSpec)(typeArg)) {
-                                        functionType.details.paramSpec = typeArg;
+                                        types_1.FunctionType.addParamSpecVariadics(functionType, typeArg);
                                     }
                                     else if ((0, typeUtils_1.isEllipsisType)(typeArg)) {
                                         types_1.FunctionType.addDefaultParameters(functionType);
-                                        functionType.details.flags |=
-                                            32768 /* FunctionTypeFlags.SkipArgsKwargsCompatibilityCheck */;
+                                        functionType.details.flags |= 32768 /* FunctionTypeFlags.GradualCallableForm */;
                                     }
                                 }
                                 else {
@@ -15865,7 +15933,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // the return type. If a list of args is provided, the inference logic may take
     // into account argument types to infer the return type.
     function getFunctionEffectiveReturnType(type, callSiteInfo, inferTypeIfNeeded = true) {
-        const specializedReturnType = types_1.FunctionType.getSpecializedReturnType(type, /* includeInferred */ false);
+        const specializedReturnType = types_1.FunctionType.getEffectiveReturnType(type, /* includeInferred */ false);
         if (specializedReturnType && !(0, types_1.isUnknown)(specializedReturnType)) {
             const liveTypeVarScopes = (callSiteInfo === null || callSiteInfo === void 0 ? void 0 : callSiteInfo.errorNode)
                 ? ParseTreeUtils.getTypeVarScopesForNode(callSiteInfo === null || callSiteInfo === void 0 ? void 0 : callSiteInfo.errorNode)
@@ -16136,20 +16204,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // and cache the return type if necessary. This needs to be done
                 // prior to specializing.
                 inferReturnTypeIfNecessary(typeResult.type);
-                if (member.isInstanceMember &&
-                    (flags & 1024 /* MemberAccessFlags.DisallowGenericInstanceVariableAccess */) !== 0) {
-                    let isGenericNonCallable = false;
-                    (0, typeUtils_1.doForEachSubtype)(typeResult.type, (subtype) => {
-                        if (!(0, types_1.isAnyOrUnknown)(subtype) && !(0, types_1.isFunction)(subtype) && !(0, types_1.isOverloadedFunction)(subtype)) {
-                            if ((0, typeUtils_1.requiresSpecialization)(typeResult.type, {
-                                ignoreSelf: true,
-                                ignoreImplicitTypeArgs: true,
-                            })) {
-                                isGenericNonCallable = true;
-                            }
-                        }
-                    });
-                    if (isGenericNonCallable && errorNode) {
+                // Check for ambiguous accesses to attributes with generic types?
+                if (errorNode &&
+                    selfClass &&
+                    (0, types_1.isClass)(selfClass) &&
+                    member.isInstanceMember &&
+                    (0, types_1.isClass)(member.unspecializedClassType) &&
+                    (flags & 1024 /* MemberAccessFlags.DisallowGenericInstanceVariableAccess */) !== 0 &&
+                    (0, typeUtils_1.requiresSpecialization)(typeResult.type, { ignoreSelf: true, ignoreImplicitTypeArgs: true })) {
+                    const specializedType = (0, typeUtils_1.partiallySpecializeType)(typeResult.type, member.unspecializedClassType, (0, typeUtils_1.selfSpecializeClass)(selfClass, /* overrideTypeArgs */ true));
+                    if ((0, types_1.findSubtype)(specializedType, (subtype) => !(0, types_1.isFunction)(subtype) &&
+                        !(0, types_1.isOverloadedFunction)(subtype) &&
+                        (0, typeUtils_1.requiresSpecialization)(subtype, { ignoreSelf: true, ignoreImplicitTypeArgs: true }))) {
                         addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.genericInstanceVariableAccess(), errorNode);
                     }
                 }
@@ -16963,7 +17029,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // it's Any.
                 if ((0, types_1.isParamSpec)(srcType) &&
                     (0, types_1.isFunction)(destType) &&
-                    types_1.FunctionType.shouldSkipArgsKwargsCompatibilityCheck(destType) &&
+                    types_1.FunctionType.isGradualCallableForm(destType) &&
                     destType.details.parameters.length <= 2) {
                     return true;
                 }
@@ -17245,7 +17311,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 /* selfType */ undefined, 
                 /* diag */ undefined, recursionCount);
                 if (boundMethod) {
-                    concreteSrcType = (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundMethod);
+                    concreteSrcType = boundMethod;
                 }
             }
             // If it's a class, use the constructor for type compatibility checking.
@@ -17789,13 +17855,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
             }
         }
-        const boundMethod = getBoundMagicMethod(objType, '__call__', 
-        /* selfType */ undefined, 
-        /* diag */ undefined, recursionCount);
-        if (boundMethod) {
-            return (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundMethod);
-        }
-        return undefined;
+        return getBoundMagicMethod(objType, '__call__', /* selfType */ undefined, /* diag */ undefined, recursionCount);
     }
     function assignFunctionParameter(destType, srcType, paramIndex, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
         // Handle the special case where the dest type is a synthesized
@@ -17927,17 +17987,23 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
     }
     function assignFunction(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let canAssign = true;
         const checkReturnType = (flags & 64 /* AssignTypeFlags.SkipFunctionReturnTypeCheck */) === 0;
         const reverseMatching = (flags & 2 /* AssignTypeFlags.ReverseTypeVarMatching */) !== 0;
         flags &= ~64 /* AssignTypeFlags.SkipFunctionReturnTypeCheck */;
-        destType = (0, typeUtils_1.removeParamSpecVariadicsFromFunction)(destType);
-        srcType = (0, typeUtils_1.removeParamSpecVariadicsFromFunction)(srcType);
+        const destParamSpec = types_1.FunctionType.getParamSpecFromArgsKwargs(destType);
+        if (destParamSpec) {
+            destType = types_1.FunctionType.cloneRemoveParamSpecArgsKwargs(destType);
+        }
+        const srcParamSpec = types_1.FunctionType.getParamSpecFromArgsKwargs(srcType);
+        if (srcParamSpec) {
+            srcType = types_1.FunctionType.cloneRemoveParamSpecArgsKwargs(srcType);
+        }
         const destParamDetails = (0, parameterUtils_1.getParameterListDetails)(destType);
         const srcParamDetails = (0, parameterUtils_1.getParameterListDetails)(srcType);
         adjustSourceParamDetailsForDestVariadic(reverseMatching ? destParamDetails : srcParamDetails, reverseMatching ? srcParamDetails : destParamDetails);
-        const targetIncludesParamSpec = reverseMatching ? !!srcType.details.paramSpec : !!destType.details.paramSpec;
+        const targetIncludesParamSpec = reverseMatching ? !!srcParamSpec : !!destParamSpec;
         const destPositionalCount = (_a = destParamDetails.firstKeywordOnlyIndex) !== null && _a !== void 0 ? _a : destParamDetails.params.length;
         const srcPositionalCount = (_b = srcParamDetails.firstKeywordOnlyIndex) !== null && _b !== void 0 ? _b : srcParamDetails.params.length;
         const positionalsToMatch = Math.min(destPositionalCount, srcPositionalCount);
@@ -18025,7 +18091,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 canAssign = false;
             }
         }
-        if (!types_1.FunctionType.shouldSkipArgsKwargsCompatibilityCheck(destType) &&
+        if (!types_1.FunctionType.isGradualCallableForm(destType) &&
             destParamDetails.firstPositionOrKeywordIndex < srcParamDetails.positionOnlyParamCount &&
             !targetIncludesParamSpec) {
             diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.LocAddendum.argsPositionOnly().format({
@@ -18061,7 +18127,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     }
                     continue;
                 }
-                // If the source parameter is also addressible by keyword, it is OK
+                // If the source parameter is also addressable by keyword, it is OK
                 // that there is no matching positional parameter in the dest.
                 if (srcParam.kind === parameterUtils_1.ParameterKind.Standard) {
                     continue;
@@ -18128,7 +18194,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // their types are compatible.
         if (srcParamDetails.argsIndex !== undefined &&
             destParamDetails.argsIndex !== undefined &&
-            !types_1.FunctionType.shouldSkipArgsKwargsCompatibilityCheck(destType)) {
+            !types_1.FunctionType.isGradualCallableForm(destType)) {
             let destArgsType = destParamDetails.params[destParamDetails.argsIndex].type;
             let srcArgsType = srcParamDetails.params[srcParamDetails.argsIndex].type;
             if (!(0, types_1.isUnpacked)(destArgsType)) {
@@ -18143,9 +18209,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         // If the dest has an "*args" but the source doesn't, report the incompatibility.
         // The converse situation is OK.
-        if (!types_1.FunctionType.shouldSkipArgsKwargsCompatibilityCheck(destType) &&
+        if (!types_1.FunctionType.isGradualCallableForm(destType) &&
             srcParamDetails.argsIndex === undefined &&
-            srcType.details.paramSpec === undefined &&
+            srcParamSpec === undefined &&
             destParamDetails.argsIndex !== undefined &&
             !destParamDetails.hasUnpackedVariadicTypeVar) {
             diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.LocAddendum.argsParamMissing().format({
@@ -18260,9 +18326,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             // If the dest has a "**kwargs" but the source doesn't, report the incompatibility.
             // The converse situation is OK.
-            if (!types_1.FunctionType.shouldSkipArgsKwargsCompatibilityCheck(destType) &&
+            if (!types_1.FunctionType.isGradualCallableForm(destType) &&
                 srcParamDetails.kwargsIndex === undefined &&
-                srcType.details.paramSpec === undefined &&
+                srcParamSpec === undefined &&
                 destParamDetails.kwargsIndex !== undefined) {
                 diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.LocAddendum.kwargsParamMissing().format({
                     paramName: destParamDetails.params[destParamDetails.kwargsIndex].param.name,
@@ -18272,8 +18338,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         // If the source and the dest are using the same ParamSpec, any additional
         // concatenated parameters must match.
-        if (targetIncludesParamSpec &&
-            ((_j = srcType.details.paramSpec) === null || _j === void 0 ? void 0 : _j.nameWithScope) === ((_k = destType.details.paramSpec) === null || _k === void 0 ? void 0 : _k.nameWithScope)) {
+        if (targetIncludesParamSpec && (srcParamSpec === null || srcParamSpec === void 0 ? void 0 : srcParamSpec.nameWithScope) === (destParamSpec === null || destParamSpec === void 0 ? void 0 : destParamSpec.nameWithScope)) {
             if (srcParamDetails.params.length !== destParamDetails.params.length) {
                 canAssign = false;
             }
@@ -18288,9 +18353,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         });
         // Are we assigning to a function with a ParamSpec?
         if (targetIncludesParamSpec) {
-            const effectiveDestType = reverseMatching ? srcType : destType;
             const effectiveSrcType = reverseMatching ? destType : srcType;
-            if (effectiveDestType.details.paramSpec) {
+            const effectiveDestType = reverseMatching ? srcType : destType;
+            const effectiveSrcParamSpec = reverseMatching ? destParamSpec : srcParamSpec;
+            const effectiveDestParamSpec = reverseMatching ? srcParamSpec : destParamSpec;
+            if (effectiveDestParamSpec) {
                 const requiredMatchParamCount = effectiveDestType.details.parameters.filter((p) => {
                     if (!p.name) {
                         return false;
@@ -18327,13 +18394,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         });
                     }
                 });
-                const srcParamSpec = effectiveSrcType.details.paramSpec;
-                const destParamSpec = effectiveDestType.details.paramSpec;
                 // If there are remaining parameters and the source and dest do not contain
                 // the same ParamSpec, synthesize a function for the remaining parameters.
                 if (remainingParams.length > 0 ||
-                    !srcParamSpec ||
-                    !(0, types_1.isTypeSame)(srcParamSpec, destParamSpec, { ignoreTypeFlags: true })) {
+                    !effectiveSrcParamSpec ||
+                    !(0, types_1.isTypeSame)(effectiveSrcParamSpec, effectiveDestParamSpec, { ignoreTypeFlags: true })) {
                     const remainingFunction = types_1.FunctionType.createInstance('', '', '', effectiveSrcType.details.flags | 64 /* FunctionTypeFlags.SynthesizedMethod */, effectiveSrcType.details.docString);
                     remainingFunction.details.deprecatedMessage = effectiveSrcType.details.deprecatedMessage;
                     remainingFunction.details.typeVarScopeId = effectiveSrcType.details.typeVarScopeId;
@@ -18343,16 +18408,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     remainingParams.forEach((param) => {
                         types_1.FunctionType.addParameter(remainingFunction, param);
                     });
-                    remainingFunction.details.paramSpec = srcParamSpec ? (0, typeUtils_1.convertToInstance)(srcParamSpec) : undefined;
+                    if (effectiveSrcParamSpec) {
+                        types_1.FunctionType.addParamSpecVariadics(remainingFunction, (0, typeUtils_1.convertToInstance)(effectiveSrcParamSpec));
+                    }
                     types_1.FunctionType.addHigherOrderTypeVarScopeIds(remainingFunction, effectiveSrcType.details.higherOrderTypeVarScopeIds);
-                    if (!assignType(destParamSpec, remainingFunction, 
+                    if (!assignType(effectiveDestParamSpec, remainingFunction, 
                     /* diag */ undefined, destTypeVarContext, srcTypeVarContext, flags)) {
                         // If we couldn't assign the function to the ParamSpec, see if we can
                         // assign only the ParamSpec. This is possible if there were no
                         // remaining parameters.
                         if (remainingParams.length > 0 ||
-                            !srcParamSpec ||
-                            !assignType((0, typeUtils_1.convertToInstance)(destParamSpec), (0, typeUtils_1.convertToInstance)(srcParamSpec), 
+                            !effectiveSrcParamSpec ||
+                            !assignType((0, typeUtils_1.convertToInstance)(effectiveDestParamSpec), (0, typeUtils_1.convertToInstance)(effectiveSrcParamSpec), 
                             /* diag */ undefined, destTypeVarContext, srcTypeVarContext, flags)) {
                             canAssign = false;
                         }
@@ -18473,13 +18540,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     }
     // 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(node, declaredType, assignedType) {
-        // TODO: The rules for narrowing types on assignment are defined in
+    function narrowTypeBasedOnAssignment(node, declaredType, assignedTypeResult) {
+        // TODO: The rules for narrowing types on assignment are not defined in
         // the typing spec. Pyright's current logic is currently not even internally
         // consistent and probably not sound from a type theory perspective. It
         // should be completely reworked once there has been a public discussion
         // about the correct behavior.
-        const narrowedType = (0, typeUtils_1.mapSubtypes)(assignedType, (assignedSubtype) => {
+        // If the result is incomplete, do not attempt to narrow the type.
+        if (assignedTypeResult.isIncomplete) {
+            return assignedTypeResult;
+        }
+        const narrowedType = (0, typeUtils_1.mapSubtypes)(assignedTypeResult.type, (assignedSubtype) => {
             // Handle the special case where the assigned type is a literal type.
             // Some types include very large unions of literal types, and we don't
             // want to use an n^2 loop to compare them.
@@ -18541,12 +18612,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // with the declared type. In strict mode, this will retain the "unknown type"
         // diagnostics while still providing reasonable completion suggestions.
         if ((0, typeUtils_1.isIncompleteUnknown)(narrowedType)) {
-            return narrowedType;
+            return { type: narrowedType };
         }
         else if ((0, types_1.isUnknown)(narrowedType)) {
-            return (0, types_1.combineTypes)([narrowedType, declaredType]);
+            return { type: (0, types_1.combineTypes)([narrowedType, declaredType]) };
         }
-        return narrowedType;
+        return { type: narrowedType };
     }
     function validateOverrideMethod(baseMethod, overrideMethod, baseClass, diag, enforceParamNames = true) {
         // If we're overriding a non-method with a method, report it as an error.
@@ -18676,8 +18747,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         const baseParamDetails = (0, parameterUtils_1.getParameterListDetails)(baseMethod);
         const overrideParamDetails = (0, parameterUtils_1.getParameterListDetails)(overrideMethod);
         let canOverride = true;
-        if (!types_1.FunctionType.shouldSkipArgsKwargsCompatibilityCheck(baseMethod) &&
-            !types_1.FunctionType.shouldSkipArgsKwargsCompatibilityCheck(overrideMethod)) {
+        if (!types_1.FunctionType.isGradualCallableForm(baseMethod) && !types_1.FunctionType.isGradualCallableForm(overrideMethod)) {
             // Verify that we're not overriding a static, class or instance method with
             // an incompatible type.
             if (types_1.FunctionType.isStaticMethod(baseMethod)) {
@@ -19137,7 +19207,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         memberTypeFirstParam.hasDeclaredType) {
                         if (subDiag) {
                             subDiag.addMessage(localize_1.LocMessage.bindTypeMismatch().format({
-                                type: printType(baseType),
+                                type: printType(firstParamType),
                                 methodName: memberType.details.name || '<anonymous>',
                                 paramName: memberTypeFirstParam.name,
                             }));