npm - @zzzen/pyright-internal - Versions diffs - 1.2.0-dev.20240728 → 1.2.0-dev.20240811 - Mend

@zzzen/pyright-internal 1.2.0-dev.20240728 → 1.2.0-dev.20240811

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (748) hide show

package/dist/analyzer/properties.js CHANGED Viewed

@@ -8,7 +8,11 @@
  * Provides type evaluation logic that is specific to properties.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assignProperty = exports.clonePropertyWithDeleter = exports.clonePropertyWithSetter = exports.createProperty = exports.validatePropertyMethod = void 0;
+exports.validatePropertyMethod = validatePropertyMethod;
+exports.createProperty = createProperty;
+exports.clonePropertyWithSetter = clonePropertyWithSetter;
+exports.clonePropertyWithDeleter = clonePropertyWithDeleter;
+exports.assignProperty = assignProperty;
 const diagnostic_1 = require("../common/diagnostic");
 const diagnosticRules_1 = require("../common/diagnosticRules");
 const localize_1 = require("../localization/localize");
@@ -22,7 +26,6 @@ function validatePropertyMethod(evaluator, method, errorNode) {
         evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.propertyStaticMethod(), errorNode);
     }
 }
-exports.validatePropertyMethod = validatePropertyMethod;
 function createProperty(evaluator, decoratorNode, decoratorType, fget) {
     const fileInfo = (0, analyzerNodeInfo_1.getFileInfo)(decoratorNode);
     const typeMetaclass = evaluator.getBuiltInType(decoratorNode, 'type');
@@ -64,7 +67,6 @@ function createProperty(evaluator, decoratorNode, decoratorType, fget) {
     addDecoratorMethodsToPropertySymbolTable(propertyObject);
     return propertyObject;
 }
-exports.createProperty = createProperty;
 function clonePropertyWithSetter(evaluator, prop, fset, errorNode) {
     if (!(0, typeUtils_1.isProperty)(prop)) {
         return prop;
@@ -128,7 +130,6 @@ function clonePropertyWithSetter(evaluator, prop, fset, errorNode) {
     addDecoratorMethodsToPropertySymbolTable(propertyObject);
     return propertyObject;
 }
-exports.clonePropertyWithSetter = clonePropertyWithSetter;
 function clonePropertyWithDeleter(evaluator, prop, fdel, errorNode) {
     var _a;
     if (!(0, typeUtils_1.isProperty)(prop)) {
@@ -165,7 +166,6 @@ function clonePropertyWithDeleter(evaluator, prop, fdel, errorNode) {
     addDecoratorMethodsToPropertySymbolTable(propertyObject);
     return propertyObject;
 }
-exports.clonePropertyWithDeleter = clonePropertyWithDeleter;
 function addGetMethodToPropertySymbolTable(evaluator, propertyObject, fget) {
     const fields = types_1.ClassType.getSymbolTable(propertyObject);
     // The first overload is for accesses through a class object (where
@@ -186,7 +186,7 @@ function addGetMethodToPropertySymbolTable(evaluator, propertyObject, fget) {
     // The second overload is for accesses through a class instance.
     const getFunction2 = types_1.FunctionType.createSynthesizedInstance('__get__', 256 /* FunctionTypeFlags.Overloaded */);
     types_1.FunctionType.addParam(getFunction2, types_1.FunctionParam.create(0 /* ParamCategory.Simple */, types_1.AnyType.create(), types_1.FunctionParamFlags.TypeDeclared, 'self'));
-    const objType = fget.shared.parameters.length > 0 ? types_1.FunctionType.getEffectiveParamType(fget, 0) : types_1.AnyType.create();
+    const objType = fget.shared.parameters.length > 0 ? types_1.FunctionType.getParamType(fget, 0) : types_1.AnyType.create();
     types_1.FunctionType.addParam(getFunction2, types_1.FunctionParam.create(0 /* ParamCategory.Simple */, objType, types_1.FunctionParamFlags.TypeDeclared, 'obj'));
     types_1.FunctionType.addParam(getFunction2, types_1.FunctionParam.create(0 /* ParamCategory.Simple */, types_1.AnyType.create(), types_1.FunctionParamFlags.TypeDeclared, 'objtype', types_1.AnyType.create(/* isEllipsis */ true)));
     getFunction2.shared.declaredReturnType = types_1.FunctionType.getEffectiveReturnType(fget);
@@ -200,7 +200,7 @@ function addGetMethodToPropertySymbolTable(evaluator, propertyObject, fget) {
     // problems specifically for the `NoneType` class because None.__class__
     // is a property, and both overloads match in this case because None
     // is passed for the "obj" parameter.
-    const getFunctionOverload = types_1.OverloadedFunctionType.create([getFunction2, getFunction1]);
+    const getFunctionOverload = types_1.OverloadedType.create([getFunction2, getFunction1]);
     const getSymbol = symbol_1.Symbol.createWithType(4 /* SymbolFlags.ClassMember */, getFunctionOverload);
     fields.set('__get__', getSymbol);
 }
@@ -208,8 +208,8 @@ function addSetMethodToPropertySymbolTable(evaluator, propertyObject, fset) {
     const fields = types_1.ClassType.getSymbolTable(propertyObject);
     const setFunction = types_1.FunctionType.createSynthesizedInstance('__set__');
     types_1.FunctionType.addParam(setFunction, types_1.FunctionParam.create(0 /* ParamCategory.Simple */, types_1.AnyType.create(), types_1.FunctionParamFlags.TypeDeclared, 'self'));
-    let objType = fset.shared.parameters.length > 0 ? types_1.FunctionType.getEffectiveParamType(fset, 0) : types_1.AnyType.create();
-    if ((0, types_1.isTypeVar)(objType) && objType.shared.isSynthesizedSelf) {
+    let objType = fset.shared.parameters.length > 0 ? types_1.FunctionType.getParamType(fset, 0) : types_1.AnyType.create();
+    if ((0, types_1.isTypeVar)(objType) && types_1.TypeVarType.isSelf(objType)) {
         objType = evaluator.makeTopLevelTypeVarsConcrete(objType);
     }
     types_1.FunctionType.addParam(setFunction, types_1.FunctionParam.create(0 /* ParamCategory.Simple */, (0, types_1.combineTypes)([objType, evaluator.getNoneType()]), types_1.FunctionParamFlags.TypeDeclared, 'obj'));
@@ -223,7 +223,7 @@ function addSetMethodToPropertySymbolTable(evaluator, propertyObject, fset) {
     if (fset.shared.parameters.length >= 2 &&
         fset.shared.parameters[1].category === 0 /* ParamCategory.Simple */ &&
         fset.shared.parameters[1].name) {
-        setParamType = fset.shared.parameters[1].type;
+        setParamType = types_1.FunctionType.getParamType(fset, 1);
     }
     types_1.FunctionType.addParam(setFunction, types_1.FunctionParam.create(0 /* ParamCategory.Simple */, setParamType, types_1.FunctionParamFlags.TypeDeclared, 'value'));
     const setSymbol = symbol_1.Symbol.createWithType(4 /* SymbolFlags.ClassMember */, setFunction);
@@ -238,8 +238,8 @@ function addDelMethodToPropertySymbolTable(evaluator, propertyObject, fdel) {
     delFunction.shared.typeVarScopeId = (0, typeUtils_1.getTypeVarScopeId)(fdel);
     delFunction.shared.deprecatedMessage = fdel.shared.deprecatedMessage;
     delFunction.shared.methodClass = fdel.shared.methodClass;
-    let objType = fdel.shared.parameters.length > 0 ? types_1.FunctionType.getEffectiveParamType(fdel, 0) : types_1.AnyType.create();
-    if ((0, types_1.isTypeVar)(objType) && objType.shared.isSynthesizedSelf) {
+    let objType = fdel.shared.parameters.length > 0 ? types_1.FunctionType.getParamType(fdel, 0) : types_1.AnyType.create();
+    if ((0, types_1.isTypeVar)(objType) && types_1.TypeVarType.isSelf(objType)) {
         objType = evaluator.makeTopLevelTypeVarsConcrete(objType);
     }
     types_1.FunctionType.addParam(delFunction, types_1.FunctionParam.create(0 /* ParamCategory.Simple */, (0, types_1.combineTypes)([objType, evaluator.getNoneType()]), types_1.FunctionParamFlags.TypeDeclared, 'obj'));
@@ -273,7 +273,7 @@ function addDecoratorMethodsToPropertySymbolTable(propertyObject) {
         fields.set(accessorName, accessorSymbol);
     });
 }
-function assignProperty(evaluator, destPropertyType, srcPropertyType, destClass, srcClass, diag, typeVarContext, selfTypeVarContext, recursionCount = 0) {
+function assignProperty(evaluator, destPropertyType, srcPropertyType, destClass, srcClass, diag, constraints, selfSolution, recursionCount = 0) {
     const srcObjectToBind = (0, types_1.isClass)(srcClass) ? types_1.ClassType.cloneAsInstance(srcClass) : undefined;
     const destObjectToBind = types_1.ClassType.cloneAsInstance(destClass);
     let isAssignable = true;
@@ -307,8 +307,8 @@ function assignProperty(evaluator, destPropertyType, srcPropertyType, destClass,
             evaluator.inferReturnTypeIfNecessary(destAccessType);
             // If the caller provided a "self" TypeVar context, replace any Self types.
             // This is needed during protocol matching.
-            if (selfTypeVarContext) {
-                destAccessType = (0, typeUtils_1.applySolvedTypeVars)(destAccessType, selfTypeVarContext);
+            if (selfSolution) {
+                destAccessType = (0, typeUtils_1.applySolvedTypeVars)(destAccessType, selfSolution);
             }
             // The access methods of fget, fset and fdel are modeled as static
             // variables because they do not bind go the "property" class that
@@ -326,13 +326,11 @@ function assignProperty(evaluator, destPropertyType, srcPropertyType, destClass,
             /* firstParamType */ undefined, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), recursionCount);
             if (!boundDestAccessType ||
                 !boundSrcAccessType ||
-                !evaluator.assignType(boundDestAccessType, boundSrcAccessType, diag, typeVarContext,
-                /* srcTypeVarContext */ undefined, 0 /* AssignTypeFlags.Default */, recursionCount)) {
+                !evaluator.assignType(boundDestAccessType, boundSrcAccessType, diag, constraints, 0 /* AssignTypeFlags.Default */, recursionCount)) {
                 isAssignable = false;
             }
         }
     });
     return isAssignable;
 }
-exports.assignProperty = assignProperty;
 //# sourceMappingURL=properties.js.map

package/dist/analyzer/properties.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"properties.js","sourceRoot":"","sources":["../../../../../src/analyzer/properties.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"properties.js","sourceRoot":"","sources":["../../../../../src/analyzer/properties.ts"],"names":[],"mappings":"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"}

package/dist/analyzer/protocols.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
 import { DiagnosticAddendum } from '../common/diagnostic';
+import { ConstraintTracker } from './constraintTracker';
 import { TypeEvaluator } from './typeEvaluatorTypes';
 import { ClassType, ModuleType } from './types';
 import { AssignTypeFlags } from './typeUtils';
-import { TypeVarContext } from './typeVarContext';
-export declare function assignClassToProtocol(evaluator: TypeEvaluator, destType: ClassType, srcType: ClassType, diag: DiagnosticAddendum | undefined, destTypeVarContext: TypeVarContext | undefined, srcTypeVarContext: TypeVarContext | undefined, flags: AssignTypeFlags, recursionCount: number): boolean;
-export declare function assignModuleToProtocol(evaluator: TypeEvaluator, destType: ClassType, srcType: ModuleType, diag: DiagnosticAddendum | undefined, destTypeVarContext: TypeVarContext | undefined, flags: AssignTypeFlags, recursionCount: number): boolean;
+export declare function assignClassToProtocol(evaluator: TypeEvaluator, destType: ClassType, srcType: ClassType, diag: DiagnosticAddendum | undefined, constraints: ConstraintTracker | undefined, flags: AssignTypeFlags, recursionCount: number): boolean;
+export declare function assignModuleToProtocol(evaluator: TypeEvaluator, destType: ClassType, srcType: ModuleType, diag: DiagnosticAddendum | undefined, constraints: ConstraintTracker | undefined, flags: AssignTypeFlags, recursionCount: number): boolean;
 export declare function isMethodOnlyProtocol(classType: ClassType): boolean;
 export declare function isProtocolUnsafeOverlap(evaluator: TypeEvaluator, protocol: ClassType, classType: ClassType): boolean;

package/dist/analyzer/protocols.js CHANGED Viewed

@@ -9,24 +9,28 @@
  * (structural subtyping) classes.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isProtocolUnsafeOverlap = exports.isMethodOnlyProtocol = exports.assignModuleToProtocol = exports.assignClassToProtocol = void 0;
+exports.assignClassToProtocol = assignClassToProtocol;
+exports.assignModuleToProtocol = assignModuleToProtocol;
+exports.isMethodOnlyProtocol = isMethodOnlyProtocol;
+exports.isProtocolUnsafeOverlap = isProtocolUnsafeOverlap;
 const debug_1 = require("../common/debug");
 const diagnostic_1 = require("../common/diagnostic");
 const localize_1 = require("../localization/localize");
+const constraintSolution_1 = require("./constraintSolution");
 const constraintSolver_1 = require("./constraintSolver");
+const constraintTracker_1 = require("./constraintTracker");
 const properties_1 = require("./properties");
 const symbolUtils_1 = require("./symbolUtils");
 const types_1 = require("./types");
 const typeUtils_1 = require("./typeUtils");
-const typeVarContext_1 = require("./typeVarContext");
 const protocolAssignmentStack = [];
 // Maximum number of different types that are cached with a protocol.
 const maxProtocolCompatibilityCacheEntries = 64;
-function assignClassToProtocol(evaluator, destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
+function assignClassToProtocol(evaluator, destType, srcType, diag, constraints, flags, recursionCount) {
     // We assume that destType is an instantiable class that is a protocol. The
     // srcType can be an instantiable class or a class instance.
     (0, debug_1.assert)((0, types_1.isInstantiableClass)(destType) && types_1.ClassType.isProtocolClass(destType));
-    const enforceInvariance = (flags & 1 /* AssignTypeFlags.EnforceInvariance */) !== 0;
+    const enforceInvariance = (flags & 1 /* AssignTypeFlags.Invariant */) !== 0;
     // Use a stack of pending protocol class evaluations to detect recursion.
     // This can happen when a protocol class refers to itself.
     if (protocolAssignmentStack.some((entry) => {
@@ -36,13 +40,13 @@ function assignClassToProtocol(evaluator, destType, srcType, diag, destTypeVarCo
     }
     // See if we've already determined that this class is compatible with this protocol.
     if (!enforceInvariance) {
-        const compatibility = getProtocolCompatibility(destType, srcType, flags, destTypeVarContext);
+        const compatibility = getProtocolCompatibility(destType, srcType, flags, constraints);
         if (compatibility !== undefined) {
             if (compatibility) {
                 // If the caller has provided a destination type var context,
                 // we can't use the cached value unless the dest has no type
                 // parameters to solve.
-                if (!destTypeVarContext || !(0, typeUtils_1.requiresSpecialization)(destType)) {
+                if (!constraints || !(0, typeUtils_1.requiresSpecialization)(destType)) {
                     return true;
                 }
             }
@@ -59,9 +63,9 @@ function assignClassToProtocol(evaluator, destType, srcType, diag, destTypeVarCo
     }
     protocolAssignmentStack.push({ srcType, destType });
     let isCompatible = true;
-    const clonedTypeVarContext = destTypeVarContext === null || destTypeVarContext === void 0 ? void 0 : destTypeVarContext.clone();
+    const clonedConstraints = constraints === null || constraints === void 0 ? void 0 : constraints.clone();
     try {
-        isCompatible = assignClassToProtocolInternal(evaluator, destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
+        isCompatible = assignClassToProtocolInternal(evaluator, destType, srcType, diag, constraints, flags, recursionCount);
     }
     catch (e) {
         // We'd normally use "finally" here, but the TS debugger does such
@@ -71,15 +75,12 @@ function assignClassToProtocol(evaluator, destType, srcType, diag, destTypeVarCo
     }
     protocolAssignmentStack.pop();
     // Cache the results for next time.
-    setProtocolCompatibility(destType, srcType, flags, clonedTypeVarContext, isCompatible);
+    setProtocolCompatibility(destType, srcType, flags, clonedConstraints, isCompatible);
     return isCompatible;
 }
-exports.assignClassToProtocol = assignClassToProtocol;
-function assignModuleToProtocol(evaluator, destType, srcType, diag, destTypeVarContext, flags, recursionCount) {
-    return assignClassToProtocolInternal(evaluator, destType, srcType, diag, destTypeVarContext,
-    /* srcTypeVarContext */ undefined, flags, recursionCount);
+function assignModuleToProtocol(evaluator, destType, srcType, diag, constraints, flags, recursionCount) {
+    return assignClassToProtocolInternal(evaluator, destType, srcType, diag, constraints, flags, recursionCount);
 }
-exports.assignModuleToProtocol = assignModuleToProtocol;
 // Determines whether the specified class is a protocol class that has
 // only methods, no other symbol types like variables.
 function isMethodOnlyProtocol(classType) {
@@ -102,7 +103,6 @@ function isMethodOnlyProtocol(classType) {
     }
     return true;
 }
-exports.isMethodOnlyProtocol = isMethodOnlyProtocol;
 // Determines whether the classType has "unsafe overlap" with a runtime checkable protocol.
 // This can occur because the runtime doesn't do full type comparisons. It simply looks at
 // the presence of specific attributes.
@@ -129,10 +129,9 @@ function isProtocolUnsafeOverlap(evaluator, protocol, classType) {
     });
     return isUnsafeOverlap;
 }
-exports.isProtocolUnsafeOverlap = isProtocolUnsafeOverlap;
 // Looks up the protocol compatibility in the cache. If it's not found,
 // return undefined.
-function getProtocolCompatibility(destType, srcType, flags, typeVarContext) {
+function getProtocolCompatibility(destType, srcType, flags, constraints) {
     const map = srcType.shared.protocolCompatibility;
     const entries = map === null || map === void 0 ? void 0 : map.get(destType.shared.fullName);
     if (entries === undefined) {
@@ -142,11 +141,11 @@ function getProtocolCompatibility(destType, srcType, flags, typeVarContext) {
         return ((0, types_1.isTypeSame)(entry.destType, destType) &&
             (0, types_1.isTypeSame)(entry.srcType, srcType) &&
             entry.flags === flags &&
-            isTypeVarContextSame(typeVarContext, entry.typeVarContext));
+            isConstraintTrackerSame(constraints, entry.constraints));
     });
     return entry === null || entry === void 0 ? void 0 : entry.isCompatible;
 }
-function setProtocolCompatibility(destType, srcType, flags, typeVarContext, isCompatible) {
+function setProtocolCompatibility(destType, srcType, flags, constraints, isCompatible) {
     let map = srcType.shared.protocolCompatibility;
     if (!map) {
         map = new Map();
@@ -161,44 +160,44 @@ function setProtocolCompatibility(destType, srcType, flags, typeVarContext, isCo
         destType,
         srcType,
         flags,
-        typeVarContext,
+        constraints: constraints,
         isCompatible,
     });
     if (entries.length > maxProtocolCompatibilityCacheEntries) {
         entries.shift();
     }
 }
-function isTypeVarContextSame(context1, context2) {
+function isConstraintTrackerSame(context1, context2) {
     if (!context1 || !context2) {
         return context1 === context2;
     }
     return context1.isSame(context2);
 }
-function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
+function assignClassToProtocolInternal(evaluator, destType, srcType, diag, constraints, flags, recursionCount) {
     var _a, _b;
-    if ((flags & 1 /* AssignTypeFlags.EnforceInvariance */) !== 0) {
+    if ((flags & 1 /* AssignTypeFlags.Invariant */) !== 0) {
         return (0, types_1.isTypeSame)(destType, srcType);
     }
     evaluator.inferVarianceForClass(destType);
     const sourceIsClassObject = (0, types_1.isClass)(srcType) && types_1.TypeBase.isInstantiable(srcType);
-    const protocolTypeVarContext = createProtocolTypeVarContext(evaluator, destType, destTypeVarContext);
-    const selfTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(destType));
+    const protocolConstraints = createProtocolConstraints(evaluator, destType, constraints);
+    const selfSolution = new constraintSolution_1.ConstraintSolution();
     let selfType;
     if ((0, types_1.isClass)(srcType)) {
         // If the srcType is conditioned on "self", use "Self" as the selfType.
         // Otherwise use the class type for selfType.
-        const synthCond = (_b = (_a = srcType.props) === null || _a === void 0 ? void 0 : _a.condition) === null || _b === void 0 ? void 0 : _b.find((c) => c.typeVar.shared.isSynthesizedSelf);
+        const synthCond = (_b = (_a = srcType.props) === null || _a === void 0 ? void 0 : _a.condition) === null || _b === void 0 ? void 0 : _b.find((c) => types_1.TypeVarType.isSelf(c.typeVar));
         if (synthCond) {
             selfType = (0, typeUtils_1.synthesizeTypeVarForSelfCls)(types_1.TypeBase.cloneForCondition(srcType, undefined),
             /* isClsType */ false);
-            if (types_1.TypeVarType.hasInternalScopeId(synthCond.typeVar)) {
-                selfType = types_1.TypeVarType.cloneWithInternalScopeId(selfType);
+            if (types_1.TypeVarType.isBound(synthCond.typeVar)) {
+                selfType = types_1.TypeVarType.cloneAsBound(selfType);
             }
         }
         else {
             selfType = srcType;
         }
-        (0, typeUtils_1.populateTypeVarContextForSelfType)(selfTypeVarContext, destType, selfType);
+        (0, typeUtils_1.addSolutionForSelfType)(selfSolution, destType, selfType);
     }
     // If the source is a TypedDict, use the _TypedDict placeholder class
     // instead. We don't want to use the TypedDict members for protocol
@@ -293,7 +292,7 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
                     srcMemberType = types_1.UnknownType.create();
                 }
                 // If the source is a method, bind it.
-                if ((0, types_1.isFunction)(srcMemberType) || (0, types_1.isOverloadedFunction)(srcMemberType)) {
+                if ((0, types_1.isFunction)(srcMemberType) || (0, types_1.isOverloaded)(srcMemberType)) {
                     if (isMemberFromMetaclass || (0, types_1.isInstantiableClass)(srcMemberInfo.classType)) {
                         let isInstanceMember = !srcMemberInfo.symbol.isClassMember();
                         // Special-case dataclasses whose entries act like instance members.
@@ -337,9 +336,9 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
                 srcMemberType = evaluator.getEffectiveTypeOfSymbol(srcSymbol);
             }
             // Replace any "Self" TypeVar within the dest with the source type.
-            destMemberType = (0, typeUtils_1.applySolvedTypeVars)(destMemberType, selfTypeVarContext);
+            destMemberType = (0, typeUtils_1.applySolvedTypeVars)(destMemberType, selfSolution);
             // If the dest is a method, bind it.
-            if ((0, types_1.isFunction)(destMemberType) || (0, types_1.isOverloadedFunction)(destMemberType)) {
+            if ((0, types_1.isFunction)(destMemberType) || (0, types_1.isOverloaded)(destMemberType)) {
                 let boundDeclaredType;
                 if ((0, types_1.isClass)(srcType)) {
                     (0, debug_1.assert)(srcMemberInfo);
@@ -367,7 +366,7 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
                 if ((0, types_1.isClassInstance)(srcMemberType) &&
                     types_1.ClassType.isPropertyClass(srcMemberType) &&
                     !sourceIsClassObject) {
-                    if (!(0, properties_1.assignProperty)(evaluator, types_1.ClassType.cloneAsInstantiable(destMemberType), types_1.ClassType.cloneAsInstantiable(srcMemberType), mroClass, srcType, subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(), protocolTypeVarContext, selfTypeVarContext, recursionCount)) {
+                    if (!(0, properties_1.assignProperty)(evaluator, types_1.ClassType.cloneAsInstantiable(destMemberType), types_1.ClassType.cloneAsInstantiable(srcMemberType), mroClass, srcType, subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(), protocolConstraints, selfSolution, recursionCount)) {
                         if (subDiag) {
                             subDiag.addMessage(localize_1.LocAddendum.memberTypeMismatch().format({ name }));
                         }
@@ -381,8 +380,7 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
                         getterType = (0, typeUtils_1.partiallySpecializeType)(getterType, mroClass, evaluator.getTypeClassType());
                     }
                     if (!getterType ||
-                        !evaluator.assignType(getterType, srcMemberType, subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(), protocolTypeVarContext,
-                        /* srcTypeVarContext */ undefined, assignTypeFlags, recursionCount)) {
+                        !evaluator.assignType(getterType, srcMemberType, subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(), protocolConstraints, assignTypeFlags, recursionCount)) {
                         if (subDiag) {
                             subDiag.addMessage(localize_1.LocAddendum.memberTypeMismatch().format({ name }));
                         }
@@ -405,10 +403,8 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
                 const primaryDecl = destSymbol.getDeclarations()[0];
                 const isInvariant = (primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.type) === 1 /* DeclarationType.Variable */ && !primaryDecl.isFinal;
                 // Temporarily add the TypeVar scope ID for this method to handle method-scoped TypeVars.
-                const protocolTypeVarContextClone = protocolTypeVarContext.clone();
-                protocolTypeVarContextClone.addSolveForScope((0, typeUtils_1.getTypeVarScopeId)(destMemberType));
-                if (!evaluator.assignType(destMemberType, srcMemberType, subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(), protocolTypeVarContextClone,
-                /* srcTypeVarContext */ undefined, isInvariant ? assignTypeFlags | 1 /* AssignTypeFlags.EnforceInvariance */ : assignTypeFlags, recursionCount)) {
+                const protocolConstraintsClone = protocolConstraints.clone();
+                if (!evaluator.assignType(destMemberType, srcMemberType, subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(), protocolConstraintsClone, isInvariant ? assignTypeFlags | 1 /* AssignTypeFlags.Invariant */ : assignTypeFlags, recursionCount)) {
                     if (subDiag) {
                         if (isInvariant) {
                             subDiag.addMessage(localize_1.LocAddendum.memberIsInvariant().format({ name }));
@@ -418,7 +414,7 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
                     typesAreConsistent = false;
                 }
                 else {
-                    protocolTypeVarContext.copyFromClone(protocolTypeVarContextClone);
+                    protocolConstraints.copyFromClone(protocolConstraintsClone);
                 }
             }
             const isDestFinal = destSymbol
@@ -496,59 +492,61 @@ function assignClassToProtocolInternal(evaluator, destType, srcType, diag, destT
         // Create a specialized version of the protocol defined by the dest and
         // make sure the resulting type args can be assigned.
         const genericProtocolType = types_1.ClassType.specialize(destType, undefined);
-        const specializedProtocolType = (0, typeUtils_1.applySolvedTypeVars)(genericProtocolType, protocolTypeVarContext);
+        const specializedProtocolType = evaluator.solveAndApplyConstraints(genericProtocolType, protocolConstraints);
         if (destType.priv.typeArgs) {
-            if (!evaluator.assignTypeArgs(destType, specializedProtocolType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
+            if (!evaluator.assignTypeArgs(destType, specializedProtocolType, diag, constraints, flags, recursionCount)) {
                 typesAreConsistent = false;
             }
         }
-        else if (destTypeVarContext && !destTypeVarContext.isLocked()) {
+        else if (constraints && !constraints.isLocked()) {
             for (const typeParam of destType.shared.typeParams) {
-                const typeArgEntry = protocolTypeVarContext.getMainSolutionSet().getTypeVar(typeParam);
+                const typeArgEntry = protocolConstraints.getMainConstraintSet().getTypeVar(typeParam);
                 if (typeArgEntry) {
-                    (0, typeUtils_1.setTypeVarType)(destTypeVarContext, typeParam, typeArgEntry === null || typeArgEntry === void 0 ? void 0 : typeArgEntry.lowerBound, typeArgEntry === null || typeArgEntry === void 0 ? void 0 : typeArgEntry.lowerBoundNoLiterals, typeArgEntry === null || typeArgEntry === void 0 ? void 0 : typeArgEntry.upperBound);
+                    constraints.copyBounds(typeArgEntry);
                 }
             }
         }
     }
     return typesAreConsistent;
 }
-// Given a (possibly-specialized) destType and an optional typeVarContext, creates
-// a new typeVarContext that combines the constraints from both the destType and
-// the destTypeVarContext.
-function createProtocolTypeVarContext(evaluator, destType, destTypeVarContext) {
-    const protocolTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(destType));
+// Given a (possibly-specialized) destType and an optional constraint tracker,
+// creates a new constraint tracker that combines the constraints from both the
+// destType and the destConstraints.
+function createProtocolConstraints(evaluator, destType, constraints) {
+    const protocolConstraints = new constraintTracker_1.ConstraintTracker();
     destType.shared.typeParams.forEach((typeParam, index) => {
-        const entry = destTypeVarContext === null || destTypeVarContext === void 0 ? void 0 : destTypeVarContext.getMainSolutionSet().getTypeVar(typeParam);
+        const entry = constraints === null || constraints === void 0 ? void 0 : constraints.getMainConstraintSet().getTypeVar(typeParam);
         if (entry) {
-            (0, typeUtils_1.setTypeVarType)(protocolTypeVarContext, typeParam, entry.lowerBound, entry.lowerBoundNoLiterals, entry.upperBound);
+            protocolConstraints.copyBounds(entry);
         }
         else if (destType.priv.typeArgs && index < destType.priv.typeArgs.length) {
             let typeArg = destType.priv.typeArgs[index];
             let flags;
             let hasUnsolvedTypeVars = (0, typeUtils_1.requiresSpecialization)(typeArg);
             // If the type argument has unsolved TypeVars, see if they have
-            // solved values in the destTypeVarContext.
-            if (hasUnsolvedTypeVars && destTypeVarContext) {
-                typeArg = (0, typeUtils_1.applySolvedTypeVars)(typeArg, destTypeVarContext, { useLowerBoundOnly: true });
+            // solved values in the destConstraints.
+            if (hasUnsolvedTypeVars && constraints) {
+                typeArg = evaluator.solveAndApplyConstraints(typeArg, constraints, /* applyOptions */ undefined, {
+                    useLowerBoundOnly: true,
+                });
                 flags = 0 /* AssignTypeFlags.Default */;
                 hasUnsolvedTypeVars = (0, typeUtils_1.requiresSpecialization)(typeArg);
             }
             else {
-                flags = 2048 /* AssignTypeFlags.PopulatingExpectedType */;
+                flags = 2048 /* AssignTypeFlags.PopulateExpectedType */;
                 const variance = types_1.TypeVarType.getVariance(typeParam);
                 if (variance === 2 /* Variance.Invariant */) {
-                    flags |= 1 /* AssignTypeFlags.EnforceInvariance */;
+                    flags |= 1 /* AssignTypeFlags.Invariant */;
                 }
                 else if (variance === 4 /* Variance.Contravariant */) {
-                    flags |= 2 /* AssignTypeFlags.ReverseTypeVarMatching */;
+                    flags |= 2 /* AssignTypeFlags.Contravariant */;
                 }
             }
             if (!hasUnsolvedTypeVars) {
-                (0, constraintSolver_1.assignTypeToTypeVar)(evaluator, typeParam, typeArg, /* diag */ undefined, protocolTypeVarContext, flags);
+                (0, constraintSolver_1.assignTypeVar)(evaluator, typeParam, typeArg, /* diag */ undefined, protocolConstraints, flags);
             }
         }
     });
-    return protocolTypeVarContext;
+    return protocolConstraints;
 }
 //# sourceMappingURL=protocols.js.map