coc-pyright 1.1.310 → 1.1.315

package/lib/index.js

@@ -191,7 +191,7 @@ var require_semver = __commonJS({
             version = version.version;
           }
         } else if (typeof version !== "string") {
-          throw new TypeError(`Invalid Version: ${require("util").inspect(version)}`);
+          throw new TypeError(`Invalid version. Must be a string. Got type "${typeof version}".`);
         }
         if (version.length > MAX_LENGTH) {
           throw new TypeError(
@@ -2569,95 +2569,91 @@ var require_isexe = __commonJS({
   }
 });
 
-// node_modules/which/which.js
-var require_which = __commonJS({
-  "node_modules/which/which.js"(exports, module2) {
-    var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-    var path12 = require("path");
-    var COLON = isWindows ? ";" : ":";
+// node_modules/which/lib/index.js
+var require_lib = __commonJS({
+  "node_modules/which/lib/index.js"(exports, module2) {
     var isexe = require_isexe();
+    var { join: join5, delimiter, sep, posix } = require("path");
+    var isWindows = process.platform === "win32";
+    var rSlash = new RegExp(`[${posix.sep}${sep === posix.sep ? "" : sep}]`.replace(/(\\)/g, "\\$1"));
+    var rRel = new RegExp(`^\\.${rSlash.source}`);
     var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
-    var getPathInfo = (cmd, opt) => {
-      const colon = opt.colon || COLON;
-      const pathEnv = cmd.match(/\//) || isWindows && cmd.match(/\\/) ? [""] : [
+    var getPathInfo = (cmd, {
+      path: optPath = process.env.PATH,
+      pathExt: optPathExt = process.env.PATHEXT,
+      delimiter: optDelimiter = delimiter
+    }) => {
+      const pathEnv = cmd.match(rSlash) ? [""] : [
         // windows always checks the cwd first
         ...isWindows ? [process.cwd()] : [],
-        ...(opt.path || process.env.PATH || /* istanbul ignore next: very unusual */
-        "").split(colon)
+        ...(optPath || /* istanbul ignore next: very unusual */
+        "").split(optDelimiter)
       ];
-      const pathExtExe = isWindows ? opt.pathExt || process.env.PATHEXT || ".EXE;.CMD;.BAT;.COM" : "";
-      const pathExt = isWindows ? pathExtExe.split(colon) : [""];
       if (isWindows) {
-        if (cmd.indexOf(".") !== -1 && pathExt[0] !== "")
+        const pathExtExe = optPathExt || [".EXE", ".CMD", ".BAT", ".COM"].join(optDelimiter);
+        const pathExt = pathExtExe.split(optDelimiter).reduce((acc, item) => {
+          acc.push(item);
+          acc.push(item.toLowerCase());
+          return acc;
+        }, []);
+        if (cmd.includes(".") && pathExt[0] !== "") {
           pathExt.unshift("");
+        }
+        return { pathEnv, pathExt, pathExtExe };
       }
-      return {
-        pathEnv,
-        pathExt,
-        pathExtExe
-      };
+      return { pathEnv, pathExt: [""] };
     };
-    var which6 = (cmd, opt, cb) => {
-      if (typeof opt === "function") {
-        cb = opt;
-        opt = {};
-      }
-      if (!opt)
-        opt = {};
+    var getPathPart = (raw, cmd) => {
+      const pathPart = /^".*"$/.test(raw) ? raw.slice(1, -1) : raw;
+      const prefix = !pathPart && rRel.test(cmd) ? cmd.slice(0, 2) : "";
+      return prefix + join5(pathPart, cmd);
+    };
+    var which6 = async (cmd, opt = {}) => {
       const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
       const found = [];
-      const step = (i) => new Promise((resolve, reject) => {
-        if (i === pathEnv.length)
-          return opt.all && found.length ? resolve(found) : reject(getNotFoundError(cmd));
-        const ppRaw = pathEnv[i];
-        const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path12.join(pathPart, cmd);
-        const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-        resolve(subStep(p, i, 0));
-      });
-      const subStep = (p, i, ii) => new Promise((resolve, reject) => {
-        if (ii === pathExt.length)
-          return resolve(step(i + 1));
-        const ext = pathExt[ii];
-        isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
-          if (!er && is) {
-            if (opt.all)
-              found.push(p + ext);
-            else
-              return resolve(p + ext);
+      for (const envPart of pathEnv) {
+        const p = getPathPart(envPart, cmd);
+        for (const ext of pathExt) {
+          const withExt = p + ext;
+          const is = await isexe(withExt, { pathExt: pathExtExe, ignoreErrors: true });
+          if (is) {
+            if (!opt.all) {
+              return withExt;
+            }
+            found.push(withExt);
           }
-          return resolve(subStep(p, i, ii + 1));
-        });
-      });
-      return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
+        }
+      }
+      if (opt.all && found.length) {
+        return found;
+      }
+      if (opt.nothrow) {
+        return null;
+      }
+      throw getNotFoundError(cmd);
     };
-    var whichSync = (cmd, opt) => {
-      opt = opt || {};
+    var whichSync = (cmd, opt = {}) => {
       const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
       const found = [];
-      for (let i = 0; i < pathEnv.length; i++) {
-        const ppRaw = pathEnv[i];
-        const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path12.join(pathPart, cmd);
-        const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-        for (let j = 0; j < pathExt.length; j++) {
-          const cur = p + pathExt[j];
-          try {
-            const is = isexe.sync(cur, { pathExt: pathExtExe });
-            if (is) {
-              if (opt.all)
-                found.push(cur);
-              else
-                return cur;
+      for (const pathEnvPart of pathEnv) {
+        const p = getPathPart(pathEnvPart, cmd);
+        for (const ext of pathExt) {
+          const withExt = p + ext;
+          const is = isexe.sync(withExt, { pathExt: pathExtExe, ignoreErrors: true });
+          if (is) {
+            if (!opt.all) {
+              return withExt;
             }
-          } catch (ex) {
+            found.push(withExt);
           }
         }
       }
-      if (opt.all && found.length)
+      if (opt.all && found.length) {
         return found;
-      if (opt.nothrow)
+      }
+      if (opt.nothrow) {
         return null;
+      }
       throw getNotFoundError(cmd);
     };
     module2.exports = which6;
@@ -4974,7 +4970,7 @@ var require_move2 = __commonJS({
 });
 
 // node_modules/fs-extra/lib/index.js
-var require_lib = __commonJS({
+var require_lib2 = __commonJS({
   "node_modules/fs-extra/lib/index.js"(exports, module2) {
     "use strict";
     module2.exports = {
@@ -18494,9 +18490,9 @@ var require_package_nls_en_us = __commonJS({
         functionInConditionalExpression: "Conditional expression references function which always evaluates to True",
         functionTypeParametersIllegal: "Function type parameter syntax requires Python 3.12 or newer",
         futureImportLocationNotAllowed: "Imports from __future__ must be at the beginning of the file",
-        generatorAsyncReturnType: 'Return type of async generator function must be "AsyncGenerator" or "AsyncIterable"',
+        generatorAsyncReturnType: 'Return type of async generator function must be compatible with "AsyncGenerator[{yieldType}, Any]"',
         generatorNotParenthesized: "Generator expressions must be parenthesized if not sole argument",
-        generatorSyncReturnType: 'Return type of generator function must be "Generator" or "Iterable"',
+        generatorSyncReturnType: 'Return type of generator function must be compatible with "Generator[{yieldType}, Any, Any]"',
         genericBaseClassNotAllowed: '"Generic" base class cannot be used with type parameter syntax',
         genericClassAssigned: "Generic class type cannot be assigned",
         genericClassDeleted: "Generic class type cannot be deleted",
@@ -18828,6 +18824,7 @@ var require_package_nls_en_us = __commonJS({
         unpackedArgInTypeArgument: "Unpacked arguments cannot be used in type argument lists",
         unpackedArgWithVariadicParam: "Unpacked argument cannot be used for TypeVarTuple parameter",
         unpackedDictArgumentNotMapping: 'Argument expression after ** must be a mapping with a "str" key type',
+        unpackedDictSubscriptIllegal: "Dictionary unpack operator in subscript is not allowed",
         unpackedSubscriptIllegal: "Unpack operator in subscript requires Python 3.11 or newer",
         unpackedTypedDictArgument: "Unable to match unpacked TypedDict argument to parameters",
         unpackedTypeVarTupleExpected: "Expected unpacked TypeVarTuple; use Unpack[{name1}] or *{name2}",
@@ -18860,7 +18857,6 @@ var require_package_nls_en_us = __commonJS({
         yieldFromIllegal: 'Use of "yield from" requires Python 3.3 or newer',
         yieldFromOutsideAsync: '"yield from" not allowed in an async function',
         yieldOutsideFunction: '"yield" not allowed outside of a function or lambda',
-        yieldTypeMismatch: 'Expression of type "{exprType}" cannot be assigned to yield type "{yieldType}"',
         yieldWithinListCompr: '"yield" not allowed inside a list comprehension',
         zeroCaseStatementsFound: "Match statement must include at least one case statement",
         zeroLengthTupleNotAllowed: "Zero-length tuple not allowed in this context"
@@ -18929,6 +18925,8 @@ var require_package_nls_en_us = __commonJS({
         overrideNotClassMethod: "Base method is declared as a classmethod but override is not",
         overrideNotInstanceMethod: "Base method is declared as an instance method but override is not",
         overrideNotStaticMethod: "Base method is declared as a staticmethod but override is not",
+        overrideOverloadNoMatch: "Overload {index} is not compatible with base method",
+        overrideOverloadOrder: "Overloads for override method must be in the same order as the base method",
         overrideParamKeywordNoDefault: 'Keyword parameter "{name}" mismatch: base parameter has default argument value, override parameter does not',
         overrideParamKeywordType: 'Keyword parameter "{name}" type mismatch: base parameter is type "{baseType}", override parameter is type "{overrideType}"',
         overrideParamName: 'Parameter {index} name mismatch: base parameter is named "{baseName}", override parameter is named "{overrideName}"',
@@ -19395,9 +19393,9 @@ var require_localize = __commonJS({
         Diagnostic6.functionInConditionalExpression = () => getRawString("Diagnostic.functionInConditionalExpression");
         Diagnostic6.functionTypeParametersIllegal = () => getRawString("Diagnostic.functionTypeParametersIllegal");
         Diagnostic6.futureImportLocationNotAllowed = () => getRawString("Diagnostic.futureImportLocationNotAllowed");
-        Diagnostic6.generatorAsyncReturnType = () => getRawString("Diagnostic.generatorAsyncReturnType");
+        Diagnostic6.generatorAsyncReturnType = () => new ParameterizedString(getRawString("Diagnostic.generatorAsyncReturnType"));
         Diagnostic6.generatorNotParenthesized = () => getRawString("Diagnostic.generatorNotParenthesized");
-        Diagnostic6.generatorSyncReturnType = () => getRawString("Diagnostic.generatorSyncReturnType");
+        Diagnostic6.generatorSyncReturnType = () => new ParameterizedString(getRawString("Diagnostic.generatorSyncReturnType"));
         Diagnostic6.genericBaseClassNotAllowed = () => getRawString("Diagnostic.genericBaseClassNotAllowed");
         Diagnostic6.genericClassAssigned = () => getRawString("Diagnostic.genericClassAssigned");
         Diagnostic6.genericClassDeleted = () => getRawString("Diagnostic.genericClassDeleted");
@@ -19728,6 +19726,7 @@ var require_localize = __commonJS({
         Diagnostic6.unpackedArgInTypeArgument = () => getRawString("Diagnostic.unpackedArgInTypeArgument");
         Diagnostic6.unpackedArgWithVariadicParam = () => getRawString("Diagnostic.unpackedArgWithVariadicParam");
         Diagnostic6.unpackedDictArgumentNotMapping = () => getRawString("Diagnostic.unpackedDictArgumentNotMapping");
+        Diagnostic6.unpackedDictSubscriptIllegal = () => getRawString("Diagnostic.unpackedDictSubscriptIllegal");
         Diagnostic6.unpackedSubscriptIllegal = () => getRawString("Diagnostic.unpackedSubscriptIllegal");
         Diagnostic6.unpackedTypedDictArgument = () => getRawString("Diagnostic.unpackedTypedDictArgument");
         Diagnostic6.unpackedTypeVarTupleExpected = () => new ParameterizedString(getRawString("Diagnostic.unpackedTypeVarTupleExpected"));
@@ -19760,7 +19759,6 @@ var require_localize = __commonJS({
         Diagnostic6.yieldFromIllegal = () => getRawString("Diagnostic.yieldFromIllegal");
         Diagnostic6.yieldFromOutsideAsync = () => getRawString("Diagnostic.yieldFromOutsideAsync");
         Diagnostic6.yieldOutsideFunction = () => getRawString("Diagnostic.yieldOutsideFunction");
-        Diagnostic6.yieldTypeMismatch = () => new ParameterizedString(getRawString("Diagnostic.yieldTypeMismatch"));
         Diagnostic6.yieldWithinListCompr = () => getRawString("Diagnostic.yieldWithinListCompr");
         Diagnostic6.zeroCaseStatementsFound = () => getRawString("Diagnostic.zeroCaseStatementsFound");
         Diagnostic6.zeroLengthTupleNotAllowed = () => getRawString("Diagnostic.zeroLengthTupleNotAllowed");
@@ -19830,6 +19828,8 @@ var require_localize = __commonJS({
         DiagnosticAddendum2.overrideNotClassMethod = () => getRawString("DiagnosticAddendum.overrideNotClassMethod");
         DiagnosticAddendum2.overrideNotInstanceMethod = () => getRawString("DiagnosticAddendum.overrideNotInstanceMethod");
         DiagnosticAddendum2.overrideNotStaticMethod = () => getRawString("DiagnosticAddendum.overrideNotStaticMethod");
+        DiagnosticAddendum2.overrideOverloadNoMatch = () => new ParameterizedString(getRawString("DiagnosticAddendum.overrideOverloadNoMatch"));
+        DiagnosticAddendum2.overrideOverloadOrder = () => getRawString("DiagnosticAddendum.overrideOverloadOrder");
         DiagnosticAddendum2.overrideParamKeywordNoDefault = () => new ParameterizedString(getRawString("DiagnosticAddendum.overrideParamKeywordNoDefault"));
         DiagnosticAddendum2.overrideParamKeywordType = () => new ParameterizedString(getRawString("DiagnosticAddendum.overrideParamKeywordType"));
         DiagnosticAddendum2.overrideParamName = () => new ParameterizedString(getRawString("DiagnosticAddendum.overrideParamName"));
@@ -29214,13 +29214,17 @@ var require_types = __commonJS({
       function create(overloads) {
         const newType = {
           category: 6,
-          overloads,
+          overloads: [],
           flags: 2
         };
+        overloads.forEach((overload) => {
+          OverloadedFunctionType2.addOverload(newType, overload);
+        });
         return newType;
       }
       OverloadedFunctionType2.create = create;
       function addOverload(type, functionType) {
+        functionType.overloaded = type;
         type.overloads.push(functionType);
       }
       OverloadedFunctionType2.addOverload = addOverload;
@@ -29546,13 +29550,18 @@ var require_types = __commonJS({
         return newInstance;
       }
       TypeVarType2.cloneAsSpecializedSelf = cloneAsSpecializedSelf;
-      function cloneAsInScopePlaceholder(type) {
+      function cloneAsInScopePlaceholder(type, usageOffset) {
         if (type.isInScopePlaceholder) {
           return type;
         }
+        let newNameWithScope = type.nameWithScope;
+        if (usageOffset) {
+          newNameWithScope = `${type.nameWithScope}-${usageOffset}`;
+        }
         const newInstance = TypeBase.cloneType(type);
         newInstance.isInScopePlaceholder = true;
         newInstance.scopeId = exports.InScopePlaceholderScopeId;
+        newInstance.nameWithScope = newNameWithScope;
         return newInstance;
       }
       TypeVarType2.cloneAsInScopePlaceholder = cloneAsInScopePlaceholder;
@@ -29593,10 +29602,7 @@ var require_types = __commonJS({
       function getVariance(type) {
         var _a;
         const variance = (_a = type.computedVariance) !== null && _a !== void 0 ? _a : type.details.declaredVariance;
-        (0, debug_1.assert)(
-          variance !== 0
-          /* Auto */
-        );
+        (0, debug_1.assert)(variance !== 0, "Expected variance to be inferred");
         return variance;
       }
       TypeVarType2.getVariance = getVariance;
@@ -29781,7 +29787,7 @@ var require_types = __commonJS({
           if (!ClassType.isLiteralValueSame(type1, classType2)) {
             return false;
           }
-          if (!ClassType.isTypedDictNarrowedEntriesSame(type1, classType2)) {
+          if (!options.ignoreTypedDictNarrowEntries && !ClassType.isTypedDictNarrowedEntriesSame(type1, classType2)) {
             return false;
           }
           return true;
@@ -29817,19 +29823,17 @@ var require_types = __commonJS({
               return false;
             }
           }
-          if (!type1.specializedTypes && !functionType2.specializedTypes) {
-            const paramSpec1 = type1.details.paramSpec;
-            const paramSpec2 = functionType2.details.paramSpec;
-            if (paramSpec1) {
-              if (!paramSpec2) {
-                return false;
-              }
-              if (!isTypeSame(paramSpec1, paramSpec2, options, recursionCount)) {
-                return false;
-              }
-            } else if (paramSpec2) {
+          const paramSpec1 = type1.details.paramSpec;
+          const paramSpec2 = functionType2.details.paramSpec;
+          if (paramSpec1) {
+            if (!paramSpec2) {
+              return false;
+            }
+            if (!isTypeSame(paramSpec1, paramSpec2, options, recursionCount)) {
               return false;
             }
+          } else if (paramSpec2) {
+            return false;
           }
           let return1Type = type1.details.declaredReturnType;
           if (type1.specializedTypes && type1.specializedTypes.returnType) {
@@ -30213,6 +30217,7 @@ var require_typeVarContext = __commonJS({
     exports.TypeVarContext = exports.TypeVarSignatureContext = void 0;
     var debug_1 = require_debug2();
     var types_1 = require_types();
+    var maxSignatureContextCount = 64;
     var TypeVarSignatureContext = class {
       constructor() {
         this._typeVarMap = /* @__PURE__ */ new Map();
@@ -30419,7 +30424,9 @@ var require_typeVarContext = __commonJS({
       // Copy the specified signature contexts into this type var context.
       copySignatureContexts(contexts) {
         (0, debug_1.assert)(contexts.length > 0);
-        this._signatureContexts = Array.from(contexts);
+        if (contexts.length < maxSignatureContextCount) {
+          this._signatureContexts = Array.from(contexts);
+        }
       }
       // Returns the list of scopes this type var map is "solving".
       getSolveForScopes() {
@@ -30511,19 +30518,172 @@ var require_typeVarContext = __commonJS({
   }
 });
 
+// node_modules/@zzzen/pyright-internal/dist/analyzer/typeWalker.js
+var require_typeWalker = __commonJS({
+  "node_modules/@zzzen/pyright-internal/dist/analyzer/typeWalker.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.TypeWalker = void 0;
+    var debug_1 = require_debug2();
+    var types_1 = require_types();
+    var TypeWalker = class {
+      constructor() {
+        this._recursionCount = 0;
+        this._isWalkCanceled = false;
+        this._hitRecursionLimit = false;
+      }
+      get isRecursionLimitHit() {
+        return this._hitRecursionLimit;
+      }
+      get isWalkCanceled() {
+        return this._isWalkCanceled;
+      }
+      walk(type) {
+        if (this._recursionCount > types_1.maxTypeRecursionCount) {
+          this._hitRecursionLimit = true;
+          return;
+        }
+        if (this._isWalkCanceled) {
+          return;
+        }
+        this._recursionCount++;
+        if (type.typeAliasInfo) {
+          this.visitTypeAlias(type);
+        }
+        switch (type.category) {
+          case 0:
+            this.visitUnbound(type);
+            break;
+          case 2:
+            this.visitAny(type);
+            break;
+          case 1:
+            this.visitUnknown(type);
+            break;
+          case 3:
+            this.visitNone(type);
+            break;
+          case 4:
+            this.visitNever(type);
+            break;
+          case 5:
+            this.visitFunction(type);
+            break;
+          case 6:
+            this.visitOverloadedFunction(type);
+            break;
+          case 7:
+            this.visitClass(type);
+            break;
+          case 8:
+            this.visitModule(type);
+            break;
+          case 9:
+            this.visitUnion(type);
+            break;
+          case 10:
+            this.visitTypeVar(type);
+            break;
+          default:
+            (0, debug_1.assertNever)(type);
+        }
+        this._recursionCount--;
+      }
+      cancelWalk() {
+        this._isWalkCanceled = true;
+      }
+      visitTypeAlias(type) {
+        (0, debug_1.assert)(type.typeAliasInfo);
+        if (type.typeAliasInfo.typeArguments) {
+          for (const typeArg of type.typeAliasInfo.typeArguments) {
+            this.walk(typeArg);
+            if (this._isWalkCanceled) {
+              break;
+            }
+          }
+        }
+      }
+      visitUnbound(type) {
+      }
+      visitAny(type) {
+      }
+      visitUnknown(type) {
+      }
+      visitNone(type) {
+      }
+      visitNever(type) {
+      }
+      visitFunction(type) {
+        var _a;
+        for (let i = 0; i < type.details.parameters.length; i++) {
+          if (type.details.parameters[i].name) {
+            const paramType = types_1.FunctionType.getEffectiveParameterType(type, i);
+            this.walk(paramType);
+            if (this._isWalkCanceled) {
+              break;
+            }
+          }
+        }
+        if (!this._isWalkCanceled && !types_1.FunctionType.isParamSpecValue(type)) {
+          const returnType = (_a = type.details.declaredReturnType) !== null && _a !== void 0 ? _a : type.inferredReturnType;
+          if (returnType) {
+            this.walk(returnType);
+          }
+        }
+      }
+      visitOverloadedFunction(type) {
+        for (const overload of type.overloads) {
+          this.walk(overload);
+          if (this._isWalkCanceled) {
+            break;
+          }
+        }
+      }
+      visitClass(type) {
+        var _a;
+        if (!types_1.ClassType.isPseudoGenericClass(type)) {
+          const typeArgs = ((_a = type.tupleTypeArguments) === null || _a === void 0 ? void 0 : _a.map((t) => t.type)) || type.typeArguments;
+          if (typeArgs) {
+            for (const argType of typeArgs) {
+              this.walk(argType);
+              if (this._isWalkCanceled) {
+                break;
+              }
+            }
+          }
+        }
+      }
+      visitModule(type) {
+      }
+      visitUnion(type) {
+        for (const subtype of type.subtypes) {
+          this.walk(subtype);
+          if (this._isWalkCanceled) {
+            break;
+          }
+        }
+      }
+      visitTypeVar(type) {
+      }
+    };
+    exports.TypeWalker = TypeWalker;
+  }
+});
+
 // node_modules/@zzzen/pyright-internal/dist/analyzer/typeUtils.js
 var require_typeUtils = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/analyzer/typeUtils.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.lookUpObjectMember = exports.getContainerDepth = exports.getProtocolSymbolsRecursive = exports.getProtocolSymbols = exports.transformExpectedType = exports.validateTypeVarDefault = exports.applyInScopePlaceholders = exports.applySourceContextTypeVarsToSignature = exports.applySourceContextTypeVars = exports.applySolvedTypeVars = exports.ensureFunctionSignaturesAreUnique = exports.populateTypeVarContextForSelfType = exports.partiallySpecializeType = exports.isUnboundedTupleClass = exports.isTupleClass = exports.isMaybeDescriptorInstance = exports.isDescriptorInstance = exports.isCallableType = exports.isProperty = exports.isEllipsisType = exports.getUnionSubtypeCount = exports.getLiteralTypeClassName = exports.containsLiteralType = exports.containsType = exports.isLiteralTypeOrUnion = exports.isLiteralType = exports.getSpecializedTupleType = exports.getTypeVarScopeIds = exports.getTypeVarScopeId = exports.transformPossibleRecursiveTypeAlias = exports.isTypeAliasRecursive = exports.isTypeAliasPlaceholder = exports.getTypeCondition = exports.addConditionToType = exports.getFullNameOfType = exports.derivesFromAnyOrUnknown = exports.isUnionableType = exports.preserveUnknown = exports.areTypesSame = exports.doForEachSubtype = exports.sortTypes = exports.mapSubtypes = exports.makeInferenceContext = exports.isTypeVarSame = exports.isIncompleteUnknown = exports.isOptionalType = exports.UniqueSignatureTracker = exports.AssignTypeFlags = exports.ClassIteratorFlags = exports.ClassMemberLookupFlags = void 0;
-    exports.convertParamSpecValueToType = exports.convertTypeToParamSpecValue = exports.getDeclaringModulesForType = exports.computeMroLinearization = exports.isVarianceOfTypeArgumentCompatible = exports.combineVariances = exports.requiresSpecialization = exports.requiresTypeArguments = exports.getGeneratorTypeArgs = exports.removeParamSpecVariadicsFromFunction = exports.removeParamSpecVariadicsFromSignature = exports.specializeTupleClass = exports.combineSameSizedTuples = exports.explodeGenericClass = exports.isPartlyUnknown = exports.containsUnknown = exports.containsAnyOrUnknown = exports.getMembersForModule = exports.getMembersForClass = exports.convertToInstantiable = exports.convertToInstance = exports.isEffectivelyInstantiable = exports.isMetaclassInstance = exports.isInstantiableMetaclass = exports.getGeneratorYieldType = exports.getDeclaredGeneratorReturnType = exports.synthesizeTypeVarForSelfCls = exports.derivesFromClassRecursive = exports.specializeForBaseClass = exports.buildTypeVarContext = exports.buildTypeVarContextFromSpecializedClass = exports.setTypeArgumentsRecursive = exports.specializeClassType = exports.isTypeVarLimitedToCallable = exports.getTypeVarArgumentsRecursive = exports.addTypeVarsToListIfUnique = exports.getClassFieldsRecursive = exports.getClassIterator = exports.getClassMemberIterator = exports.lookUpClassMember = void 0;
+    exports.lookUpClassMember = exports.lookUpObjectMember = exports.getContainerDepth = exports.getProtocolSymbolsRecursive = exports.getProtocolSymbols = exports.transformExpectedType = exports.validateTypeVarDefault = exports.applyInScopePlaceholders = exports.applySourceContextTypeVarsToSignature = exports.applySourceContextTypeVars = exports.applySolvedTypeVars = exports.ensureFunctionSignaturesAreUnique = exports.populateTypeVarContextForSelfType = exports.partiallySpecializeType = exports.isUnboundedTupleClass = exports.isTupleClass = exports.isMaybeDescriptorInstance = exports.isDescriptorInstance = exports.isCallableType = exports.isProperty = exports.isEllipsisType = exports.getUnionSubtypeCount = exports.getLiteralTypeClassName = exports.containsLiteralType = exports.isLiteralTypeOrUnion = exports.isLiteralType = exports.getSpecializedTupleType = exports.getTypeVarScopeIds = exports.getTypeVarScopeId = exports.transformPossibleRecursiveTypeAlias = exports.isTypeAliasRecursive = exports.isTypeAliasPlaceholder = exports.getTypeCondition = exports.addConditionToType = exports.getFullNameOfType = exports.derivesFromAnyOrUnknown = exports.isUnionableType = exports.preserveUnknown = exports.areTypesSame = exports.doForEachSubtype = exports.sortTypes = exports.mapSubtypes = exports.makeInferenceContext = exports.isTypeVarSame = exports.isIncompleteUnknown = exports.isOptionalType = exports.UniqueSignatureTracker = exports.AssignTypeFlags = exports.ClassIteratorFlags = exports.ClassMemberLookupFlags = void 0;
+    exports.convertParamSpecValueToType = exports.convertTypeToParamSpecValue = exports.getDeclaringModulesForType = exports.computeMroLinearization = exports.isVarianceOfTypeArgumentCompatible = exports.combineVariances = exports.requiresSpecialization = exports.requiresTypeArguments = exports.getGeneratorTypeArgs = exports.removeParamSpecVariadicsFromFunction = exports.removeParamSpecVariadicsFromSignature = exports.specializeTupleClass = exports.combineSameSizedTuples = exports.explodeGenericClass = exports.isPartlyUnknown = exports.containsAnyOrUnknown = exports.getMembersForModule = exports.getMembersForClass = exports.convertToInstantiable = exports.convertToInstance = exports.isEffectivelyInstantiable = exports.isMetaclassInstance = exports.isInstantiableMetaclass = exports.getGeneratorYieldType = exports.getDeclaredGeneratorReturnType = exports.synthesizeTypeVarForSelfCls = exports.derivesFromClassRecursive = exports.specializeForBaseClass = exports.buildTypeVarContext = exports.buildTypeVarContextFromSpecializedClass = exports.setTypeArgumentsRecursive = exports.specializeClassType = exports.isTypeVarLimitedToCallable = exports.getTypeVarArgumentsRecursive = exports.addTypeVarsToListIfUnique = exports.getClassFieldsRecursive = exports.getClassIterator = exports.getClassMemberIterator = void 0;
     var collectionUtils_1 = require_collectionUtils();
     var debug_1 = require_debug2();
     var symbol_1 = require_symbol();
     var symbolUtils_1 = require_symbolUtils();
     var types_1 = require_types();
     var typeVarContext_1 = require_typeVarContext();
+    var typeWalker_1 = require_typeWalker();
     var ClassMemberLookupFlags;
     (function(ClassMemberLookupFlags2) {
       ClassMemberLookupFlags2[ClassMemberLookupFlags2["Default"] = 0] = "Default";
@@ -30537,10 +30697,9 @@ var require_typeUtils = __commonJS({
     var ClassIteratorFlags;
     (function(ClassIteratorFlags2) {
       ClassIteratorFlags2[ClassIteratorFlags2["Default"] = 0] = "Default";
-      ClassIteratorFlags2[ClassIteratorFlags2["SkipOriginalClass"] = 1] = "SkipOriginalClass";
-      ClassIteratorFlags2[ClassIteratorFlags2["SkipBaseClasses"] = 2] = "SkipBaseClasses";
-      ClassIteratorFlags2[ClassIteratorFlags2["SkipObjectBaseClass"] = 4] = "SkipObjectBaseClass";
-      ClassIteratorFlags2[ClassIteratorFlags2["SkipTypeBaseClass"] = 8] = "SkipTypeBaseClass";
+      ClassIteratorFlags2[ClassIteratorFlags2["SkipBaseClasses"] = 1] = "SkipBaseClasses";
+      ClassIteratorFlags2[ClassIteratorFlags2["SkipObjectBaseClass"] = 2] = "SkipObjectBaseClass";
+      ClassIteratorFlags2[ClassIteratorFlags2["SkipTypeBaseClass"] = 4] = "SkipTypeBaseClass";
     })(ClassIteratorFlags = exports.ClassIteratorFlags || (exports.ClassIteratorFlags = {}));
     var AssignTypeFlags;
     (function(AssignTypeFlags2) {
@@ -30559,19 +30718,27 @@ var require_typeUtils = __commonJS({
     })(AssignTypeFlags = exports.AssignTypeFlags || (exports.AssignTypeFlags = {}));
     var UniqueSignatureTracker = class {
       constructor() {
-        this.signaturesSeen = [];
+        this._signaturesSeen = [];
       }
       findSignature(signature) {
-        return this.signaturesSeen.find((s) => {
-          return (0, types_1.isTypeSame)(signature, s.type);
+        let effectiveSignature = signature;
+        if ((0, types_1.isFunction)(signature) && signature.overloaded) {
+          effectiveSignature = signature.overloaded;
+        }
+        return this._signaturesSeen.find((s) => {
+          return (0, types_1.isTypeSame)(effectiveSignature, s.type);
         });
       }
-      addSignature(signature) {
-        const existingSignature = this.findSignature(signature);
+      addSignature(signature, offset) {
+        var _a;
+        const effectiveSignature = (_a = signature.overloaded) !== null && _a !== void 0 ? _a : signature;
+        const existingSignature = this.findSignature(effectiveSignature);
         if (existingSignature) {
-          existingSignature.count++;
+          if (!existingSignature.expressionOffsets.some((o) => o === offset)) {
+            existingSignature.expressionOffsets.push(offset);
+          }
         } else {
-          this.signaturesSeen.push({ type: signature, count: 1 });
+          this._signaturesSeen.push({ type: effectiveSignature, expressionOffsets: [offset] });
         }
       }
     };
@@ -30612,11 +30779,11 @@ var require_typeUtils = __commonJS({
       return isCompatible;
     }
     exports.isTypeVarSame = isTypeVarSame;
-    function makeInferenceContext(expectedType, isTypeIncomplete) {
+    function makeInferenceContext(expectedType, isTypeIncomplete, signatureTracker) {
       if (!expectedType) {
         return void 0;
       }
-      return { expectedType, isTypeIncomplete };
+      return { expectedType, isTypeIncomplete, signatureTracker };
     }
     exports.makeInferenceContext = makeInferenceContext;
     function mapSubtypes(type, callback) {
@@ -30981,49 +31148,28 @@ var require_typeUtils = __commonJS({
       return false;
     }
     exports.isLiteralTypeOrUnion = isLiteralTypeOrUnion;
-    function containsType(type, predicate, includeTypeArgs = false, recursionCount = 0) {
-      var _a;
-      if (recursionCount > types_1.maxTypeRecursionCount) {
-        return false;
-      }
-      recursionCount++;
-      if (predicate(type)) {
-        return true;
-      }
-      if (includeTypeArgs && (0, types_1.isClass)(type)) {
-        const typeArgs = ((_a = type.tupleTypeArguments) === null || _a === void 0 ? void 0 : _a.map((t) => t.type)) || type.typeArguments;
-        if (typeArgs) {
-          return typeArgs.some((typeArg) => containsType(typeArg, predicate, includeTypeArgs, recursionCount));
-        }
-      }
-      if ((0, types_1.isUnion)(type)) {
-        return type.subtypes.some((subtype) => containsType(subtype, predicate, includeTypeArgs, recursionCount));
-      }
-      if ((0, types_1.isOverloadedFunction)(type)) {
-        return type.overloads.some((overload) => containsType(overload, predicate, includeTypeArgs, recursionCount));
-      }
-      if ((0, types_1.isFunction)(type)) {
-        const returnType = types_1.FunctionType.getSpecializedReturnType(type);
-        if (returnType && containsType(returnType, predicate, includeTypeArgs, recursionCount)) {
-          return true;
+    function containsLiteralType(type, includeTypeArgs = false) {
+      class ContainsLiteralTypeWalker extends typeWalker_1.TypeWalker {
+        constructor(_includeTypeArgs) {
+          super();
+          this._includeTypeArgs = _includeTypeArgs;
+          this.foundLiteral = false;
         }
-        for (let i = 0; i < type.details.parameters.length; i++) {
-          const paramType = types_1.FunctionType.getEffectiveParameterType(type, i);
-          if (containsType(paramType, predicate, includeTypeArgs, recursionCount)) {
-            return true;
+        visitClass(classType) {
+          if ((0, types_1.isClassInstance)(classType)) {
+            if (isLiteralType(classType) || types_1.ClassType.isBuiltIn(classType, "LiteralString")) {
+              this.foundLiteral = true;
+              this.cancelWalk();
+            }
+          }
+          if (this._includeTypeArgs) {
+            super.visitClass(classType);
           }
         }
       }
-      return false;
-    }
-    exports.containsType = containsType;
-    function containsLiteralType(type, includeTypeArgs = false, recursionCount = 0) {
-      return containsType(type, (t) => {
-        if (!(0, types_1.isClassInstance)(t)) {
-          return false;
-        }
-        return isLiteralType(t) || types_1.ClassType.isBuiltIn(t, "LiteralString");
-      }, includeTypeArgs, recursionCount);
+      const walker = new ContainsLiteralTypeWalker(includeTypeArgs);
+      walker.walk(type);
+      return walker.foundLiteral;
     }
     exports.containsLiteralType = containsLiteralType;
     function getLiteralTypeClassName(type) {
@@ -31119,11 +31265,7 @@ var require_typeUtils = __commonJS({
       if (types_1.ClassType.isUnspecialized(contextClassType)) {
         return type;
       }
-      const typeVarContext = buildTypeVarContextFromSpecializedClass(
-        contextClassType,
-        /* makeConcrete */
-        void 0
-      );
+      const typeVarContext = buildTypeVarContextFromSpecializedClass(contextClassType);
       if (selfClass) {
         populateTypeVarContextForSelfType(typeVarContext, contextClassType, selfClass);
       }
@@ -31139,8 +31281,8 @@ var require_typeUtils = __commonJS({
       typeVarContext.setTypeVarType(synthesizedSelfTypeVar, convertToInstance(selfClass));
     }
     exports.populateTypeVarContextForSelfType = populateTypeVarContextForSelfType;
-    function ensureFunctionSignaturesAreUnique(type, signatureTracker) {
-      const transformer = new UniqueFunctionSignatureTransformer(signatureTracker);
+    function ensureFunctionSignaturesAreUnique(type, signatureTracker, expressionOffset) {
+      const transformer = new UniqueFunctionSignatureTransformer(signatureTracker, expressionOffset);
       return transformer.apply(type, 0);
     }
     exports.ensureFunctionSignaturesAreUnique = ensureFunctionSignaturesAreUnique;
@@ -31207,8 +31349,8 @@ var require_typeUtils = __commonJS({
       }
     }
     exports.validateTypeVarDefault = validateTypeVarDefault;
-    function transformExpectedType(expectedType, liveTypeVarScopes) {
-      const transformer = new ExpectedTypeTransformer(liveTypeVarScopes);
+    function transformExpectedType(expectedType, liveTypeVarScopes, usageOffset) {
+      const transformer = new ExpectedTypeTransformer(liveTypeVarScopes, usageOffset);
       return transformer.apply(expectedType, 0);
     }
     exports.transformExpectedType = transformExpectedType;
@@ -31278,37 +31420,39 @@ var require_typeUtils = __commonJS({
       return 1 + maxChildDepth;
     }
     exports.getContainerDepth = getContainerDepth;
-    function lookUpObjectMember(objectType, memberName, flags = 0) {
+    function lookUpObjectMember(objectType, memberName, flags = 0, skipMroClass) {
       if ((0, types_1.isClassInstance)(objectType)) {
-        return lookUpClassMember(objectType, memberName, flags);
+        return lookUpClassMember(objectType, memberName, flags, skipMroClass);
       }
       return void 0;
     }
     exports.lookUpObjectMember = lookUpObjectMember;
-    function lookUpClassMember(classType, memberName, flags = 0) {
+    function lookUpClassMember(classType, memberName, flags = 0, skipMroClass) {
       var _a;
-      const memberItr = getClassMemberIterator(classType, memberName, flags);
+      const memberItr = getClassMemberIterator(classType, memberName, flags, skipMroClass);
       return (_a = memberItr.next()) === null || _a === void 0 ? void 0 : _a.value;
     }
     exports.lookUpClassMember = lookUpClassMember;
-    function* getClassMemberIterator(classType, memberName, flags = 0) {
+    function* getClassMemberIterator(classType, memberName, flags = 0, skipMroClass) {
       const declaredTypesOnly = (flags & 16) !== 0;
       let skippedUndeclaredType = false;
       if ((0, types_1.isClass)(classType)) {
         let classFlags = 0;
         if (flags & 1) {
-          classFlags = classFlags | 1;
+          if ((0, types_1.isClass)(classType)) {
+            skipMroClass = classType;
+          }
         }
         if (flags & 2) {
-          classFlags = classFlags | 2;
+          classFlags = classFlags | 1;
         }
         if (flags & 4) {
-          classFlags = classFlags | 4;
+          classFlags = classFlags | 2;
         }
         if (flags & 32) {
-          classFlags = classFlags | 8;
+          classFlags = classFlags | 4;
         }
-        const classItr = getClassIterator(classType, classFlags);
+        const classItr = getClassIterator(classType, classFlags, skipMroClass);
         for (const [mroClass, specializedMroClass] of classItr) {
           if (!(0, types_1.isInstantiableClass)(mroClass)) {
             if (!declaredTypesOnly) {
@@ -31394,23 +31538,29 @@ var require_typeUtils = __commonJS({
       return void 0;
     }
     exports.getClassMemberIterator = getClassMemberIterator;
-    function* getClassIterator(classType, flags = 0) {
+    function* getClassIterator(classType, flags = 0, skipMroClass) {
       if ((0, types_1.isClass)(classType)) {
-        let skipMroEntry = (flags & 1) !== 0;
+        let foundSkipMroClass = skipMroClass === void 0;
         for (const mroClass of classType.details.mro) {
-          if (skipMroEntry) {
-            skipMroEntry = false;
-            continue;
+          if (!foundSkipMroClass && skipMroClass) {
+            if (!(0, types_1.isClass)(mroClass)) {
+              foundSkipMroClass = true;
+            } else if (types_1.ClassType.isSameGenericClass(mroClass, skipMroClass)) {
+              foundSkipMroClass = true;
+              continue;
+            } else {
+              continue;
+            }
           }
           const specializedMroClass = partiallySpecializeType(mroClass, classType);
-          if (flags & 4) {
+          if (flags & 2) {
             if ((0, types_1.isInstantiableClass)(specializedMroClass)) {
               if (types_1.ClassType.isBuiltIn(specializedMroClass, "object")) {
                 break;
               }
             }
           }
-          if (flags & 8) {
+          if (flags & 4) {
             if ((0, types_1.isInstantiableClass)(specializedMroClass)) {
               if (types_1.ClassType.isBuiltIn(specializedMroClass, "type")) {
                 break;
@@ -31418,7 +31568,7 @@ var require_typeUtils = __commonJS({
             }
           }
           yield [mroClass, specializedMroClass];
-          if ((flags & 2) !== 0) {
+          if ((flags & 1) !== 0) {
             break;
           }
         }
@@ -31660,13 +31810,9 @@ var require_typeUtils = __commonJS({
       }
     }
     exports.setTypeArgumentsRecursive = setTypeArgumentsRecursive;
-    function buildTypeVarContextFromSpecializedClass(classType, makeConcrete = true) {
+    function buildTypeVarContextFromSpecializedClass(classType) {
       const typeParameters = types_1.ClassType.getTypeParameters(classType);
-      let typeArguments = classType.typeArguments;
-      if (!typeArguments && !makeConcrete) {
-        typeArguments = typeParameters;
-      }
-      const typeVarContext = buildTypeVarContext(typeParameters, typeArguments, getTypeVarScopeId(classType));
+      const typeVarContext = buildTypeVarContext(typeParameters, classType.typeArguments, getTypeVarScopeId(classType));
       if (types_1.ClassType.isTupleClass(classType) && classType.tupleTypeArguments && typeParameters.length >= 1) {
         typeVarContext.setTupleTypeVar(typeParameters[0], classType.tupleTypeArguments);
       }
@@ -31678,7 +31824,7 @@ var require_typeUtils = __commonJS({
       typeParameters.forEach((typeParam, index) => {
         let typeArgType;
         if (typeArgs) {
-          if ((0, types_1.isParamSpec)(typeParam)) {
+          if (typeParam.details.isParamSpec) {
             if (index < typeArgs.length) {
               typeArgType = typeArgs[index];
               if ((0, types_1.isFunction)(typeArgType) && types_1.FunctionType.isParamSpecValue(typeArgType)) {
@@ -31954,26 +32100,34 @@ var require_typeUtils = __commonJS({
       });
     }
     exports.getMembersForModule = getMembersForModule;
-    function containsAnyOrUnknown(type) {
-      let foundAnyOrUnknown = false;
-      doForEachSubtype(type, (subtype) => {
-        if ((0, types_1.isAnyOrUnknown)(subtype)) {
-          foundAnyOrUnknown = true;
+    function containsAnyOrUnknown(type, recurse) {
+      class AnyOrUnknownWalker extends typeWalker_1.TypeWalker {
+        constructor(_recurse) {
+          super();
+          this._recurse = _recurse;
         }
-      });
-      return foundAnyOrUnknown;
-    }
-    exports.containsAnyOrUnknown = containsAnyOrUnknown;
-    function containsUnknown(type) {
-      let foundUnknown = false;
-      doForEachSubtype(type, (subtype) => {
-        if ((0, types_1.isUnknown)(subtype)) {
-          foundUnknown = true;
+        visitUnknown(type2) {
+          this.anyOrUnknownType = this.anyOrUnknownType ? preserveUnknown(this.anyOrUnknownType, type2) : type2;
         }
-      });
-      return foundUnknown;
+        visitAny(type2) {
+          this.anyOrUnknownType = this.anyOrUnknownType ? preserveUnknown(this.anyOrUnknownType, type2) : type2;
+        }
+        visitClass(type2) {
+          if (this._recurse) {
+            super.visitClass(type2);
+          }
+        }
+        visitFunction(type2) {
+          if (this._recurse) {
+            super.visitFunction(type2);
+          }
+        }
+      }
+      const walker = new AnyOrUnknownWalker(recurse);
+      walker.walk(type);
+      return walker.anyOrUnknownType;
     }
-    exports.containsUnknown = containsUnknown;
+    exports.containsAnyOrUnknown = containsAnyOrUnknown;
     function isPartlyUnknown(type, allowUnknownTypeArgsForClasses = false, recursionCount = 0) {
       var _a, _b;
       if (recursionCount > types_1.maxTypeRecursionCount) {
@@ -32212,13 +32366,29 @@ var require_typeUtils = __commonJS({
         return false;
       }
       recursionCount++;
+      const canUseCache = !ignorePseudoGeneric && !ignoreSelf;
+      if (canUseCache && ((_a = type.cached) === null || _a === void 0 ? void 0 : _a.requiresSpecialization) !== void 0) {
+        return type.cached.requiresSpecialization;
+      }
+      const result = _requiresSpecialization(type, ignorePseudoGeneric, ignoreSelf, recursionCount);
+      if (canUseCache) {
+        if (type.cached === void 0) {
+          type.cached = {};
+        }
+        type.cached.requiresSpecialization = result;
+      }
+      return result;
+    }
+    exports.requiresSpecialization = requiresSpecialization;
+    function _requiresSpecialization(type, ignorePseudoGeneric = false, ignoreSelf = false, recursionCount = 0) {
+      var _a;
       switch (type.category) {
         case 7: {
           if (types_1.ClassType.isPseudoGenericClass(type) && ignorePseudoGeneric) {
             return false;
           }
           if (type.typeArguments) {
-            return type.typeArguments.find((typeArg) => requiresSpecialization(typeArg, ignorePseudoGeneric, ignoreSelf, recursionCount)) !== void 0;
+            return type.typeArguments.some((typeArg) => requiresSpecialization(typeArg, ignorePseudoGeneric, ignoreSelf, recursionCount));
           }
           return types_1.ClassType.getTypeParameters(type).length > 0;
         }
@@ -32244,10 +32414,10 @@ var require_typeUtils = __commonJS({
           return false;
         }
         case 6: {
-          return type.overloads.find((overload) => requiresSpecialization(overload, ignorePseudoGeneric, ignoreSelf, recursionCount)) !== void 0;
+          return type.overloads.some((overload) => requiresSpecialization(overload, ignorePseudoGeneric, ignoreSelf, recursionCount));
         }
         case 9: {
-          return (0, types_1.findSubtype)(type, (subtype) => requiresSpecialization(subtype, ignorePseudoGeneric, ignoreSelf, recursionCount)) !== void 0;
+          return type.subtypes.some((subtype) => requiresSpecialization(subtype, ignorePseudoGeneric, ignoreSelf, recursionCount));
         }
         case 10: {
           if (!type.details.recursiveTypeAliasName) {
@@ -32263,7 +32433,6 @@ var require_typeUtils = __commonJS({
       }
       return false;
     }
-    exports.requiresSpecialization = requiresSpecialization;
     function combineVariances(variance1, variance2) {
       if (variance1 === 1) {
         return variance2;
@@ -32335,11 +32504,7 @@ var require_typeUtils = __commonJS({
       const classListsToMerge = [];
       filteredBaseClasses.forEach((baseClass) => {
         if ((0, types_1.isInstantiableClass)(baseClass)) {
-          const typeVarContext2 = buildTypeVarContextFromSpecializedClass(
-            baseClass,
-            /* makeConcrete */
-            false
-          );
+          const typeVarContext2 = buildTypeVarContextFromSpecializedClass(baseClass);
           classListsToMerge.push(baseClass.details.mro.map((mroClass) => {
             return applySolvedTypeVars(mroClass, typeVarContext2);
           }));
@@ -32348,18 +32513,10 @@ var require_typeUtils = __commonJS({
         }
       });
       classListsToMerge.push(filteredBaseClasses.map((baseClass) => {
-        const typeVarContext2 = buildTypeVarContextFromSpecializedClass(
-          classType,
-          /* makeConcrete */
-          false
-        );
+        const typeVarContext2 = buildTypeVarContextFromSpecializedClass(classType);
         return applySolvedTypeVars(baseClass, typeVarContext2);
       }));
-      const typeVarContext = buildTypeVarContextFromSpecializedClass(
-        classType,
-        /* makeConcrete */
-        false
-      );
+      const typeVarContext = buildTypeVarContextFromSpecializedClass(classType);
       classType.details.mro.push(applySolvedTypeVars(classType, typeVarContext));
       function isInTail(searchClass, classLists) {
         return classLists.some((classList) => {
@@ -32367,14 +32524,8 @@ var require_typeUtils = __commonJS({
         });
       }
       function filterClass(classToFilter, classLists) {
-        if ((classToFilter === null || classToFilter === void 0 ? void 0 : classToFilter.category) !== 7) {
-          (0, debug_1.fail)(`Corrupted class type when computing MRO for ${classType.details.name}: ${JSON.stringify(classToFilter)}`);
-        }
         for (let i = 0; i < classLists.length; i++) {
           classLists[i] = classLists[i].filter((value) => {
-            if ((value === null || value === void 0 ? void 0 : value.category) === void 0) {
-              (0, debug_1.fail)(`Unexpected undefined type when computing MRO for ${classType.details.name}: ${JSON.stringify(classLists)}`);
-            }
             return !(0, types_1.isInstantiableClass)(value) || !types_1.ClassType.isSameGenericClass(value, classToFilter);
           });
         }
@@ -32678,13 +32829,13 @@ var require_typeUtils = __commonJS({
         return requiresUpdate ? types_1.TypeBase.cloneForTypeAlias(type, type.typeAliasInfo.name, type.typeAliasInfo.fullName, type.typeAliasInfo.typeVarScopeId, type.typeAliasInfo.typeParameters, newTypeArgs) : type;
       }
       transformTypeVarsInClassType(classType, recursionCount) {
-        if (types_1.ClassType.getTypeParameters(classType).length === 0 && !types_1.ClassType.isSpecialBuiltIn(classType)) {
+        const typeParams = types_1.ClassType.getTypeParameters(classType);
+        if (typeParams.length === 0 && !types_1.ClassType.isSpecialBuiltIn(classType)) {
           return classType;
         }
         let newTypeArgs;
         let newTupleTypeArgs;
         let specializationNeeded = false;
-        const typeParams = types_1.ClassType.getTypeParameters(classType);
         const transformParamSpec = (paramSpec) => {
           const paramSpecValue = this.transformParamSpec(paramSpec, recursionCount);
           if (paramSpecValue) {
@@ -32939,9 +33090,16 @@ var require_typeUtils = __commonJS({
       }
     };
     var UniqueFunctionSignatureTransformer = class extends TypeVarTransformer {
-      constructor(_signatureTracker) {
+      constructor(_signatureTracker, _expressionOffset) {
         super();
         this._signatureTracker = _signatureTracker;
+        this._expressionOffset = _expressionOffset;
+      }
+      transformGenericTypeAlias(type, recursionCount) {
+        return type;
+      }
+      transformTypeVarsInClassType(classType, recursionCount) {
+        return classType;
       }
       transformTypeVarsInFunctionType(sourceType, recursionCount) {
         if (sourceType.details.typeParameters.length === 0) {
@@ -32951,13 +33109,23 @@ var require_typeUtils = __commonJS({
         const existingSignature = this._signatureTracker.findSignature(sourceType);
         if (existingSignature) {
           const typeVarContext = new typeVarContext_1.TypeVarContext(getTypeVarScopeId(sourceType));
-          sourceType.details.typeParameters.forEach((typeParam) => {
-            const replacement = types_1.TypeVarType.cloneForNewName(typeParam, `${typeParam.details.name}(${existingSignature.count})`);
-            typeVarContext.setTypeVarType(typeParam, replacement);
+          let offsetIndex = existingSignature.expressionOffsets.findIndex((offset) => offset === this._expressionOffset);
+          if (offsetIndex < 0) {
+            offsetIndex = existingSignature.expressionOffsets.length;
+          }
+          if (offsetIndex > 0) {
+            sourceType.details.typeParameters.forEach((typeParam) => {
+              let replacement = types_1.TypeVarType.cloneForNewName(typeParam, `${typeParam.details.name}(${offsetIndex})`);
+              if (replacement.details.isParamSpec) {
+                replacement = convertTypeToParamSpecValue(replacement);
+              }
+              typeVarContext.setTypeVarType(typeParam, replacement);
+            });
             updatedSourceType = applySolvedTypeVars(sourceType, typeVarContext);
-          });
+            (0, debug_1.assert)((0, types_1.isFunction)(updatedSourceType) || (0, types_1.isOverloadedFunction)(updatedSourceType));
+          }
         }
-        this._signatureTracker.addSignature(sourceType);
+        this._signatureTracker.addSignature(sourceType, this._expressionOffset);
         return updatedSourceType;
       }
     };
@@ -33070,7 +33238,7 @@ var require_typeUtils = __commonJS({
         return signatureContext.getTupleTypeVar(typeVar);
       }
       transformParamSpec(paramSpec, recursionCount) {
-        var _a;
+        var _a, _b;
         const signatureContext = this._typeVarContext.getSignatureContext((_a = this._activeTypeVarSignatureContextIndex) !== null && _a !== void 0 ? _a : 0);
         if (this._isSolvingDefaultType && !paramSpec.scopeId) {
           const replacementEntry = signatureContext.getTypeVars().find((entry) => entry.typeVar.details.name === paramSpec.details.name);
@@ -33091,7 +33259,10 @@ var require_typeUtils = __commonJS({
         }
         let useDefaultOrUnknown = false;
         if (this._options.unknownIfNotFound && !this._typeVarContext.hasSolveForScope(types_1.WildcardTypeVarScopeId)) {
-          useDefaultOrUnknown = true;
+          const exemptTypeVars = (_b = this._options.unknownExemptTypeVars) !== null && _b !== void 0 ? _b : [];
+          if (!exemptTypeVars.some((t) => (0, types_1.isTypeSame)(t, paramSpec, { ignoreTypeFlags: true }))) {
+            useDefaultOrUnknown = true;
+          }
         } else if (this._options.applyInScopePlaceholders && paramSpec.isInScopePlaceholder) {
           useDefaultOrUnknown = true;
         }
@@ -33143,19 +33314,20 @@ var require_typeUtils = __commonJS({
       }
     };
     var ExpectedTypeTransformer = class extends TypeVarTransformer {
-      constructor(_liveTypeVarScopes) {
+      constructor(_liveTypeVarScopes, _usageOffset) {
         super();
         this._liveTypeVarScopes = _liveTypeVarScopes;
+        this._usageOffset = _usageOffset;
       }
       transformTypeVar(typeVar) {
         if (!this._isTypeVarLive(typeVar)) {
-          return types_1.TypeVarType.cloneAsInScopePlaceholder(typeVar);
+          return types_1.TypeVarType.cloneAsInScopePlaceholder(typeVar, this._usageOffset);
         }
         return typeVar;
       }
       transformParamSpec(paramSpec) {
         if (!this._isTypeVarLive(paramSpec)) {
-          return convertTypeToParamSpecValue(types_1.TypeVarType.cloneAsInScopePlaceholder(paramSpec));
+          return convertTypeToParamSpecValue(types_1.TypeVarType.cloneAsInScopePlaceholder(paramSpec, this._usageOffset));
         }
         return void 0;
       }
@@ -33171,7 +33343,7 @@ var require_typeUtils = __commonJS({
       transformTypeVar(typeVar) {
         var _a;
         if (typeVar.isInScopePlaceholder) {
-          return (_a = this._signatureContext.getTypeVarType(typeVar)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
+          return (_a = this._signatureContext.getTypeVarType(typeVar)) !== null && _a !== void 0 ? _a : typeVar;
         }
         return typeVar;
       }
@@ -33775,7 +33947,7 @@ var require_definitionProvider = __commonJS({
       return result;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.TypeDefinitionProvider = exports.DefinitionProvider = exports.DefinitionFilter = void 0;
+    exports.TypeDefinitionProvider = exports.DefinitionProvider = exports.filterDefinitions = exports.addDeclarationsToDefinitions = exports.DefinitionFilter = void 0;
     var analyzerNodeInfo_1 = require_analyzerNodeInfo();
     var declaration_1 = require_declaration();
     var ParseTreeUtils = __importStar(require_parseTreeUtils());
@@ -33794,6 +33966,78 @@ var require_definitionProvider = __commonJS({
       DefinitionFilter2["PreferSource"] = "preferSource";
       DefinitionFilter2["PreferStubs"] = "preferStubs";
     })(DefinitionFilter = exports.DefinitionFilter || (exports.DefinitionFilter = {}));
+    function addDeclarationsToDefinitions(evaluator, sourceMapper, declarations, definitions) {
+      if (!declarations) {
+        return;
+      }
+      declarations.forEach((decl) => {
+        var _a;
+        let resolvedDecl = evaluator.resolveAliasDeclaration(
+          decl,
+          /* resolveLocalNames */
+          true,
+          {
+            allowExternallyHiddenAccess: true
+          }
+        );
+        if (!resolvedDecl || !resolvedDecl.path) {
+          return;
+        }
+        if (resolvedDecl.type === 8 && resolvedDecl.isUnresolved) {
+          return;
+        }
+        if (resolvedDecl.type === 8 && resolvedDecl.symbolName && resolvedDecl.submoduleFallback && resolvedDecl.submoduleFallback.path) {
+          resolvedDecl = resolvedDecl.submoduleFallback;
+        }
+        _addIfUnique(definitions, {
+          path: resolvedDecl.path,
+          range: resolvedDecl.range
+        });
+        if ((0, declaration_1.isFunctionDeclaration)(resolvedDecl)) {
+          const functionType = (_a = evaluator.getTypeForDeclaration(resolvedDecl)) === null || _a === void 0 ? void 0 : _a.type;
+          if (functionType && (0, types_1.isOverloadedFunction)(functionType)) {
+            for (const overloadDecl of functionType.overloads.map((o) => o.details.declaration).filter(core_1.isDefined)) {
+              _addIfUnique(definitions, {
+                path: overloadDecl.path,
+                range: overloadDecl.range
+              });
+            }
+          }
+        }
+        if (!(0, sourceMapper_1.isStubFile)(resolvedDecl.path)) {
+          return;
+        }
+        if (resolvedDecl.type === 8) {
+          sourceMapper.findModules(resolvedDecl.path).map((m) => {
+            var _a2;
+            return (_a2 = (0, analyzerNodeInfo_1.getFileInfo)(m)) === null || _a2 === void 0 ? void 0 : _a2.filePath;
+          }).filter(core_1.isDefined).forEach((f) => _addIfUnique(definitions, _createModuleEntry(f)));
+          return;
+        }
+        const implDecls = sourceMapper.findDeclarations(resolvedDecl);
+        for (const implDecl of implDecls) {
+          if (implDecl && implDecl.path) {
+            _addIfUnique(definitions, {
+              path: implDecl.path,
+              range: implDecl.range
+            });
+          }
+        }
+      });
+    }
+    exports.addDeclarationsToDefinitions = addDeclarationsToDefinitions;
+    function filterDefinitions(filter, definitions) {
+      if (filter === DefinitionFilter.All) {
+        return definitions;
+      }
+      const preferStubs = filter === DefinitionFilter.PreferStubs;
+      const wantedFile = (v) => preferStubs === (0, sourceMapper_1.isStubFile)(v.path);
+      if (definitions.find(wantedFile)) {
+        return definitions.filter(wantedFile);
+      }
+      return definitions;
+    }
+    exports.filterDefinitions = filterDefinitions;
     var DefinitionProviderBase = class {
       constructor(sourceMapper, evaluator, node, offset, _filter, token) {
         this.sourceMapper = sourceMapper;
@@ -33824,71 +34068,10 @@ var require_definitionProvider = __commonJS({
         if (definitions.length === 0) {
           return void 0;
         }
-        if (this._filter === DefinitionFilter.All) {
-          return definitions;
-        }
-        const preferStubs = this._filter === DefinitionFilter.PreferStubs;
-        const wantedFile = (v) => preferStubs === (0, sourceMapper_1.isStubFile)(v.path);
-        if (definitions.find(wantedFile)) {
-          return definitions.filter(wantedFile);
-        }
-        return definitions;
+        return filterDefinitions(this._filter, definitions);
       }
       resolveDeclarations(declarations, definitions) {
-        if (declarations) {
-          declarations.forEach((decl) => {
-            var _a;
-            let resolvedDecl = this.evaluator.resolveAliasDeclaration(
-              decl,
-              /* resolveLocalNames */
-              true,
-              {
-                allowExternallyHiddenAccess: true
-              }
-            );
-            if (resolvedDecl && resolvedDecl.path) {
-              if (resolvedDecl.type === 8 && resolvedDecl.isUnresolved) {
-                return;
-              }
-              if (resolvedDecl.type === 8 && resolvedDecl.symbolName && resolvedDecl.submoduleFallback && resolvedDecl.submoduleFallback.path) {
-                resolvedDecl = resolvedDecl.submoduleFallback;
-              }
-              _addIfUnique(definitions, {
-                path: resolvedDecl.path,
-                range: resolvedDecl.range
-              });
-              if ((0, declaration_1.isFunctionDeclaration)(resolvedDecl)) {
-                const functionType = (_a = this.evaluator.getTypeForDeclaration(resolvedDecl)) === null || _a === void 0 ? void 0 : _a.type;
-                if (functionType && (0, types_1.isOverloadedFunction)(functionType)) {
-                  for (const overloadDecl of functionType.overloads.map((o) => o.details.declaration).filter(core_1.isDefined)) {
-                    _addIfUnique(definitions, {
-                      path: overloadDecl.path,
-                      range: overloadDecl.range
-                    });
-                  }
-                }
-              }
-              if ((0, sourceMapper_1.isStubFile)(resolvedDecl.path)) {
-                if (resolvedDecl.type === 8) {
-                  this.sourceMapper.findModules(resolvedDecl.path).map((m) => {
-                    var _a2;
-                    return (_a2 = (0, analyzerNodeInfo_1.getFileInfo)(m)) === null || _a2 === void 0 ? void 0 : _a2.filePath;
-                  }).filter(core_1.isDefined).forEach((f) => _addIfUnique(definitions, _createModuleEntry(f)));
-                } else {
-                  const implDecls = this.sourceMapper.findDeclarations(resolvedDecl);
-                  for (const implDecl of implDecls) {
-                    if (implDecl && implDecl.path) {
-                      _addIfUnique(definitions, {
-                        path: implDecl.path,
-                        range: implDecl.range
-                      });
-                    }
-                  }
-                }
-              }
-            }
-          });
-        }
+        addDeclarationsToDefinitions(this.evaluator, this.sourceMapper, declarations, definitions);
       }
     };
     var DefinitionProvider = class extends DefinitionProviderBase {
@@ -37544,6 +37727,9 @@ var require_readonlyAugmentedFileSystem = __commonJS({
       statSync(path12) {
         return this.realFS.statSync(this.getOriginalPath(path12));
       }
+      rmdirSync(path12) {
+        throw new Error("Operation is not allowed.");
+      }
       unlinkSync(path12) {
         throw new Error("Operation is not allowed.");
       }
@@ -37677,6 +37863,9 @@ var require_pyrightFileSystem = __commonJS({
       writeFileSync(path12, data, encoding) {
         this.realFS.writeFileSync(this.getOriginalPath(path12), data, encoding);
       }
+      rmdirSync(path12) {
+        this.realFS.rmdirSync(this.getOriginalPath(path12));
+      }
       unlinkSync(path12) {
         this.realFS.unlinkSync(this.getOriginalPath(path12));
       }
@@ -38672,11 +38861,11 @@ var require_importResolver = __commonJS({
       }
       getTypeshedStdLibPath(execEnv) {
         const unused = [];
-        return this._getStdlibTypeshedPath(execEnv, unused);
+        return this._getStdlibTypeshedPath(this._configOptions.typeshedPath, execEnv.pythonVersion, unused);
       }
       getTypeshedThirdPartyPath(execEnv) {
         const unused = [];
-        return this._getThirdPartyTypeshedPath(execEnv, unused);
+        return this._getThirdPartyTypeshedPath(this._configOptions.typeshedPath, unused);
       }
       isStdlibModule(module3, execEnv) {
         if (!this._stdlibModules) {
@@ -38687,7 +38876,7 @@ var require_importResolver = __commonJS({
       getImportRoots(execEnv, forLogging = false) {
         const importFailureInfo = [];
         const roots = [];
-        const stdTypeshed = this._getStdlibTypeshedPath(execEnv, importFailureInfo);
+        const stdTypeshed = this._getStdlibTypeshedPath(this._configOptions.typeshedPath, execEnv.pythonVersion, importFailureInfo);
         if (stdTypeshed) {
           roots.push(stdTypeshed);
         }
@@ -38699,12 +38888,12 @@ var require_importResolver = __commonJS({
           roots.push(this._configOptions.stubPath);
         }
         if (forLogging) {
-          const thirdPartyRoot = this._getThirdPartyTypeshedPath(execEnv, importFailureInfo);
+          const thirdPartyRoot = this._getThirdPartyTypeshedPath(this._configOptions.typeshedPath, importFailureInfo);
           if (thirdPartyRoot) {
             roots.push((0, pathUtils_1.combinePaths)(thirdPartyRoot, "..."));
           }
         } else {
-          const thirdPartyPaths = this._getThirdPartyTypeshedPackageRoots(execEnv, importFailureInfo);
+          const thirdPartyPaths = this._getThirdPartyTypeshedPackageRoots(importFailureInfo);
           (0, collectionUtils_1.appendArray)(roots, thirdPartyPaths);
         }
         const typeshedPathEx = this.getTypeshedPathEx(execEnv, importFailureInfo);
@@ -38752,6 +38941,26 @@ var require_importResolver = __commonJS({
         importFailureInfo.push(...this._cachedPythonSearchPaths.failureInfo);
         return this._cachedPythonSearchPaths.paths;
       }
+      getTypeshedStdlibExcludeList(customTypeshedPath, pythonVersion) {
+        const unused = [];
+        const typeshedStdlibPath = this._getStdlibTypeshedPath(customTypeshedPath, pythonVersion, unused);
+        const excludes = [];
+        if (!typeshedStdlibPath) {
+          return excludes;
+        }
+        if (!this._cachedTypeshedStdLibModuleVersions) {
+          this._cachedTypeshedStdLibModuleVersions = this._readTypeshedStdLibVersions(customTypeshedPath, []);
+        }
+        this._cachedTypeshedStdLibModuleVersions.forEach((versionRange, moduleName) => {
+          if (versionRange.max !== void 0 && pythonVersion > versionRange.max) {
+            const moduleDirPath = (0, pathUtils_1.combinePaths)(typeshedStdlibPath, ...moduleName.split("."));
+            excludes.push(moduleDirPath);
+            const moduleFilePath = moduleDirPath + ".pyi";
+            excludes.push(moduleFilePath);
+          }
+        });
+        return excludes;
+      }
       readdirEntriesCached(path12) {
         const cachedValue = this._cachedEntriesForPath.get(path12);
         if (cachedValue) {
@@ -39116,7 +39325,7 @@ var require_importResolver = __commonJS({
         let isLocalTypingsFile = false;
         const importFailureInfo = [];
         let moduleNameWithInvalidCharacters;
-        const stdLibTypeshedPath = this._getStdlibTypeshedPath(execEnv, importFailureInfo);
+        const stdLibTypeshedPath = this._getStdlibTypeshedPath(this._configOptions.typeshedPath, execEnv.pythonVersion, importFailureInfo);
         if (stdLibTypeshedPath) {
           moduleName = this.getModuleNameFromPath(stdLibTypeshedPath, filePath);
           if (moduleName) {
@@ -39125,7 +39334,7 @@ var require_importResolver = __commonJS({
               nameParts: moduleName.split("."),
               importedSymbols: void 0
             };
-            if (this._isStdlibTypeshedStubValidForVersion(moduleDescriptor, execEnv, [])) {
+            if (this._isStdlibTypeshedStubValidForVersion(moduleDescriptor, this._configOptions.typeshedPath, execEnv.pythonVersion, [])) {
               return { moduleName, importType, isLocalTypingsFile };
             }
           }
@@ -39170,7 +39379,7 @@ var require_importResolver = __commonJS({
             }
           }
         }
-        const thirdPartyTypeshedPath = this._getThirdPartyTypeshedPath(execEnv, importFailureInfo);
+        const thirdPartyTypeshedPath = this._getThirdPartyTypeshedPath(this._configOptions.typeshedPath, importFailureInfo);
         if (thirdPartyTypeshedPath) {
           const candidateModuleName = this.getModuleNameFromPath(
             thirdPartyTypeshedPath,
@@ -39513,7 +39722,7 @@ var require_importResolver = __commonJS({
         } else {
           importFailureInfo.push("No python interpreter search path");
         }
-        if (execEnv.root !== this._getTypeshedRoot(execEnv, importFailureInfo)) {
+        if (execEnv.root !== this._getTypeshedRoot(this._configOptions.typeshedPath, importFailureInfo)) {
           if ((bestResultSoFar === null || bestResultSoFar === void 0 ? void 0 : bestResultSoFar.pyTypedInfo) && !bestResultSoFar.isPartlyResolved) {
             return bestResultSoFar;
           }
@@ -39626,12 +39835,12 @@ var require_importResolver = __commonJS({
         importFailureInfo.push(`Looking for typeshed ${isStdLib ? PythonPathUtils.stdLibFolderName : PythonPathUtils.thirdPartyFolderName} path`);
         let typeshedPaths;
         if (isStdLib) {
-          const path12 = this._getStdlibTypeshedPath(execEnv, importFailureInfo, moduleDescriptor);
+          const path12 = this._getStdlibTypeshedPath(this._configOptions.typeshedPath, execEnv.pythonVersion, importFailureInfo, moduleDescriptor);
           if (path12) {
             typeshedPaths = [path12];
           }
         } else {
-          typeshedPaths = this._getThirdPartyTypeshedPackagePaths(moduleDescriptor, execEnv, importFailureInfo);
+          typeshedPaths = this._getThirdPartyTypeshedPackagePaths(moduleDescriptor, importFailureInfo);
         }
         if (typeshedPaths) {
           for (const typeshedPath of typeshedPaths) {
@@ -39712,14 +39921,13 @@ var require_importResolver = __commonJS({
         const importFailureInfo = [];
         let typeshedPaths;
         if (isStdLib) {
-          const path12 = this._getStdlibTypeshedPath(execEnv, importFailureInfo, moduleDescriptor);
+          const path12 = this._getStdlibTypeshedPath(this._configOptions.typeshedPath, execEnv.pythonVersion, importFailureInfo, moduleDescriptor);
           if (path12) {
             typeshedPaths = [path12];
           }
         } else {
           typeshedPaths = this._getThirdPartyTypeshedPackagePaths(
             moduleDescriptor,
-            execEnv,
             importFailureInfo,
             /* includeMatchOnly */
             false
@@ -39742,50 +39950,50 @@ var require_importResolver = __commonJS({
       // Returns the directory for a module within the stdlib typeshed directory.
       // If moduleDescriptor is provided, it is filtered based on the VERSIONS
       // file in the typeshed stubs.
-      _getStdlibTypeshedPath(execEnv, importFailureInfo, moduleDescriptor) {
+      _getStdlibTypeshedPath(customTypeshedPath, pythonVersion, importFailureInfo, moduleDescriptor) {
         const subdirectory = this._getTypeshedSubdirectory(
           /* isStdLib */
           true,
-          execEnv,
+          customTypeshedPath,
           importFailureInfo
         );
-        if (subdirectory && moduleDescriptor && !this._isStdlibTypeshedStubValidForVersion(moduleDescriptor, execEnv, importFailureInfo)) {
+        if (subdirectory && moduleDescriptor && !this._isStdlibTypeshedStubValidForVersion(moduleDescriptor, customTypeshedPath, pythonVersion, importFailureInfo)) {
           return void 0;
         }
         return subdirectory;
       }
-      _getThirdPartyTypeshedPath(execEnv, importFailureInfo) {
+      _getThirdPartyTypeshedPath(customTypeshedPath, importFailureInfo) {
         return this._getTypeshedSubdirectory(
           /* isStdLib */
           false,
-          execEnv,
+          customTypeshedPath,
           importFailureInfo
         );
       }
-      _isStdlibTypeshedStubValidForVersion(moduleDescriptor, execEnv, importFailureInfo) {
+      _isStdlibTypeshedStubValidForVersion(moduleDescriptor, customTypeshedPath, pythonVersion, importFailureInfo) {
         if (!this._cachedTypeshedStdLibModuleVersions) {
-          this._cachedTypeshedStdLibModuleVersions = this._readTypeshedStdLibVersions(execEnv, importFailureInfo);
+          this._cachedTypeshedStdLibModuleVersions = this._readTypeshedStdLibVersions(customTypeshedPath, importFailureInfo);
         }
         for (let namePartCount = 1; namePartCount <= moduleDescriptor.nameParts.length; namePartCount++) {
           const namePartsToConsider = moduleDescriptor.nameParts.slice(0, namePartCount);
           const versionRange = this._cachedTypeshedStdLibModuleVersions.get(namePartsToConsider.join("."));
           if (versionRange) {
-            if (execEnv.pythonVersion < versionRange.min) {
+            if (pythonVersion < versionRange.min) {
               return false;
             }
-            if (versionRange.max !== void 0 && execEnv.pythonVersion > versionRange.max) {
+            if (versionRange.max !== void 0 && pythonVersion > versionRange.max) {
               return false;
             }
           }
         }
         return true;
       }
-      _readTypeshedStdLibVersions(execEnv, importFailureInfo) {
+      _readTypeshedStdLibVersions(customTypeshedPath, importFailureInfo) {
         const versionRangeMap = /* @__PURE__ */ new Map();
         const typeshedStdLibPath = this._getTypeshedSubdirectory(
           /* isStdLib */
           true,
-          execEnv,
+          customTypeshedPath,
           importFailureInfo
         );
         if (typeshedStdLibPath) {
@@ -39831,8 +40039,8 @@ var require_importResolver = __commonJS({
         }
         return versionRangeMap;
       }
-      _getThirdPartyTypeshedPackagePaths(moduleDescriptor, execEnv, importFailureInfo, includeMatchOnly = true) {
-        const typeshedPath = this._getThirdPartyTypeshedPath(execEnv, importFailureInfo);
+      _getThirdPartyTypeshedPackagePaths(moduleDescriptor, importFailureInfo, includeMatchOnly = true) {
+        const typeshedPath = this._getThirdPartyTypeshedPath(this._configOptions.typeshedPath, importFailureInfo);
         if (!this._cachedTypeshedThirdPartyPackagePaths) {
           this._buildTypeshedThirdPartyPackageMap(typeshedPath);
         }
@@ -39845,22 +40053,21 @@ var require_importResolver = __commonJS({
         }
         return [];
       }
-      _getThirdPartyTypeshedPackageRoots(execEnv, importFailureInfo) {
-        const typeshedPath = this._getThirdPartyTypeshedPath(execEnv, importFailureInfo);
+      _getThirdPartyTypeshedPackageRoots(importFailureInfo) {
+        const typeshedPath = this._getThirdPartyTypeshedPath(this._configOptions.typeshedPath, importFailureInfo);
         if (!this._cachedTypeshedThirdPartyPackagePaths) {
           this._buildTypeshedThirdPartyPackageMap(typeshedPath);
         }
         return this._cachedTypeshedThirdPartyPackageRoots;
       }
-      _getTypeshedRoot(execEnv, importFailureInfo) {
+      _getTypeshedRoot(customTypeshedPath, importFailureInfo) {
         if (this._cachedTypeshedRoot !== void 0) {
           return this._cachedTypeshedRoot;
         }
         let typeshedPath = "";
-        if (this._configOptions.typeshedPath) {
-          const possibleTypeshedPath = this._configOptions.typeshedPath;
-          if (this.dirExistsCached(possibleTypeshedPath)) {
-            typeshedPath = possibleTypeshedPath;
+        if (customTypeshedPath) {
+          if (this.dirExistsCached(customTypeshedPath)) {
+            typeshedPath = customTypeshedPath;
           }
         } else {
           const pythonSearchPaths = this.getPythonSearchPaths(importFailureInfo);
@@ -39878,7 +40085,7 @@ var require_importResolver = __commonJS({
         this._cachedTypeshedRoot = typeshedPath;
         return typeshedPath;
       }
-      _getTypeshedSubdirectory(isStdLib, execEnv, importFailureInfo) {
+      _getTypeshedSubdirectory(isStdLib, customTypeshedPath, importFailureInfo) {
         if (isStdLib) {
           if (this._cachedTypeshedStdLibPath !== void 0) {
             return this._cachedTypeshedStdLibPath;
@@ -39888,7 +40095,7 @@ var require_importResolver = __commonJS({
             return this._cachedTypeshedThirdPartyPath;
           }
         }
-        let typeshedPath = this._getTypeshedRoot(execEnv, importFailureInfo);
+        let typeshedPath = this._getTypeshedRoot(customTypeshedPath, importFailureInfo);
         typeshedPath = PythonPathUtils.getTypeshedSubdirectory(typeshedPath, isStdLib);
         if (!this.dirExistsCached(typeshedPath)) {
           return void 0;
@@ -40378,6 +40585,7 @@ var require_typeEvaluatorTypes = __commonJS({
       EvaluatorFlags2[EvaluatorFlags2["DisallowTypeVarTuple"] = 64] = "DisallowTypeVarTuple";
       EvaluatorFlags2[EvaluatorFlags2["ExpectingType"] = 128] = "ExpectingType";
       EvaluatorFlags2[EvaluatorFlags2["ExpectingTypeAnnotation"] = 256] = "ExpectingTypeAnnotation";
+      EvaluatorFlags2[EvaluatorFlags2["AllowMissingTypeArgs"] = 512] = "AllowMissingTypeArgs";
       EvaluatorFlags2[EvaluatorFlags2["AllowGenericClassType"] = 1024] = "AllowGenericClassType";
       EvaluatorFlags2[EvaluatorFlags2["DisallowTypeVarsWithScopeId"] = 2048] = "DisallowTypeVarsWithScopeId";
       EvaluatorFlags2[EvaluatorFlags2["DisallowTypeVarsWithoutScopeId"] = 4096] = "DisallowTypeVarsWithoutScopeId";
@@ -40672,13 +40880,15 @@ var require_constraintSolver = __commonJS({
         return false;
       }
       if ((flags & 1024) !== 0) {
-        if ((flags & 1) !== 0) {
-          newNarrowTypeBound = adjSrcType;
-          newWideTypeBound = adjSrcType;
-        } else if (isContravariant) {
-          newNarrowTypeBound = adjSrcType;
-        } else {
-          newWideTypeBound = adjSrcType;
+        if (!curEntry) {
+          if ((flags & 1) !== 0) {
+            newNarrowTypeBound = adjSrcType;
+            newWideTypeBound = adjSrcType;
+          } else if (isContravariant) {
+            newNarrowTypeBound = adjSrcType;
+          } else {
+            newWideTypeBound = adjSrcType;
+          }
         }
       } else if (isContravariant) {
         if (!curWideTypeBound) {
@@ -40695,7 +40905,9 @@ var require_constraintSolver = __commonJS({
             flags & 512,
             recursionCount
           )) {
-            newWideTypeBound = adjSrcType;
+            if (!(0, types_1.isAny)(curWideTypeBound)) {
+              newWideTypeBound = adjSrcType;
+            }
           } else if (!evaluator.assignType(
             adjSrcType,
             curWideTypeBound,
@@ -40748,7 +40960,8 @@ var require_constraintSolver = __commonJS({
             curNarrowTypeBound,
             adjSrcType,
             diagAddendum,
-            new typeVarContext_1.TypeVarContext(destType.scopeId),
+            /* destTypeVarContext */
+            void 0,
             /* srcTypeVarContext */
             void 0,
             flags,
@@ -40759,7 +40972,8 @@ var require_constraintSolver = __commonJS({
               curNarrowTypeBound,
               /* diag */
               void 0,
-              new typeVarContext_1.TypeVarContext(destType.scopeId),
+              /* destTypeVarContext */
+              void 0,
               /* srcTypeVarContext */
               void 0,
               flags & 512,
@@ -40782,7 +40996,8 @@ var require_constraintSolver = __commonJS({
               curNarrowTypeBound,
               /* diag */
               void 0,
-              new typeVarContext_1.TypeVarContext(destType.scopeId),
+              /* destTypeVarContext */
+              void 0,
               /* srcTypeVarContext */
               void 0,
               flags & 512,
@@ -40970,7 +41185,7 @@ var require_constraintSolver = __commonJS({
       });
       return isAssignable;
     }
-    function populateTypeVarContextBasedOnExpectedType(evaluator, type, expectedType, typeVarContext, liveTypeVarScopes) {
+    function populateTypeVarContextBasedOnExpectedType(evaluator, type, expectedType, typeVarContext, liveTypeVarScopes, usageOffset = void 0) {
       if ((0, types_1.isAny)(expectedType)) {
         type.details.typeParameters.forEach((typeParam) => {
           typeVarContext.setTypeVarType(typeParam, expectedType);
@@ -41003,7 +41218,7 @@ var require_constraintSolver = __commonJS({
         sameClassTypeVarContext.getPrimarySignature().getTypeVars().forEach((entry) => {
           let typeArgValue = sameClassTypeVarContext.getPrimarySignature().getTypeVarType(entry.typeVar);
           if (typeArgValue && liveTypeVarScopes) {
-            typeArgValue = (0, typeUtils_1.transformExpectedType)(typeArgValue, liveTypeVarScopes);
+            typeArgValue = (0, typeUtils_1.transformExpectedType)(typeArgValue, liveTypeVarScopes, usageOffset);
           }
           if (typeArgValue) {
             const variance = types_1.TypeVarType.getVariance(entry.typeVar);
@@ -41014,6 +41229,15 @@ var require_constraintSolver = __commonJS({
               void 0,
               variance === 4 ? void 0 : typeArgValue
             );
+            if (entry.tupleTypes) {
+              typeVarContext.setTupleTypeVar(entry.typeVar, entry.tupleTypes.map((tupleEntry) => {
+                let tupleType = tupleEntry.type;
+                if (liveTypeVarScopes) {
+                  tupleType = (0, typeUtils_1.transformExpectedType)(tupleEntry.type, liveTypeVarScopes, usageOffset);
+                }
+                return { type: tupleType, isUnbounded: tupleEntry.isUnbounded };
+              }));
+            }
           }
         });
         return true;
@@ -41065,7 +41289,7 @@ var require_constraintSolver = __commonJS({
             if (index < expectedTypeArgs.length) {
               let typeArgValue = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(expectedTypeArgs[index]);
               if (liveTypeVarScopes) {
-                typeArgValue = (0, typeUtils_1.transformExpectedType)(typeArgValue, liveTypeVarScopes);
+                typeArgValue = (0, typeUtils_1.transformExpectedType)(typeArgValue, liveTypeVarScopes, usageOffset);
               }
               if (typeArgValue) {
                 const variance = types_1.TypeVarType.getVariance(typeVar);
@@ -42927,7 +43151,8 @@ var require_typeGuards = __commonJS({
                       varType,
                       typeVarContext,
                       /* liveTypeVarScopes */
-                      void 0
+                      void 0,
+                      errorNode.start
                     )) {
                       specializedFilterType = (0, typeUtils_1.applySolvedTypeVars)(unspecializedFilterType, typeVarContext, { unknownIfNotFound: true });
                     }
@@ -43319,7 +43544,7 @@ var require_typeGuards = __commonJS({
         }
         if (memberInfo && memberInfo.isTypeDeclared) {
           let memberType = evaluator.getTypeOfMember(memberInfo);
-          if ((0, types_1.isClassInstance)(subtype) && (0, typeUtils_1.isProperty)(memberType)) {
+          if ((0, types_1.isClassInstance)(subtype) && (0, types_1.isClassInstance)(memberType) && (0, typeUtils_1.isProperty)(memberType)) {
             const getterInfo = (0, typeUtils_1.lookUpObjectMember)(memberType, "fget");
             if (getterInfo && getterInfo.isTypeDeclared) {
               const getterType = evaluator.getTypeOfMember(getterInfo);
@@ -44028,6 +44253,8 @@ var require_patternMatching = __commonJS({
                           subjectSubtypeExpanded,
                           typeVarContext,
                           /* liveTypeVarScopes */
+                          void 0,
+                          /* usageOffset */
                           void 0
                         )) {
                           resultType = (0, typeUtils_1.applySolvedTypeVars)(matchTypeInstance, typeVarContext, {
@@ -46570,12 +46797,10 @@ var require_constructors = __commonJS({
         }
         newMethodReturnType = newCallResult.returnType;
       }
-      if (!newMethodReturnType) {
+      if (!newMethodReturnType || isDefaultNewMethod(newMethodTypeResult === null || newMethodTypeResult === void 0 ? void 0 : newMethodTypeResult.type)) {
         newMethodReturnType = types_1.ClassType.cloneAsInstance(type);
-      } else if (!(0, types_1.isNever)(newMethodReturnType)) {
-        if (!(0, types_1.isClassInstance)(newMethodReturnType)) {
-          newMethodReturnType = types_1.ClassType.cloneAsInstance(type);
-        }
+      } else if (!(0, types_1.isNever)(newMethodReturnType) && !(0, types_1.isClassInstance)(newMethodReturnType)) {
+        newMethodReturnType = (0, typeUtils_1.applySolvedTypeVars)(types_1.ClassType.cloneAsInstance(type), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(type)), { unknownIfNotFound: true });
       }
       let initMethodTypeResult;
       if (!argumentErrors && !(0, types_1.isNever)(newMethodReturnType) && !shouldSkipInitEvaluation(evaluator, type, newMethodReturnType)) {
@@ -46585,7 +46810,7 @@ var require_constructors = __commonJS({
         }
         initMethodTypeResult = evaluator.getTypeOfObjectMember(
           errorNode,
-          types_1.ClassType.cloneAsInstance(initMethodBindToType),
+          initMethodBindToType,
           "__init__",
           { method: "get" },
           /* diag */
@@ -46689,7 +46914,7 @@ var require_constructors = __commonJS({
           expectedSubType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(expectedSubType);
           const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(type));
           typeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeId)(initMethodType));
-          if ((0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluator, types_1.ClassType.cloneAsInstance(type), expectedSubType, typeVarContext, (0, parseTreeUtils_1.getTypeVarScopesForNode)(errorNode))) {
+          if ((0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluator, types_1.ClassType.cloneAsInstance(type), expectedSubType, typeVarContext, (0, parseTreeUtils_1.getTypeVarScopesForNode)(errorNode), errorNode.start)) {
             const specializedConstructor = (0, typeUtils_1.applySolvedTypeVars)(initMethodType, typeVarContext);
             let callResult;
             callResult = evaluator.useSpeculativeMode(errorNode, () => {
@@ -46714,11 +46939,7 @@ var require_constructors = __commonJS({
         }
       }
       if (!returnType) {
-        const typeVarContext = type.typeArguments ? (0, typeUtils_1.buildTypeVarContextFromSpecializedClass)(
-          type,
-          /* makeConcrete */
-          false
-        ) : new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(type));
+        const typeVarContext = type.typeArguments ? (0, typeUtils_1.buildTypeVarContextFromSpecializedClass)(type) : new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(type));
         typeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeId)(initMethodType));
         const callResult = evaluator.validateCallArguments(errorNode, argList, { type: initMethodType }, typeVarContext, skipUnknownArgCheck);
         let adjustedClassType = type;
@@ -46745,7 +46966,10 @@ var require_constructors = __commonJS({
     }
     function validateFallbackConstructorCall(evaluator, errorNode, argList, type, inferenceContext) {
       let reportedErrors = false;
-      if (argList.length > 0) {
+      if (argList.length > 0 && argList.some(
+        (arg) => arg.argumentCategory === 0
+        /* Simple */
+      )) {
         const fileInfo = (0, analyzerNodeInfo_1.getFileInfo)(errorNode);
         evaluator.addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.constructorNoArgs().format({ type: type.aliasName || type.details.name }), errorNode);
         reportedErrors = true;
@@ -46759,7 +46983,7 @@ var require_constructors = __commonJS({
       }
       const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(type));
       if (inferenceContext) {
-        (0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluator, types_1.ClassType.cloneAsInstance(type), inferenceContext.expectedType, typeVarContext, (0, parseTreeUtils_1.getTypeVarScopesForNode)(errorNode));
+        (0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluator, types_1.ClassType.cloneAsInstance(type), inferenceContext.expectedType, typeVarContext, (0, parseTreeUtils_1.getTypeVarScopesForNode)(errorNode), errorNode.start);
       }
       return {
         argumentErrors: reportedErrors,
@@ -46968,6 +47192,27 @@ var require_constructors = __commonJS({
       });
       return skipInitCheck;
     }
+    function isDefaultNewMethod(newMethod) {
+      var _a;
+      if (!newMethod || !(0, types_1.isFunction)(newMethod)) {
+        return false;
+      }
+      if (newMethod.details.paramSpec) {
+        return false;
+      }
+      const params = newMethod.details.parameters;
+      if (params.length !== 2) {
+        return false;
+      }
+      if (params[0].category !== 1 || params[1].category !== 2) {
+        return false;
+      }
+      const returnType = (_a = newMethod.details.declaredReturnType) !== null && _a !== void 0 ? _a : newMethod.inferredReturnType;
+      if (!returnType || !(0, types_1.isTypeVar)(returnType) || !returnType.details.isSynthesizedSelf) {
+        return false;
+      }
+      return true;
+    }
   }
 });
 
@@ -47855,11 +48100,7 @@ var require_dataClasses = __commonJS({
       let allAncestorsAreKnown = true;
       types_1.ClassType.getReverseMro(classType).forEach((mroClass) => {
         if ((0, types_1.isInstantiableClass)(mroClass)) {
-          const typeVarContext = (0, typeUtils_1.buildTypeVarContextFromSpecializedClass)(
-            mroClass,
-            /* makeConcrete */
-            false
-          );
+          const typeVarContext = (0, typeUtils_1.buildTypeVarContextFromSpecializedClass)(mroClass);
           const dataClassEntries = types_1.ClassType.getDataClassEntries(mroClass);
           dataClassEntries.forEach((entry) => {
             const existingIndex = entries.findIndex((e) => e.name === entry.name);
@@ -48887,6 +49128,18 @@ var require_operations = __commonJS({
           if (!evaluator.validateTypeArg({ ...leftTypeResult, node: leftExpression }, { allowVariadicTypeVar: true, allowUnpackedTuples: true }) || !evaluator.validateTypeArg({ ...rightTypeResult, node: rightExpression }, { allowVariadicTypeVar: true, allowUnpackedTuples: true })) {
             return { type: types_1.UnknownType.create() };
           }
+          adjustedLeftType = evaluator.reportMissingTypeArguments(
+            node.leftExpression,
+            adjustedLeftType,
+            flags | 128
+            /* ExpectingType */
+          );
+          adjustedRightType = evaluator.reportMissingTypeArguments(
+            node.rightExpression,
+            adjustedRightType,
+            flags | 128
+            /* ExpectingType */
+          );
           const newUnion = (0, types_1.combineTypes)([adjustedLeftType, adjustedRightType]);
           if ((0, types_1.isUnion)(newUnion)) {
             types_1.TypeBase.setSpecialForm(newUnion);
@@ -49726,13 +49979,7 @@ var require_protocols = __commonJS({
       if ((flags & 1) !== 0) {
         return (0, types_1.isTypeSame)(destType, srcType);
       }
-      const genericDestType = types_1.ClassType.cloneForSpecialization(
-        destType,
-        void 0,
-        /* isTypeArgumentExplicit */
-        false
-      );
-      const genericDestTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(destType));
+      const protocolTypeVarContext = createProtocolTypeVarContext(evaluator, destType, destTypeVarContext);
       const selfTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(destType));
       const noLiteralSrcType = evaluator.stripLiteralValue(srcType);
       (0, typeUtils_1.populateTypeVarContextForSelfType)(selfTypeVarContext, destType, noLiteralSrcType);
@@ -49763,282 +50010,286 @@ var require_protocols = __commonJS({
           if (!typesAreConsistent && !diag) {
             return;
           }
-          if (symbol.isClassMember() && !symbol.isIgnoredForProtocolMatch() && !checkedSymbolSet.has(name)) {
-            let isMemberFromMetaclass = false;
-            let srcMemberInfo;
-            if (!treatSourceAsInstantiable && name === "__class_getitem__") {
-              return;
+          if (!symbol.isClassMember() || symbol.isIgnoredForProtocolMatch() || checkedSymbolSet.has(name)) {
+            return;
+          }
+          let isMemberFromMetaclass = false;
+          let srcMemberInfo;
+          if (!treatSourceAsInstantiable && name === "__class_getitem__") {
+            return;
+          }
+          if (name === "__slots__") {
+            return;
+          }
+          checkedSymbolSet.add(name);
+          if (treatSourceAsInstantiable && srcType.details.effectiveMetaclass && (0, types_1.isInstantiableClass)(srcType.details.effectiveMetaclass)) {
+            srcMemberInfo = (0, typeUtils_1.lookUpClassMember)(srcType.details.effectiveMetaclass, name);
+            if (srcMemberInfo) {
+              srcClassTypeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeId)(srcType.details.effectiveMetaclass));
+              isMemberFromMetaclass = true;
             }
-            if (name === "__slots__") {
-              return;
+          }
+          if (!srcMemberInfo) {
+            srcMemberInfo = (0, typeUtils_1.lookUpClassMember)(srcType, name);
+          }
+          if (!srcMemberInfo) {
+            diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.protocolMemberMissing().format({ name }));
+            typesAreConsistent = false;
+            return;
+          }
+          if (symbol.isClassVar() && !srcMemberInfo.symbol.isClassVar() && !srcMemberInfo.symbol.isClassMember()) {
+            diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.protocolMemberClassVar().format({ name }));
+            typesAreConsistent = false;
+          }
+          let destMemberType = (_a = evaluator.getDeclaredTypeOfSymbol(symbol)) === null || _a === void 0 ? void 0 : _a.type;
+          if (!destMemberType) {
+            return;
+          }
+          if (!types_1.ClassType.isSameGenericClass(mroClass, destType)) {
+            destMemberType = (0, typeUtils_1.partiallySpecializeType)(destMemberType, mroClass, srcType);
+          }
+          let srcMemberType;
+          if ((0, types_1.isInstantiableClass)(srcMemberInfo.classType)) {
+            const symbolType = evaluator.getEffectiveTypeOfSymbol(srcMemberInfo.symbol);
+            if ((0, types_1.isFunction)(symbolType)) {
+              evaluator.inferReturnTypeIfNecessary(symbolType);
             }
-            checkedSymbolSet.add(name);
-            if (treatSourceAsInstantiable && srcType.details.effectiveMetaclass && (0, types_1.isInstantiableClass)(srcType.details.effectiveMetaclass)) {
-              srcMemberInfo = (0, typeUtils_1.lookUpClassMember)(srcType.details.effectiveMetaclass, name);
-              if (srcMemberInfo) {
-                srcClassTypeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeId)(srcType.details.effectiveMetaclass));
-                isMemberFromMetaclass = true;
+            srcMemberType = (0, typeUtils_1.partiallySpecializeType)(symbolType, srcMemberInfo.classType, noLiteralSrcType);
+          } else {
+            srcMemberType = types_1.UnknownType.create();
+          }
+          if ((0, types_1.isFunction)(srcMemberType) || (0, types_1.isOverloadedFunction)(srcMemberType)) {
+            if (isMemberFromMetaclass) {
+              const boundSrcFunction = evaluator.bindFunctionToClassOrObject(
+                types_1.ClassType.cloneAsInstance(srcType),
+                srcMemberType,
+                /* memberClass */
+                void 0,
+                /* errorNode */
+                void 0,
+                recursionCount,
+                /* treatConstructorAsClassMember */
+                false,
+                srcType
+              );
+              if (boundSrcFunction) {
+                srcMemberType = (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundSrcFunction);
+              }
+              if ((0, types_1.isFunction)(destMemberType) || (0, types_1.isOverloadedFunction)(destMemberType)) {
+                const boundDeclaredType = evaluator.bindFunctionToClassOrObject(
+                  types_1.ClassType.cloneAsInstance(srcType),
+                  destMemberType,
+                  /* memberClass */
+                  void 0,
+                  /* errorNode */
+                  void 0,
+                  recursionCount,
+                  /* treatConstructorAsClassMember */
+                  false,
+                  srcType
+                );
+                if (boundDeclaredType) {
+                  destMemberType = (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundDeclaredType);
+                }
+              }
+            } else if ((0, types_1.isInstantiableClass)(srcMemberInfo.classType)) {
+              destMemberType = (0, typeUtils_1.applySolvedTypeVars)(destMemberType, selfTypeVarContext);
+              const boundSrcFunction = evaluator.bindFunctionToClassOrObject(
+                treatSourceAsInstantiable ? srcType : types_1.ClassType.cloneAsInstance(srcType),
+                srcMemberType,
+                srcMemberInfo.classType,
+                /* errorNode */
+                void 0,
+                recursionCount
+              );
+              if (boundSrcFunction) {
+                srcMemberType = (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundSrcFunction);
+              }
+              if ((0, types_1.isFunction)(destMemberType) || (0, types_1.isOverloadedFunction)(destMemberType)) {
+                const boundDeclaredType = evaluator.bindFunctionToClassOrObject(
+                  types_1.ClassType.cloneAsInstance(srcType),
+                  destMemberType,
+                  srcMemberInfo.classType,
+                  /* errorNode */
+                  void 0,
+                  recursionCount
+                );
+                if (boundDeclaredType) {
+                  destMemberType = (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundDeclaredType);
+                }
               }
             }
-            if (!srcMemberInfo) {
-              srcMemberInfo = (0, typeUtils_1.lookUpClassMember)(srcType, name);
-            }
-            if (!srcMemberInfo) {
-              diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.protocolMemberMissing().format({ name }));
-              typesAreConsistent = false;
+          } else {
+            destMemberType = (0, typeUtils_1.applySolvedTypeVars)(destMemberType, selfTypeVarContext);
+          }
+          const subDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
+          if ((0, types_1.isClassInstance)(destMemberType) && types_1.ClassType.isPropertyClass(destMemberType)) {
+            if ((0, types_1.isClassInstance)(srcMemberType) && types_1.ClassType.isPropertyClass(srcMemberType) && !treatSourceAsInstantiable) {
+              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 (subDiag) {
+                  subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberTypeMismatch().format({ name }));
+                }
+                typesAreConsistent = false;
+              }
             } else {
-              let destMemberType = (_a = evaluator.getDeclaredTypeOfSymbol(symbol)) === null || _a === void 0 ? void 0 : _a.type;
-              if (destMemberType) {
-                if (!types_1.ClassType.isSameGenericClass(mroClass, destType)) {
-                  destMemberType = (0, typeUtils_1.partiallySpecializeType)(destMemberType, mroClass, srcType);
-                }
-                let srcMemberType;
-                if ((0, types_1.isInstantiableClass)(srcMemberInfo.classType)) {
-                  const symbolType = evaluator.getEffectiveTypeOfSymbol(srcMemberInfo.symbol);
-                  if ((0, types_1.isFunction)(symbolType)) {
-                    evaluator.inferReturnTypeIfNecessary(symbolType);
-                  }
-                  srcMemberType = (0, typeUtils_1.partiallySpecializeType)(symbolType, srcMemberInfo.classType, noLiteralSrcType);
-                } else {
-                  srcMemberType = types_1.UnknownType.create();
-                }
-                if ((0, types_1.isFunction)(srcMemberType) || (0, types_1.isOverloadedFunction)(srcMemberType)) {
-                  if (isMemberFromMetaclass) {
-                    const boundSrcFunction = evaluator.bindFunctionToClassOrObject(
-                      types_1.ClassType.cloneAsInstance(srcType),
-                      srcMemberType,
-                      /* memberClass */
-                      void 0,
-                      /* errorNode */
-                      void 0,
-                      recursionCount,
-                      /* treatConstructorAsClassMember */
-                      false,
-                      srcType
-                    );
-                    if (boundSrcFunction) {
-                      srcMemberType = (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundSrcFunction);
-                    }
-                    if ((0, types_1.isFunction)(destMemberType) || (0, types_1.isOverloadedFunction)(destMemberType)) {
-                      const boundDeclaredType = evaluator.bindFunctionToClassOrObject(
-                        types_1.ClassType.cloneAsInstance(srcType),
-                        destMemberType,
-                        /* memberClass */
-                        void 0,
-                        /* errorNode */
-                        void 0,
-                        recursionCount,
-                        /* treatConstructorAsClassMember */
-                        false,
-                        srcType
-                      );
-                      if (boundDeclaredType) {
-                        destMemberType = (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundDeclaredType);
-                      }
-                    }
-                  } else if ((0, types_1.isInstantiableClass)(srcMemberInfo.classType)) {
-                    destMemberType = (0, typeUtils_1.applySolvedTypeVars)(destMemberType, selfTypeVarContext);
-                    const boundSrcFunction = evaluator.bindFunctionToClassOrObject(
-                      treatSourceAsInstantiable ? srcType : types_1.ClassType.cloneAsInstance(srcType),
-                      srcMemberType,
-                      srcMemberInfo.classType,
-                      /* errorNode */
-                      void 0,
-                      recursionCount
-                    );
-                    if (boundSrcFunction) {
-                      srcMemberType = (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundSrcFunction);
-                    }
-                    if ((0, types_1.isFunction)(destMemberType) || (0, types_1.isOverloadedFunction)(destMemberType)) {
-                      const boundDeclaredType = evaluator.bindFunctionToClassOrObject(
-                        types_1.ClassType.cloneAsInstance(srcType),
-                        destMemberType,
-                        srcMemberInfo.classType,
-                        /* errorNode */
-                        void 0,
-                        recursionCount
-                      );
-                      if (boundDeclaredType) {
-                        destMemberType = (0, typeUtils_1.removeParamSpecVariadicsFromSignature)(boundDeclaredType);
-                      }
-                    }
-                  }
-                } else {
-                  destMemberType = (0, typeUtils_1.applySolvedTypeVars)(destMemberType, selfTypeVarContext);
-                }
-                const subDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
-                if ((0, types_1.isClassInstance)(destMemberType) && types_1.ClassType.isPropertyClass(destMemberType)) {
-                  if ((0, types_1.isClassInstance)(srcMemberType) && types_1.ClassType.isPropertyClass(srcMemberType) && !treatSourceAsInstantiable) {
-                    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(), genericDestTypeVarContext, selfTypeVarContext, recursionCount)) {
-                      if (subDiag) {
-                        subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberTypeMismatch().format({ name }));
-                      }
-                      typesAreConsistent = false;
-                    }
-                  } else {
-                    const getterType = evaluator.getGetterTypeFromProperty(
-                      destMemberType,
-                      /* inferTypeIfNeeded */
-                      true
-                    );
-                    if (!getterType || !evaluator.assignType(
-                      getterType,
-                      srcMemberType,
-                      subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(),
-                      genericDestTypeVarContext,
-                      /* srcTypeVarContext */
-                      void 0,
-                      assignTypeFlags,
-                      recursionCount
-                    )) {
-                      if (subDiag) {
-                        subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberTypeMismatch().format({ name }));
-                      }
-                      typesAreConsistent = false;
-                    }
-                  }
-                } else {
-                  const primaryDecl = symbol.getDeclarations()[0];
-                  const isInvariant = (primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.type) === 1 && !primaryDecl.isFinal;
-                  if (!evaluator.assignType(
-                    destMemberType,
-                    srcMemberType,
-                    subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(),
-                    genericDestTypeVarContext,
-                    /* srcTypeVarContext */
-                    void 0,
-                    isInvariant ? assignTypeFlags | 1 : assignTypeFlags,
-                    recursionCount
-                  )) {
-                    if (subDiag) {
-                      if (isInvariant) {
-                        subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberIsInvariant().format({ name }));
-                      }
-                      subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberTypeMismatch().format({ name }));
-                    }
-                    typesAreConsistent = false;
-                  }
+              const getterType = evaluator.getGetterTypeFromProperty(
+                destMemberType,
+                /* inferTypeIfNeeded */
+                true
+              );
+              if (!getterType || !evaluator.assignType(
+                getterType,
+                srcMemberType,
+                subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(),
+                protocolTypeVarContext,
+                /* srcTypeVarContext */
+                void 0,
+                assignTypeFlags,
+                recursionCount
+              )) {
+                if (subDiag) {
+                  subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberTypeMismatch().format({ name }));
                 }
-                const isDestFinal = symbol.getTypedDeclarations().some((decl) => decl.type === 1 && !!decl.isFinal);
-                const isSrcFinal = srcMemberInfo.symbol.getTypedDeclarations().some((decl) => decl.type === 1 && !!decl.isFinal);
-                if (isDestFinal !== isSrcFinal) {
-                  if (isDestFinal) {
-                    if (subDiag) {
-                      subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberIsFinalInProtocol().format({ name }));
-                    }
-                  } else {
-                    if (subDiag) {
-                      subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberIsNotFinalInProtocol().format({ name }));
-                    }
-                  }
-                  typesAreConsistent = false;
+                typesAreConsistent = false;
+              }
+            }
+          } else {
+            const primaryDecl = symbol.getDeclarations()[0];
+            const isInvariant = (primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.type) === 1 && !primaryDecl.isFinal;
+            if (!evaluator.assignType(
+              destMemberType,
+              srcMemberType,
+              subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(),
+              protocolTypeVarContext,
+              /* srcTypeVarContext */
+              void 0,
+              isInvariant ? assignTypeFlags | 1 : assignTypeFlags,
+              recursionCount
+            )) {
+              if (subDiag) {
+                if (isInvariant) {
+                  subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberIsInvariant().format({ name }));
                 }
+                subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberTypeMismatch().format({ name }));
               }
-              if (symbol.isClassVar() && !srcMemberInfo.symbol.isClassVar() && !srcMemberInfo.symbol.isClassMember()) {
-                diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.protocolMemberClassVar().format({ name }));
-                typesAreConsistent = false;
+              typesAreConsistent = false;
+            }
+          }
+          const isDestFinal = symbol.getTypedDeclarations().some((decl) => decl.type === 1 && !!decl.isFinal);
+          const isSrcFinal = srcMemberInfo.symbol.getTypedDeclarations().some((decl) => decl.type === 1 && !!decl.isFinal);
+          if (isDestFinal !== isSrcFinal) {
+            if (isDestFinal) {
+              if (subDiag) {
+                subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberIsFinalInProtocol().format({ name }));
+              }
+            } else {
+              if (subDiag) {
+                subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberIsNotFinalInProtocol().format({ name }));
               }
             }
+            typesAreConsistent = false;
           }
         });
       });
       if (typesAreConsistent && destType.details.typeParameters.length > 0) {
-        const specializedDestProtocol = (0, typeUtils_1.applySolvedTypeVars)(genericDestType, genericDestTypeVarContext);
+        const genericProtocolType = types_1.ClassType.cloneForSpecialization(
+          destType,
+          void 0,
+          /* isTypeArgumentExplicit */
+          false
+        );
+        const specializedProtocolType = (0, typeUtils_1.applySolvedTypeVars)(genericProtocolType, protocolTypeVarContext);
         if (destType.typeArguments) {
-          if (!evaluator.verifyTypeArgumentsAssignable(destType, specializedDestProtocol, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
+          if (!evaluator.verifyTypeArgumentsAssignable(destType, specializedProtocolType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
             typesAreConsistent = false;
           }
-        } else if (destTypeVarContext && destType.details.typeParameters.length > 0 && specializedDestProtocol.typeArguments && !destTypeVarContext.isLocked()) {
-          const srcTypeArgs = specializedDestProtocol.typeArguments;
-          for (let i = 0; i < destType.details.typeParameters.length; i++) {
-            const typeArgType = i < srcTypeArgs.length ? srcTypeArgs[i] : types_1.UnknownType.create();
-            destTypeVarContext.setTypeVarType(
-              destType.details.typeParameters[i],
-              /* narrowBound */
-              void 0,
-              /* narrowBoundNoLiterals */
-              void 0,
-              typeArgType
-            );
+        } else if (destTypeVarContext && !destTypeVarContext.isLocked()) {
+          for (const typeParam of destType.details.typeParameters) {
+            const typeArgEntry = protocolTypeVarContext.getPrimarySignature().getTypeVar(typeParam);
+            if (typeArgEntry) {
+              destTypeVarContext.setTypeVarType(typeParam, typeArgEntry === null || typeArgEntry === void 0 ? void 0 : typeArgEntry.narrowBound, typeArgEntry === null || typeArgEntry === void 0 ? void 0 : typeArgEntry.narrowBoundNoLiterals, typeArgEntry === null || typeArgEntry === void 0 ? void 0 : typeArgEntry.wideBound);
+            }
           }
         }
       }
       return typesAreConsistent;
     }
-    function assignModuleToProtocol(evaluator, destType, srcType, diag, typeVarContext, flags, recursionCount) {
+    function assignModuleToProtocol(evaluator, destType, srcType, diag, destTypeVarContext, flags, recursionCount) {
       if (recursionCount > types_1.maxTypeRecursionCount) {
         return true;
       }
       recursionCount++;
       let typesAreConsistent = true;
       const checkedSymbolSet = /* @__PURE__ */ new Set();
-      const genericDestType = types_1.ClassType.cloneForSpecialization(
-        destType,
-        void 0,
-        /* isTypeArgumentExplicit */
-        false
-      );
-      const genericDestTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(destType));
+      const protocolTypeVarContext = createProtocolTypeVarContext(evaluator, destType, destTypeVarContext);
       destType.details.mro.forEach((mroClass) => {
         if (!(0, types_1.isInstantiableClass)(mroClass) || !types_1.ClassType.isProtocolClass(mroClass)) {
           return;
         }
         mroClass.details.fields.forEach((symbol, name) => {
           var _a;
-          if (symbol.isClassMember() && !symbol.isIgnoredForProtocolMatch() && !checkedSymbolSet.has(name)) {
-            checkedSymbolSet.add(name);
-            const memberSymbol = srcType.fields.get(name);
-            if (!memberSymbol) {
-              diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.protocolMemberMissing().format({ name }));
-              typesAreConsistent = false;
-            } else {
-              let destMemberType = (_a = evaluator.getDeclaredTypeOfSymbol(symbol)) === null || _a === void 0 ? void 0 : _a.type;
-              if (destMemberType) {
-                destMemberType = (0, typeUtils_1.partiallySpecializeType)(destMemberType, destType);
-                const srcMemberType = evaluator.getEffectiveTypeOfSymbol(memberSymbol);
-                if ((0, types_1.isFunction)(srcMemberType) || (0, types_1.isOverloadedFunction)(srcMemberType)) {
-                  if ((0, types_1.isFunction)(destMemberType) || (0, types_1.isOverloadedFunction)(destMemberType)) {
-                    const boundDeclaredType = evaluator.bindFunctionToClassOrObject(
-                      types_1.ClassType.cloneAsInstance(destType),
-                      destMemberType,
-                      destType,
-                      /* errorNode */
-                      void 0,
-                      recursionCount
-                    );
-                    if (boundDeclaredType) {
-                      destMemberType = boundDeclaredType;
-                    }
-                  }
-                }
-                const subDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
-                if (!evaluator.assignType(
-                  destMemberType,
-                  srcMemberType,
-                  subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(),
-                  genericDestTypeVarContext,
-                  /* srcTypeVarContext */
-                  void 0,
-                  0,
-                  recursionCount
-                )) {
-                  if (subDiag) {
-                    subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberTypeMismatch().format({ name }));
-                  }
-                  typesAreConsistent = false;
-                }
+          if (!symbol.isClassMember() || symbol.isIgnoredForProtocolMatch() || checkedSymbolSet.has(name)) {
+            return;
+          }
+          checkedSymbolSet.add(name);
+          const memberSymbol = srcType.fields.get(name);
+          if (!memberSymbol) {
+            diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.protocolMemberMissing().format({ name }));
+            typesAreConsistent = false;
+            return;
+          }
+          let destMemberType = (_a = evaluator.getDeclaredTypeOfSymbol(symbol)) === null || _a === void 0 ? void 0 : _a.type;
+          if (!destMemberType) {
+            return;
+          }
+          destMemberType = (0, typeUtils_1.partiallySpecializeType)(destMemberType, destType);
+          const srcMemberType = evaluator.getEffectiveTypeOfSymbol(memberSymbol);
+          if ((0, types_1.isFunction)(srcMemberType) || (0, types_1.isOverloadedFunction)(srcMemberType)) {
+            if ((0, types_1.isFunction)(destMemberType) || (0, types_1.isOverloadedFunction)(destMemberType)) {
+              const boundDeclaredType = evaluator.bindFunctionToClassOrObject(
+                types_1.ClassType.cloneAsInstance(destType),
+                destMemberType,
+                destType,
+                /* errorNode */
+                void 0,
+                recursionCount
+              );
+              if (boundDeclaredType) {
+                destMemberType = boundDeclaredType;
               }
             }
           }
+          const subDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
+          if (!evaluator.assignType(
+            destMemberType,
+            srcMemberType,
+            subDiag === null || subDiag === void 0 ? void 0 : subDiag.createAddendum(),
+            protocolTypeVarContext,
+            /* srcTypeVarContext */
+            void 0,
+            0,
+            recursionCount
+          )) {
+            if (subDiag) {
+              subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberTypeMismatch().format({ name }));
+            }
+            typesAreConsistent = false;
+          }
         });
       });
       if (typesAreConsistent && destType.details.typeParameters.length > 0 && destType.typeArguments) {
-        const specializedSrcProtocol = (0, typeUtils_1.applySolvedTypeVars)(genericDestType, genericDestTypeVarContext);
+        const genericProtocolType = types_1.ClassType.cloneForSpecialization(
+          destType,
+          void 0,
+          /* isTypeArgumentExplicit */
+          false
+        );
+        const specializedProtocolType = (0, typeUtils_1.applySolvedTypeVars)(genericProtocolType, protocolTypeVarContext);
         if (!evaluator.verifyTypeArgumentsAssignable(
           destType,
-          specializedSrcProtocol,
+          specializedProtocolType,
           diag,
-          typeVarContext,
+          destTypeVarContext,
           /* srcTypeVarContext */
           void 0,
           flags,
@@ -50050,6 +50301,34 @@ var require_protocols = __commonJS({
       return typesAreConsistent;
     }
     exports.assignModuleToProtocol = assignModuleToProtocol;
+    function createProtocolTypeVarContext(evaluator, destType, destTypeVarContext) {
+      const protocolTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(destType));
+      if (destType === null || destType === void 0 ? void 0 : destType.typeArguments) {
+        evaluator.inferTypeParameterVarianceForClass(destType);
+        let specializedDestType = destType;
+        if (destTypeVarContext) {
+          specializedDestType = (0, typeUtils_1.applySolvedTypeVars)(destType, destTypeVarContext, {
+            useNarrowBoundOnly: true
+          });
+        }
+        destType.details.typeParameters.forEach((typeParam, index) => {
+          if (index < specializedDestType.typeArguments.length) {
+            const typeArg = specializedDestType.typeArguments[index];
+            if (!(0, typeUtils_1.requiresSpecialization)(typeArg)) {
+              const typeParamVariance = types_1.TypeVarType.getVariance(typeParam);
+              protocolTypeVarContext.setTypeVarType(
+                typeParam,
+                typeParamVariance !== 4 ? typeArg : void 0,
+                /* narrowBoundNoLiterals */
+                void 0,
+                typeParamVariance !== 3 ? typeArg : void 0
+              );
+            }
+          }
+        });
+      }
+      return protocolTypeVarContext;
+    }
   }
 });
 
@@ -51593,9 +51872,22 @@ var require_typeEvaluator = __commonJS({
         );
         if (inferenceContext && !(0, types_1.isAnyOrUnknown)(inferenceContext.expectedType) && !(0, types_1.isNever)(inferenceContext.expectedType)) {
           expectedTypeCache.set(node.id, inferenceContext.expectedType);
+          if (inferenceContext.signatureTracker && (0, types_1.isFunction)(typeResult.type)) {
+            typeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(typeResult.type, inferenceContext.signatureTracker, node.start);
+          }
           if (!typeResult.isIncomplete && !typeResult.expectedTypeDiagAddendum) {
             const diag = new diagnostic_1.DiagnosticAddendum();
-            if (!assignType(inferenceContext.expectedType, typeResult.type, diag)) {
+            if (!assignType(
+              inferenceContext.expectedType,
+              typeResult.type,
+              diag,
+              /* destTypeVarContext */
+              void 0,
+              /* srcTypeVarContext */
+              void 0,
+              512
+              /* IgnoreTypeVarScope */
+            )) {
               typeResult.typeErrors = true;
               typeResult.expectedTypeDiagAddendum = diag;
               diag.addTextRange(node);
@@ -51899,6 +52191,9 @@ var require_typeEvaluator = __commonJS({
           flags |= 2;
         }
         const decoratorTypeResult = getTypeOfExpression(node.expression, flags);
+        if ((0, types_1.isFunction)(decoratorTypeResult.type) && decoratorTypeResult.type.details.builtInName === "type_check_only") {
+          return functionOrClassType;
+        }
         if ((0, types_1.isInstantiableClass)(decoratorTypeResult.type) && types_1.ClassType.isBuiltIn(decoratorTypeResult.type, "classmethod") && (0, typeUtils_1.isProperty)(functionOrClassType)) {
           return functionOrClassType;
         }
@@ -53985,11 +54280,13 @@ var require_typeEvaluator = __commonJS({
           return type;
         }
         if ((0, types_1.isInstantiableClass)(type)) {
-          if ((flags & 128) !== 0) {
-            if ((0, typeUtils_1.requiresTypeArguments)(type) && !type.typeArguments) {
-              addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportMissingTypeArgument, diagnosticRules_1.DiagnosticRule.reportMissingTypeArgument, localize_1.Localizer.Diagnostic.typeArgsMissingForClass().format({
-                name: type.aliasName || type.details.name
-              }), node);
+          if ((flags & 128) !== 0 && (flags & 512) === 0) {
+            if (!type.typeAliasInfo && (0, typeUtils_1.requiresTypeArguments)(type)) {
+              if (!type.typeArguments || !type.isTypeArgumentExplicit) {
+                addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportMissingTypeArgument, diagnosticRules_1.DiagnosticRule.reportMissingTypeArgument, localize_1.Localizer.Diagnostic.typeArgsMissingForClass().format({
+                  name: type.aliasName || type.details.name
+                }), node);
+              }
             }
           }
           if (!type.typeArguments) {
@@ -55940,7 +56237,12 @@ var require_typeEvaluator = __commonJS({
         }
         let expectedTypeDiagAddendum;
         if (effectiveExpectedType) {
-          const result = getTypeOfTupleWithContext(node, (0, typeUtils_1.makeInferenceContext)(effectiveExpectedType));
+          const result = getTypeOfTupleWithContext(node, (0, typeUtils_1.makeInferenceContext)(
+            effectiveExpectedType,
+            /* isTypeIncomplete */
+            false,
+            inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.signatureTracker
+          ));
           if (result && !result.typeErrors) {
             return result;
           }
@@ -55975,7 +56277,7 @@ var require_typeEvaluator = __commonJS({
           }
         } else {
           const tupleTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(tupleClassType));
-          if (!(0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluatorInterface, types_1.ClassType.cloneAsInstance(tupleClassType), inferenceContext.expectedType, tupleTypeVarContext, ParseTreeUtils.getTypeVarScopesForNode(node))) {
+          if (!(0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluatorInterface, types_1.ClassType.cloneAsInstance(tupleClassType), inferenceContext.expectedType, tupleTypeVarContext, ParseTreeUtils.getTypeVarScopesForNode(node), node.start)) {
             return void 0;
           }
           const specializedTuple = (0, typeUtils_1.applySolvedTypeVars)(tupleClassType, tupleTypeVarContext);
@@ -55991,7 +56293,7 @@ var require_typeEvaluator = __commonJS({
           expr,
           /* flags */
           void 0,
-          (0, typeUtils_1.makeInferenceContext)(index < expectedTypes.length ? expectedTypes[index] : void 0)
+          (0, typeUtils_1.makeInferenceContext)(index < expectedTypes.length ? expectedTypes[index] : void 0, inferenceContext.isTypeIncomplete, inferenceContext.signatureTracker)
         ));
         const isIncomplete = entryTypeResults.some((result) => result.isIncomplete);
         const type = (0, typeUtils_1.convertToInstance)((0, typeUtils_1.specializeTupleClass)(
@@ -56079,6 +56381,9 @@ var require_typeEvaluator = __commonJS({
           return functionArg;
         });
         let typeResult = { type: types_1.UnknownType.create() };
+        if (inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.signatureTracker) {
+          baseTypeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(baseTypeResult.type, inferenceContext.signatureTracker, node.leftExpression.start);
+        }
         if (!(0, typeUtils_1.isTypeAliasPlaceholder)(baseTypeResult.type)) {
           if (node.leftExpression.nodeType === 38 && node.leftExpression.value === "super") {
             typeResult = getTypeOfSuperCall(node);
@@ -56305,9 +56610,12 @@ var require_typeEvaluator = __commonJS({
         return types_1.NoneType.createInstance();
       }
       function getTypeOfSuperCall(node) {
+        var _a;
         if (node.arguments.length > 2) {
           addError(localize_1.Localizer.Diagnostic.superCallArgCount(), node.arguments[2]);
         }
+        const enclosingClass = ParseTreeUtils.getEnclosingClass(node);
+        const enclosingClassType = enclosingClass ? (_a = getTypeOfClass(enclosingClass)) === null || _a === void 0 ? void 0 : _a.classType : void 0;
         let targetClassType;
         if (node.arguments.length > 0) {
           targetClassType = getTypeOfExpression(node.arguments[0].valueExpression).type;
@@ -56316,10 +56624,8 @@ var require_typeEvaluator = __commonJS({
             addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.superCallFirstArg().format({ type: printType(targetClassType) }), node.arguments[0].valueExpression);
           }
         } else {
-          const enclosingClass = ParseTreeUtils.getEnclosingClass(node);
-          if (enclosingClass) {
-            const classTypeInfo = getTypeOfClass(enclosingClass);
-            targetClassType = classTypeInfo ? classTypeInfo.classType : types_1.UnknownType.create();
+          if (enclosingClassType) {
+            targetClassType = enclosingClassType !== null && enclosingClassType !== void 0 ? enclosingClassType : types_1.UnknownType.create();
           } else {
             addError(localize_1.Localizer.Diagnostic.superCallZeroArgForm(), node.leftExpression);
             targetClassType = types_1.UnknownType.create();
@@ -56361,28 +56667,23 @@ var require_typeEvaluator = __commonJS({
             const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
             addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.superCallSecondArg().format({ type: printType(targetClassType) }), node.arguments[1].valueExpression);
           }
-        } else {
+        } else if (enclosingClassType) {
+          bindToType = types_1.ClassType.cloneAsInstance(enclosingClassType);
           const enclosingMethod = ParseTreeUtils.getEnclosingFunction(node);
           let implicitBindToType;
           if (enclosingMethod) {
             const methodTypeInfo = getTypeOfFunction(enclosingMethod);
             if (methodTypeInfo) {
               const methodType = methodTypeInfo.functionType;
-              if (types_1.FunctionType.isClassMethod(methodType)) {
+              if (types_1.FunctionType.isClassMethod(methodType) || types_1.FunctionType.isConstructorMethod(methodType) || types_1.FunctionType.isInstanceMethod(methodType)) {
                 if (methodType.details.parameters.length > 0 && methodType.details.parameters[0].hasDeclaredType) {
                   implicitBindToType = makeTopLevelTypeVarsConcrete(methodType.details.parameters[0].type);
                 }
-              } else if (types_1.FunctionType.isInstanceMethod(methodType)) {
-                if (methodType.details.parameters.length > 0 && methodType.details.parameters[0].hasDeclaredType) {
-                  implicitBindToType = makeTopLevelTypeVarsConcrete((0, typeUtils_1.convertToInstantiable)(methodType.details.parameters[0].type));
-                }
               }
             }
           }
-          if (implicitBindToType && (0, types_1.isInstantiableClass)(implicitBindToType)) {
-            bindToType = implicitBindToType;
-          } else if ((0, types_1.isInstantiableClass)(targetClassType)) {
-            bindToType = targetClassType;
+          if (bindToType && implicitBindToType) {
+            bindToType = (0, typeUtils_1.addConditionToType)(bindToType, (0, typeUtils_1.getTypeCondition)(implicitBindToType));
           }
         }
         let resultIsInstance = true;
@@ -56400,12 +56701,8 @@ var require_typeEvaluator = __commonJS({
         const parentNode = node.parent;
         if (parentNode.nodeType === 35) {
           const memberName = parentNode.memberName.value;
-          const lookupResults = (0, typeUtils_1.lookUpClassMember)(
-            targetClassType,
-            memberName,
-            1
-            /* SkipOriginalClass */
-          );
+          const effectiveTargetClass = (0, types_1.isClass)(targetClassType) ? targetClassType : void 0;
+          const lookupResults = bindToType ? (0, typeUtils_1.lookUpClassMember)(bindToType, memberName, 0, effectiveTargetClass) : void 0;
           if (lookupResults && (0, types_1.isInstantiableClass)(lookupResults.classType)) {
             return {
               type: resultIsInstance ? types_1.ClassType.cloneAsInstance(lookupResults.classType) : lookupResults.classType,
@@ -56509,16 +56806,26 @@ var require_typeEvaluator = __commonJS({
                 let isSubtypeSubsumed = false;
                 for (let dedupedIndex = 0; dedupedIndex < dedupedMatchResults.length; dedupedIndex++) {
                   if (assignType(dedupedMatchResults[dedupedIndex], result.returnType)) {
-                    if (!(0, typeUtils_1.containsAnyOrUnknown)(dedupedMatchResults[dedupedIndex])) {
+                    const anyOrUnknown = (0, typeUtils_1.containsAnyOrUnknown)(
+                      dedupedMatchResults[dedupedIndex],
+                      /* recurse */
+                      false
+                    );
+                    if (!anyOrUnknown) {
                       isSubtypeSubsumed = true;
-                    } else if (!(0, typeUtils_1.containsUnknown)(dedupedMatchResults[dedupedIndex])) {
+                    } else if ((0, types_1.isAny)(anyOrUnknown)) {
                       dedupedResultsIncludeAny = true;
                     }
                     break;
                   } else if (assignType(result.returnType, dedupedMatchResults[dedupedIndex])) {
-                    if (!(0, typeUtils_1.containsAnyOrUnknown)(result.returnType)) {
+                    const anyOrUnknown = (0, typeUtils_1.containsAnyOrUnknown)(
+                      result.returnType,
+                      /* recurse */
+                      false
+                    );
+                    if (!anyOrUnknown) {
                       dedupedMatchResults[dedupedIndex] = types_1.NeverType.createNever();
-                    } else if (!(0, typeUtils_1.containsUnknown)(dedupedMatchResults[dedupedIndex])) {
+                    } else if ((0, types_1.isAny)(anyOrUnknown)) {
                       dedupedResultsIncludeAny = true;
                     }
                     break;
@@ -56568,6 +56875,12 @@ var require_typeEvaluator = __commonJS({
         if (matches.length < 2) {
           return matches;
         }
+        if (matches[0].matchResults.relevance !== matches[matches.length - 1].matchResults.relevance) {
+          matches = matches.filter((m) => m.matchResults.relevance === matches[0].matchResults.relevance);
+          if (matches.length < 2) {
+            return matches;
+          }
+        }
         if ((0, typeUtils_1.areTypesSame)(matches.map((match) => match.returnType), { treatAnySameAsUnknown: true })) {
           return [matches[0]];
         }
@@ -56575,19 +56888,24 @@ var require_typeEvaluator = __commonJS({
         if (!firstArgResults) {
           return matches;
         }
+        let foundAmbiguousAnyArg = false;
         for (let i = 0; i < firstArgResults.length; i++) {
           if ((0, types_1.isAnyOrUnknown)(firstArgResults[i].argType)) {
             const paramTypes = matches.map((match) => i < match.matchResults.argParams.length ? match.matchResults.argParams[i].paramType : types_1.UnknownType.create());
             if (!(0, typeUtils_1.areTypesSame)(paramTypes, { treatAnySameAsUnknown: true })) {
-              return matches;
+              foundAmbiguousAnyArg = true;
             }
           }
         }
+        if (foundAmbiguousAnyArg || matches.some((match) => match.argResults.length !== firstArgResults.length)) {
+          return matches;
+        }
         return [matches[0]];
       }
       function getBestOverloadForArguments(errorNode, typeResult, argList) {
         let overloadIndex = 0;
         let matches = [];
+        const signatureTracker = new typeUtils_1.UniqueSignatureTracker();
         types_1.OverloadedFunctionType.getOverloads(typeResult.type).forEach((overload) => {
           useSpeculativeMode(errorNode, () => {
             const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, { type: overload, isIncomplete: typeResult.isIncomplete }, overloadIndex);
@@ -56606,6 +56924,7 @@ var require_typeEvaluator = __commonJS({
                 errorNode,
                 match,
                 new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(match.overload)),
+                signatureTracker,
                 /* skipUnknownArgCheck */
                 true
               );
@@ -56649,7 +56968,7 @@ var require_typeEvaluator = __commonJS({
           }
           return { argumentErrors: true, isTypeIncomplete: false, overloadsUsedForCall: [] };
         }
-        const evaluateUsingLastMatchingOverload = (skipUnknownArgCheck2) => {
+        function evaluateUsingLastMatchingOverload(skipUnknownArgCheck2) {
           const lastMatch = filteredMatchResults.reduce((previous, current) => {
             return current.overloadIndex > previous.overloadIndex ? current : previous;
           });
@@ -56657,7 +56976,7 @@ var require_typeEvaluator = __commonJS({
           effectiveTypeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeIds)(lastMatch.overload));
           effectiveTypeVarContext.unlock();
           return validateFunctionArgumentTypesWithContext(errorNode, lastMatch, effectiveTypeVarContext, skipUnknownArgCheck2, inferenceContext);
-        };
+        }
         if (filteredMatchResults.length === 1) {
           return evaluateUsingLastMatchingOverload(
             /* skipUnknownArgCheck */
@@ -57077,7 +57396,7 @@ var require_typeEvaluator = __commonJS({
             const combinedArgType = (0, typeUtils_1.combineSameSizedTuples)(makeTopLevelTypeVarsConcrete(argType), tupleClassType);
             if ((0, types_1.isClassInstance)(combinedArgType) && (0, typeUtils_1.isTupleClass)(combinedArgType)) {
               const tupleTypeArgs = (_a = combinedArgType.tupleTypeArguments) !== null && _a !== void 0 ? _a : [];
-              if (tupleTypeArgs.length !== 1) {
+              if (tupleTypeArgs.length !== 1 || !tupleTypeArgs[0].isUnbounded) {
                 for (const tupleTypeArg of tupleTypeArgs) {
                   if (tupleTypeArg.isUnbounded) {
                     expandedArgList.push({
@@ -57491,6 +57810,18 @@ var require_typeEvaluator = __commonJS({
                       unpackedDictionaryArgType = types_1.UnknownType.create();
                     }
                   }
+                  if (paramDetails.kwargsIndex !== void 0 && unpackedDictionaryArgType) {
+                    const paramType = paramDetails.params[paramDetails.kwargsIndex].type;
+                    validateArgTypeParams.push({
+                      paramCategory: 0,
+                      paramType,
+                      requiresTypeVarMatching: (0, typeUtils_1.requiresSpecialization)(paramType),
+                      argType: unpackedDictionaryArgType,
+                      argument: argList[argIndex],
+                      errorNode: argList[argIndex].valueExpression || errorNode,
+                      paramName: paramDetails.params[paramDetails.kwargsIndex].param.name
+                    });
+                  }
                   if (!isValidMappingType) {
                     if (!isDiagnosticSuppressedForNode(errorNode)) {
                       addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.unpackedDictArgumentNotMapping(), argList[argIndex].valueExpression || errorNode);
@@ -57584,7 +57915,7 @@ var require_typeEvaluator = __commonJS({
             paramDetails.params.forEach((paramInfo, paramIndex2) => {
               var _a2, _b2;
               const param = paramInfo.param;
-              if (paramIndex2 >= paramDetails.firstPositionOrKeywordIndex && param.category === 0 && param.name && !param.hasDefault && paramMap.has(param.name) && paramMap.get(param.name).argsReceived === 0) {
+              if (paramIndex2 >= paramDetails.firstPositionOrKeywordIndex && param.category === 0 && param.name && paramMap.has(param.name) && paramMap.get(param.name).argsReceived === 0) {
                 const paramType = paramDetails.params[paramIndex2].type;
                 validateArgTypeParams.push({
                   paramCategory: 0,
@@ -57704,7 +58035,7 @@ var require_typeEvaluator = __commonJS({
           relevance--;
         }
         if (["isinstance", "issubclass"].some((name) => name === typeResult.type.details.builtInName) && validateArgTypeParams.length === 2) {
-          validateArgTypeParams[1].expectingType = true;
+          validateArgTypeParams[1].isinstanceParam = true;
         }
         return {
           overload: typeResult.type,
@@ -57719,10 +58050,12 @@ var require_typeEvaluator = __commonJS({
         };
       }
       function validateFunctionArgumentTypesWithContext(errorNode, matchResults, typeVarContext, skipUnknownArgCheck = false, inferenceContext) {
-        var _a;
+        var _a, _b;
         const type = matchResults.overload;
-        if (!inferenceContext || (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())) {
-          return validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, skipUnknownArgCheck);
+        const signatureTracker = (_a = inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.signatureTracker) !== null && _a !== void 0 ? _a : new typeUtils_1.UniqueSignatureTracker();
+        matchResults.overload = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(matchResults.overload, signatureTracker, errorNode.start);
+        if (!inferenceContext || (0, types_1.isAnyOrUnknown)(inferenceContext.expectedType) || (0, types_1.isNever)(inferenceContext.expectedType) || !type.details.declaredReturnType || !(0, typeUtils_1.requiresSpecialization)((_b = types_1.FunctionType.getSpecializedReturnType(type)) !== null && _b !== void 0 ? _b : types_1.UnknownType.create())) {
+          return validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, signatureTracker, skipUnknownArgCheck);
         }
         const effectiveReturnType = getFunctionEffectiveReturnType(type);
         let effectiveExpectedType = inferenceContext.expectedType;
@@ -57748,7 +58081,7 @@ var require_typeEvaluator = __commonJS({
               effectiveFlags | 1024
               /* PopulatingExpectedType */
             );
-            const speculativeResults = validateFunctionArgumentTypes(errorNode, matchResults, typeVarContextCopy, skipUnknownArgCheck);
+            const speculativeResults = validateFunctionArgumentTypes(errorNode, matchResults, typeVarContextCopy, signatureTracker, skipUnknownArgCheck);
             if (speculativeResults === null || speculativeResults === void 0 ? void 0 : speculativeResults.argumentErrors) {
               effectiveExpectedType = void 0;
             }
@@ -57759,7 +58092,15 @@ var require_typeEvaluator = __commonJS({
           if ((0, types_1.isClassInstance)(effectiveReturnType)) {
             if ((0, types_1.isUnion)(effectiveExpectedType)) {
               const filteredType = (0, typeUtils_1.mapSubtypes)(effectiveExpectedType, (subtype) => {
-                return (0, types_1.isClassInstance)(subtype) && types_1.ClassType.isSameGenericClass(effectiveReturnType, subtype) ? subtype : void 0;
+                if (!(0, types_1.isClassInstance)(subtype) || subtype.details.typeParameters.length === 0) {
+                  return void 0;
+                }
+                if (types_1.ClassType.isProtocolClass(subtype) || subtype.details.mro.some((mroClass) => {
+                  return (0, types_1.isClassInstance)(mroClass) && mroClass.details.typeParameters.length > 0 && types_1.ClassType.isSameGenericClass(effectiveReturnType, mroClass);
+                })) {
+                  return subtype;
+                }
+                return void 0;
               });
               if ((0, types_1.isClassInstance)(filteredType)) {
                 effectiveExpectedType = filteredType;
@@ -57767,7 +58108,7 @@ var require_typeEvaluator = __commonJS({
             }
             if ((0, types_1.isClassInstance)(effectiveExpectedType) && !(0, types_1.isTypeSame)(effectiveReturnType, effectiveExpectedType)) {
               const tempTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(effectiveReturnType));
-              (0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluatorInterface, effectiveReturnType, effectiveExpectedType, tempTypeVarContext, liveTypeVarScopes);
+              (0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluatorInterface, effectiveReturnType, effectiveExpectedType, tempTypeVarContext, liveTypeVarScopes, errorNode.start);
               const genericReturnType = types_1.ClassType.cloneForSpecialization(
                 effectiveReturnType,
                 /* typeArguments */
@@ -57784,7 +58125,7 @@ var require_typeEvaluator = __commonJS({
               });
             }
           }
-          effectiveExpectedType = (0, typeUtils_1.transformExpectedType)(effectiveExpectedType, liveTypeVarScopes);
+          effectiveExpectedType = (0, typeUtils_1.transformExpectedType)(effectiveExpectedType, liveTypeVarScopes, errorNode.start);
           assignType(
             effectiveReturnType,
             effectiveExpectedType,
@@ -57797,9 +58138,9 @@ var require_typeEvaluator = __commonJS({
             /* PopulatingExpectedType */
           );
         }
-        return validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, skipUnknownArgCheck);
+        return validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, signatureTracker, skipUnknownArgCheck);
       }
-      function validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, skipUnknownArgCheck = false) {
+      function validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, signatureTracker, skipUnknownArgCheck = false) {
         const type = matchResults.overload;
         let isTypeIncomplete = matchResults.isTypeIncomplete;
         let argumentErrors = false;
@@ -57832,13 +58173,12 @@ var require_typeEvaluator = __commonJS({
         if (typeVarMatchingCount > 0) {
           let passCount = Math.min(typeVarMatchingCount, 2);
           for (let i = 0; i < passCount; i++) {
-            const signatureTracker2 = new typeUtils_1.UniqueSignatureTracker();
             useSpeculativeMode(errorNode, () => {
               matchResults.argParams.forEach((argParam) => {
                 if (!argParam.requiresTypeVarMatching) {
                   return;
                 }
-                const argResult = validateArgType(argParam, typeVarContext, signatureTracker2, { type, isIncomplete: matchResults.isTypeIncomplete }, {
+                const argResult = validateArgType(argParam, typeVarContext, signatureTracker, { type, isIncomplete: matchResults.isTypeIncomplete }, {
                   skipUnknownArgCheck,
                   skipOverloadArg: i === 0,
                   skipBareTypeVarExpectedType: i === 0,
@@ -57860,7 +58200,6 @@ var require_typeEvaluator = __commonJS({
         let sawParamSpecKwargs = false;
         let condition = [];
         const argResults = [];
-        const signatureTracker = new typeUtils_1.UniqueSignatureTracker();
         matchResults.argParams.forEach((argParam) => {
           var _a;
           const argResult = validateArgType(argParam, typeVarContext, signatureTracker, { type, isIncomplete: matchResults.isTypeIncomplete }, {
@@ -58102,7 +58441,12 @@ var require_typeEvaluator = __commonJS({
               const argResult = validateArgType(
                 {
                   paramCategory: 0,
-                  paramType: (0, typeUtils_1.transformExpectedType)(paramType, liveTypeVarScopes),
+                  paramType: (0, typeUtils_1.transformExpectedType)(
+                    paramType,
+                    liveTypeVarScopes,
+                    /* usageOffset */
+                    void 0
+                  ),
                   requiresTypeVarMatching: false,
                   argument: arg,
                   errorNode: arg.valueExpression || errorNode
@@ -58183,10 +58527,10 @@ var require_typeEvaluator = __commonJS({
           if (argParam.argType) {
             argType = argParam.argType;
           } else {
-            const flags = argParam.expectingType ? 8 | 32 | 64 : 0;
-            const exprTypeResult = getTypeOfExpression(argParam.argument.valueExpression, flags, (0, typeUtils_1.makeInferenceContext)(expectedType, !!(typeResult === null || typeResult === void 0 ? void 0 : typeResult.isIncomplete)));
+            const flags = argParam.isinstanceParam ? 512 | 8 | 32 | 64 : 0;
+            const exprTypeResult = getTypeOfExpression(argParam.argument.valueExpression, flags, (0, typeUtils_1.makeInferenceContext)(expectedType, !!(typeResult === null || typeResult === void 0 ? void 0 : typeResult.isIncomplete), signatureTracker));
             argType = exprTypeResult.type;
-            argType = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(argType, signatureTracker);
+            argType = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(argType, signatureTracker, argParam.argument.valueExpression.start);
             if (exprTypeResult.isIncomplete) {
               isTypeIncomplete = true;
             }
@@ -58219,7 +58563,7 @@ var require_typeEvaluator = __commonJS({
         } else {
           if (argParam.argType) {
             argType = argParam.argType;
-          } else if (argParam.expectingType && !argParam.argument.typeResult && argParam.argument.valueExpression) {
+          } else if (argParam.isinstanceParam && !argParam.argument.typeResult && argParam.argument.valueExpression) {
             const argTypeResult = getTypeOfExpression(
               argParam.argument.valueExpression,
               8 | 32 | 64
@@ -58341,9 +58685,7 @@ var require_typeEvaluator = __commonJS({
           return { isCompatible: false, argType, isTypeIncomplete, skippedBareTypeVarExpectedType, condition };
         }
         if (!options.skipUnknownArgCheck) {
-          const simplifiedType = (0, types_1.removeUnbound)(argType);
-          const fileInfo = AnalyzerNodeInfo.getFileInfo(argParam.errorNode);
-          const getDiagAddendum = () => {
+          let getDiagAddendum = function() {
             const diagAddendum = new diagnostic_1.DiagnosticAddendum();
             if (argParam.paramName) {
               diagAddendum.addMessage((functionName ? localize_1.Localizer.DiagnosticAddendum.argParamFunction().format({
@@ -58353,6 +58695,8 @@ var require_typeEvaluator = __commonJS({
             }
             return diagAddendum;
           };
+          const simplifiedType = (0, types_1.removeUnbound)(argType);
+          const fileInfo = AnalyzerNodeInfo.getFileInfo(argParam.errorNode);
           if (fileInfo.diagnosticRuleSet.reportUnknownArgumentType !== "none" && !(0, types_1.isAny)(argParam.paramType) && !isTypeIncomplete) {
             if ((0, types_1.isUnknown)(simplifiedType)) {
               const diagAddendum = getDiagAddendum();
@@ -59042,6 +59386,8 @@ var require_typeEvaluator = __commonJS({
             valueTypes,
             /* forceStrictInference */
             true,
+            /* isValueTypeInvariant */
+            true,
             /* expectedKeyType */
             void 0,
             /* expectedValueType */
@@ -59075,7 +59421,7 @@ var require_typeEvaluator = __commonJS({
           return void 0;
         }
         const dictTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(builtInDict));
-        if (!(0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluatorInterface, builtInDict, inferenceContext.expectedType, dictTypeVarContext, ParseTreeUtils.getTypeVarScopesForNode(node))) {
+        if (!(0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluatorInterface, builtInDict, inferenceContext.expectedType, dictTypeVarContext, ParseTreeUtils.getTypeVarScopesForNode(node), node.start)) {
           return void 0;
         }
         const specializedDict = (0, typeUtils_1.applySolvedTypeVars)(types_1.ClassType.cloneAsInstantiable(builtInDict), dictTypeVarContext);
@@ -59084,12 +59430,14 @@ var require_typeEvaluator = __commonJS({
         }
         const expectedKeyType = specializedDict.typeArguments[0];
         const expectedValueType = specializedDict.typeArguments[1];
+        const isValueTypeInvariant = (0, types_1.isClassInstance)(inferenceContext.expectedType) && (types_1.ClassType.isBuiltIn(inferenceContext.expectedType, "dict") || types_1.ClassType.isBuiltIn(inferenceContext.expectedType, "MutableMapping"));
         if (getKeyAndValueTypesFromDictionary(
           node,
           keyTypes,
           valueTypes,
           /* forceStrictInference */
           true,
+          isValueTypeInvariant,
           expectedKeyType,
           expectedValueType,
           void 0,
@@ -59097,7 +59445,6 @@ var require_typeEvaluator = __commonJS({
         )) {
           isIncomplete = true;
         }
-        const isValueTypeInvariant = (0, types_1.isClassInstance)(inferenceContext.expectedType) && (types_1.ClassType.isBuiltIn(inferenceContext.expectedType, "dict") || types_1.ClassType.isBuiltIn(inferenceContext.expectedType, "MutableMapping"));
         const specializedKeyType = inferTypeArgFromExpectedEntryType(
           (0, typeUtils_1.makeInferenceContext)(expectedKeyType),
           keyTypes.map((result) => result.type),
@@ -59124,7 +59471,9 @@ var require_typeEvaluator = __commonJS({
           keyTypeResults,
           valueTypeResults,
           /* forceStrictInference */
-          hasExpectedType
+          hasExpectedType,
+          /* isValueTypeInvariant */
+          false
         )) {
           isIncomplete = true;
         }
@@ -59160,10 +59509,10 @@ var require_typeEvaluator = __commonJS({
         }
         return { type, isIncomplete };
       }
-      function getKeyAndValueTypesFromDictionary(node, keyTypes, valueTypes, forceStrictInference, expectedKeyType, expectedValueType, expectedTypedDictEntries, expectedDiagAddendum) {
+      function getKeyAndValueTypesFromDictionary(node, keyTypes, valueTypes, forceStrictInference, isValueTypeInvariant, expectedKeyType, expectedValueType, expectedTypedDictEntries, expectedDiagAddendum) {
         let isIncomplete = false;
         node.entries.forEach((entryNode, index) => {
-          var _a;
+          var _a, _b, _c;
           let addUnknown = true;
           if (entryNode.nodeType === 17) {
             const keyTypeResult = getTypeOfExpression(
@@ -59188,23 +59537,29 @@ var require_typeEvaluator = __commonJS({
               expectedDiagAddendum.addAddendum(keyTypeResult.expectedTypeDiagAddendum);
             }
             let valueTypeResult;
+            let entryInferenceContext;
             if (expectedTypedDictEntries && (0, types_1.isClassInstance)(keyType) && types_1.ClassType.isBuiltIn(keyType, "str") && (0, typeUtils_1.isLiteralType)(keyType) && expectedTypedDictEntries.has(keyType.literalValue)) {
               const effectiveValueType = expectedTypedDictEntries.get(keyType.literalValue).valueType;
+              entryInferenceContext = (0, typeUtils_1.makeInferenceContext)(effectiveValueType);
               valueTypeResult = getTypeOfExpression(
                 entryNode.valueExpression,
                 /* flags */
                 void 0,
-                (0, typeUtils_1.makeInferenceContext)(effectiveValueType)
+                entryInferenceContext
               );
             } else {
               const effectiveValueType = expectedValueType !== null && expectedValueType !== void 0 ? expectedValueType : forceStrictInference ? types_1.NeverType.createNever() : void 0;
+              entryInferenceContext = (0, typeUtils_1.makeInferenceContext)(effectiveValueType);
               valueTypeResult = getTypeOfExpression(
                 entryNode.valueExpression,
                 /* flags */
                 void 0,
-                (0, typeUtils_1.makeInferenceContext)(effectiveValueType)
+                entryInferenceContext
               );
             }
+            if (entryInferenceContext && !valueTypeResult.typeErrors) {
+              valueTypeResult.type = (_a = inferTypeArgFromExpectedEntryType(entryInferenceContext, [valueTypeResult.type], !isValueTypeInvariant)) !== null && _a !== void 0 ? _a : valueTypeResult.type;
+            }
             if (expectedDiagAddendum && valueTypeResult.expectedTypeDiagAddendum) {
               expectedDiagAddendum.addAddendum(valueTypeResult.expectedTypeDiagAddendum);
             }
@@ -59229,12 +59584,16 @@ var require_typeEvaluator = __commonJS({
                 ));
               }
             }
+            const entryInferenceContext = (0, typeUtils_1.makeInferenceContext)(expectedType);
             const unexpandedTypeResult = getTypeOfExpression(
               entryNode.expandExpression,
               /* flags */
               void 0,
-              (0, typeUtils_1.makeInferenceContext)(expectedType)
+              entryInferenceContext
             );
+            if (entryInferenceContext && !unexpandedTypeResult.typeErrors) {
+              unexpandedTypeResult.type = (_b = inferTypeArgFromExpectedEntryType(entryInferenceContext, [unexpandedTypeResult.type], !isValueTypeInvariant)) !== null && _b !== void 0 ? _b : unexpandedTypeResult.type;
+            }
             if (unexpandedTypeResult.isIncomplete) {
               isIncomplete = true;
             }
@@ -59298,7 +59657,7 @@ var require_typeEvaluator = __commonJS({
               isIncomplete = true;
             }
             if ((0, types_1.isClassInstance)(dictEntryType) && (0, typeUtils_1.isTupleClass)(dictEntryType)) {
-              const typeArgs = (_a = dictEntryType.tupleTypeArguments) === null || _a === void 0 ? void 0 : _a.map((t) => t.type);
+              const typeArgs = (_c = dictEntryType.tupleTypeArguments) === null || _c === void 0 ? void 0 : _c.map((t) => t.type);
               if (typeArgs && typeArgs.length === 2) {
                 if (forceStrictInference || index < maxEntriesToUseForInference) {
                   keyTypes.push({ node: entryNode, type: typeArgs[0] });
@@ -59367,7 +59726,7 @@ var require_typeEvaluator = __commonJS({
           return void 0;
         }
         const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(builtInListOrSet));
-        if (!(0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluatorInterface, builtInListOrSet, inferenceContext.expectedType, typeVarContext, ParseTreeUtils.getTypeVarScopesForNode(node))) {
+        if (!(0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluatorInterface, builtInListOrSet, inferenceContext.expectedType, typeVarContext, ParseTreeUtils.getTypeVarScopesForNode(node), node.start)) {
           return void 0;
         }
         const specializedListOrSet = (0, typeUtils_1.applySolvedTypeVars)(types_1.ClassType.cloneAsInstantiable(builtInListOrSet), typeVarContext);
@@ -59492,7 +59851,7 @@ var require_typeEvaluator = __commonJS({
         if ((0, types_1.isAnyOrUnknown)(inferenceContext.expectedType)) {
           return inferenceContext.expectedType;
         }
-        const typeVarContext = new typeVarContext_1.TypeVarContext();
+        const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(inferenceContext.expectedType));
         const expectedType = inferenceContext.expectedType;
         let isCompatible = true;
         entryTypes.forEach((entryType) => {
@@ -59513,7 +59872,16 @@ var require_typeEvaluator = __commonJS({
           const combinedTypes = (0, types_1.combineTypes)(entryTypes);
           return (0, typeUtils_1.containsLiteralType)(inferenceContext.expectedType) ? combinedTypes : stripLiteralValue(combinedTypes);
         }
-        return (0, typeUtils_1.applySolvedTypeVars)(inferenceContext.expectedType, typeVarContext, { applyInScopePlaceholders: true });
+        return (0, typeUtils_1.mapSubtypes)((0, typeUtils_1.applySolvedTypeVars)(inferenceContext.expectedType, typeVarContext, { applyInScopePlaceholders: true }), (subtype) => {
+          if (entryTypes.length !== 1) {
+            return subtype;
+          }
+          const entryType = entryTypes[0];
+          if ((0, types_1.isTypeSame)(subtype, entryType, { ignoreTypedDictNarrowEntries: true }) && (0, types_1.isClass)(subtype) && (0, types_1.isClass)(entryType) && types_1.ClassType.isTypedDictClass(entryType)) {
+            return types_1.ClassType.cloneForNarrowedTypedDictEntries(subtype, entryType.typedDictNarrowedEntries);
+          }
+          return subtype;
+        });
       }
       function getTypeOfYield(node) {
         let expectedYieldType;
@@ -59607,7 +59975,8 @@ var require_typeEvaluator = __commonJS({
               (param) => !!param.name && param.category !== 0
               /* Simple */
             );
-            return hasVarArgs || functionParamCount >= minLambdaParamCount && functionParamCount <= maxLambdaParamCount;
+            const hasParamSpec = !!functionType2.details.paramSpec;
+            return hasVarArgs || hasParamSpec || functionParamCount >= minLambdaParamCount && functionParamCount <= maxLambdaParamCount;
           });
         }
         const expectedFunctionType = expectedFunctionTypes.length > 0 ? expectedFunctionTypes[0] : void 0;
@@ -59667,9 +60036,6 @@ var require_typeEvaluator = __commonJS({
             type: types_1.UnknownType.create()
           });
         }
-        if (expectedFunctionType === null || expectedFunctionType === void 0 ? void 0 : expectedFunctionType.details.paramSpec) {
-          functionType.details.paramSpec = expectedFunctionType.details.paramSpec;
-        }
         const expectedReturnType = expectedFunctionType ? getFunctionEffectiveReturnType(expectedFunctionType) : void 0;
         useSpeculativeMode(isSpeculativeModeInUse(node) || (inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.isTypeIncomplete) ? node.expression : void 0, () => {
           const returnTypeResult = getTypeOfExpression(
@@ -60096,7 +60462,9 @@ var require_typeEvaluator = __commonJS({
               let isLiteralType = true;
               (0, typeUtils_1.doForEachSubtype)(exprType.type, (subtype) => {
                 if (!(0, types_1.isInstantiableClass)(subtype) || subtype.literalValue === void 0) {
-                  isLiteralType = false;
+                  if (!(0, types_1.isNoneTypeClass)(subtype)) {
+                    isLiteralType = false;
+                  }
                 }
               });
               if (isLiteralType) {
@@ -61032,7 +61400,6 @@ var require_typeEvaluator = __commonJS({
         let protocolTypeParameters;
         const initSubclassArgs = [];
         let metaclassNode;
-        let isMetaclassDeferred = false;
         let exprFlags = 128 | 1024 | 262144 | 2048 | 8192 | 16384;
         if (fileInfo.isStubFile) {
           exprFlags |= 4;
@@ -61066,7 +61433,6 @@ var require_typeEvaluator = __commonJS({
                     dependency: argType,
                     callback: () => completeClassTypeDeferred(classType, node, node.name)
                   });
-                  isMetaclassDeferred = true;
                 }
                 if (types_1.ClassType.isBuiltIn(argType, "Protocol")) {
                   if (!fileInfo.isStubFile && !types_1.ClassType.isTypingExtensionClass(argType) && fileInfo.executionEnvironment.pythonVersion < pythonVersion_1.PythonVersion.V3_7) {
@@ -61288,7 +61654,12 @@ var require_typeEvaluator = __commonJS({
         for (let i = node.decorators.length - 1; i >= 0; i--) {
           const decorator = node.decorators[i];
           const newDecoratedType = applyClassDecorator(decoratedType, classType, decorator);
-          if ((0, typeUtils_1.containsUnknown)(newDecoratedType)) {
+          const unknownOrAny = (0, typeUtils_1.containsAnyOrUnknown)(
+            newDecoratedType,
+            /* recurse */
+            false
+          );
+          if (unknownOrAny && (0, types_1.isUnknown)(unknownOrAny)) {
             if (!foundUnknown) {
               addDiagnostic(fileInfo.diagnosticRuleSet.reportUntypedClassDecorator, diagnosticRules_1.DiagnosticRule.reportUntypedClassDecorator, localize_1.Localizer.Diagnostic.classDecoratorTypeUnknown(), node.decorators[i].expression);
               foundUnknown = true;
@@ -61374,9 +61745,6 @@ var require_typeEvaluator = __commonJS({
           0
           /* None */
         );
-        if (!isMetaclassDeferred) {
-          validateInitSubclassArgs(node, classType);
-        }
         return { classType, decoratedType };
       }
       function validateTypeParameterDefault(errorNode, typeParam, otherLiveTypeParams) {
@@ -61649,7 +62017,6 @@ var require_typeEvaluator = __commonJS({
           addError(localize_1.Localizer.Diagnostic.methodOrdering(), errorNode);
         }
         computeEffectiveMetaclass(type, errorNode);
-        validateInitSubclassArgs(node, type);
       }
       function validateInitSubclassArgs(node, classType) {
         const argList = [];
@@ -62066,7 +62433,12 @@ var require_typeEvaluator = __commonJS({
         for (let i = node.decorators.length - 1; i >= 0; i--) {
           const decorator = node.decorators[i];
           const newDecoratedType = applyFunctionDecorator(decoratedType, functionType, decorator, node);
-          if ((0, typeUtils_1.containsUnknown)(newDecoratedType)) {
+          const unknownOrAny = (0, typeUtils_1.containsAnyOrUnknown)(
+            newDecoratedType,
+            /* recurse */
+            false
+          );
+          if (unknownOrAny && (0, types_1.isUnknown)(unknownOrAny)) {
             if (!foundUnknown) {
               addDiagnostic(fileInfo.diagnosticRuleSet.reportUntypedFunctionDecorator, diagnosticRules_1.DiagnosticRule.reportUntypedFunctionDecorator, localize_1.Localizer.Diagnostic.functionDecoratorTypeUnknown(), node.decorators[i].expression);
               foundUnknown = true;
@@ -62174,7 +62546,13 @@ var require_typeEvaluator = __commonJS({
           if ((0, types_1.isNoneInstance)(defaultValueType) || (0, types_1.isClassInstance)(defaultValueType) && (0, symbolNameUtils_1.isPrivateOrProtectedName)(defaultValueType.details.name)) {
             inferredParamType = (0, types_1.combineTypes)([defaultValueType, types_1.UnknownType.create()]);
           } else {
-            if (!(0, types_1.isClassInstance)(defaultValueType) || !types_1.ClassType.isBuiltIn(defaultValueType, ["tuple", "list", "set", "dict"])) {
+            let skipInference = false;
+            if ((0, types_1.isFunction)(defaultValueType) || (0, types_1.isOverloadedFunction)(defaultValueType)) {
+              skipInference = true;
+            } else if ((0, types_1.isClassInstance)(defaultValueType) && types_1.ClassType.isBuiltIn(defaultValueType, ["tuple", "list", "set", "dict"])) {
+              skipInference = true;
+            }
+            if (!skipInference) {
               inferredParamType = stripLiteralValue(defaultValueType);
             }
           }
@@ -64073,7 +64451,7 @@ var require_typeEvaluator = __commonJS({
         return void 0;
       }
       function getDeclarationsForNameNode(node, skipUnreachableCode = true) {
-        var _a;
+        var _a, _b, _c;
         if (skipUnreachableCode && AnalyzerNodeInfo.isCodeUnreachable(node)) {
           return void 0;
         }
@@ -64155,7 +64533,7 @@ var require_typeEvaluator = __commonJS({
         } else if (node.parent && node.parent.nodeType === 1 && node === node.parent.name) {
           const argNode = node.parent;
           const paramName = node.value;
-          if (argNode.parent && argNode.parent.nodeType === 9) {
+          if (((_a = argNode.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 9) {
             const baseType = getType(argNode.parent.leftExpression);
             if (baseType) {
               if ((0, types_1.isFunction)(baseType) && baseType.details.declaration) {
@@ -64171,7 +64549,7 @@ var require_typeEvaluator = __commonJS({
                   }
                 });
               } else if ((0, types_1.isInstantiableClass)(baseType)) {
-                const initMethodType = (_a = getTypeOfObjectMember(
+                const initMethodType = (_b = getTypeOfObjectMember(
                   argNode.parent.leftExpression,
                   types_1.ClassType.cloneAsInstance(baseType),
                   "__init__",
@@ -64180,7 +64558,7 @@ var require_typeEvaluator = __commonJS({
                   void 0,
                   4
                   /* SkipObjectBaseClass */
-                )) === null || _a === void 0 ? void 0 : _a.type;
+                )) === null || _b === void 0 ? void 0 : _b.type;
                 if (initMethodType && (0, types_1.isFunction)(initMethodType)) {
                   const paramDecl = getDeclarationFromFunctionNamedParameter(initMethodType, paramName);
                   if (paramDecl) {
@@ -64194,6 +64572,11 @@ var require_typeEvaluator = __commonJS({
                 }
               }
             }
+          } else if (((_c = argNode.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 10) {
+            const classTypeResult = getTypeOfClass(argNode.parent);
+            if (classTypeResult) {
+              validateInitSubclassArgs(argNode.parent, classTypeResult.classType);
+            }
           }
         } else {
           const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
@@ -64956,7 +65339,7 @@ var require_typeEvaluator = __commonJS({
             type.inferredReturnType = returnType;
           }
         }
-        if (!isIncomplete && analyzeUnannotatedFunctions && (0, typeUtils_1.isPartlyUnknown)(returnType) && types_1.FunctionType.hasUnannotatedParams(type) && !types_1.FunctionType.isStubDefinition(type) && !types_1.FunctionType.isPyTypedDefinition(type) && args) {
+        if (!isIncomplete && analyzeUnannotatedFunctions && (0, typeUtils_1.isPartlyUnknown)(returnType) && types_1.FunctionType.hasUnannotatedParams(type) && !types_1.FunctionType.isStubDefinition(type) && !types_1.FunctionType.isPyTypedDefinition(type) && !types_1.FunctionType.isWrapReturnTypeInAwait(type) && args) {
           const contextualReturnType = getFunctionInferredReturnTypeUsingArguments(type, args);
           if (contextualReturnType) {
             returnType = contextualReturnType;
@@ -65275,10 +65658,7 @@ var require_typeEvaluator = __commonJS({
         });
         return isAssignable;
       }
-      function assignTupleTypeArgs(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
-        var _a, _b;
-        const destTypeArgs = [...(_a = destType.tupleTypeArguments) !== null && _a !== void 0 ? _a : []];
-        const srcTypeArgs = [...(_b = srcType.tupleTypeArguments) !== null && _b !== void 0 ? _b : []];
+      function adjustSourceTupleTypeArgs(destTypeArgs, srcTypeArgs) {
         const destVariadicIndex = destTypeArgs.findIndex((t) => (0, types_1.isVariadicTypeVar)(t.type));
         const destUnboundedIndex = destTypeArgs.findIndex((t) => t.isUnbounded);
         const srcUnboundedIndex = srcTypeArgs.findIndex((t) => t.isUnbounded);
@@ -65327,6 +65707,19 @@ var require_typeEvaluator = __commonJS({
             }
           }
         }
+      }
+      function assignTupleTypeArgs(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
+        var _a, _b;
+        const destTypeArgs = [...(_a = destType.tupleTypeArguments) !== null && _a !== void 0 ? _a : []];
+        const srcTypeArgs = [...(_b = srcType.tupleTypeArguments) !== null && _b !== void 0 ? _b : []];
+        let srcUnboundedIndex;
+        if (flags & 2) {
+          adjustSourceTupleTypeArgs(srcTypeArgs, destTypeArgs);
+          srcUnboundedIndex = destTypeArgs.findIndex((t) => t.isUnbounded);
+        } else {
+          adjustSourceTupleTypeArgs(destTypeArgs, srcTypeArgs);
+          srcUnboundedIndex = srcTypeArgs.findIndex((t) => t.isUnbounded);
+        }
         if (srcTypeArgs.length === destTypeArgs.length) {
           for (let argIndex = 0; argIndex < srcTypeArgs.length; argIndex++) {
             const entryDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
@@ -65396,6 +65789,13 @@ var require_typeEvaluator = __commonJS({
           effectiveFlags &= ~8;
           prevSrcType = curSrcType;
         }
+        if ((flags & 1) !== 0) {
+          const srcIsLiteral = srcType.literalValue !== void 0;
+          const destIsLiteral = destType.literalValue !== void 0;
+          if (srcIsLiteral !== destIsLiteral) {
+            return false;
+          }
+        }
         if (destType.typeArguments) {
           if (!verifyTypeArgumentsAssignable(destType, curSrcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
             return false;
@@ -65535,6 +65935,9 @@ var require_typeEvaluator = __commonJS({
         const transformedSrcType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(srcType);
         if (transformedDestType !== destType && (0, types_1.isUnion)(transformedDestType) || transformedSrcType !== srcType && (0, types_1.isUnion)(transformedSrcType)) {
           if (recursionCount > maxRecursiveTypeAliasRecursionCount) {
+            if ((0, types_1.isClassInstance)(srcType) && types_1.ClassType.isBuiltIn(srcType, "str") && (0, types_1.isUnion)(transformedDestType)) {
+              return transformedDestType.subtypes.some((subtype) => (0, types_1.isClassInstance)(subtype) && types_1.ClassType.isBuiltIn(subtype, ["object", "str"]));
+            }
             return true;
           }
         }
@@ -66407,7 +66810,7 @@ var require_typeEvaluator = __commonJS({
               void 0,
               srcTypeVarContext,
               destTypeVarContext,
-              flags ^ 2 | 512 | 128,
+              flags ^ 2 | 128,
               recursionCount
             );
             specializedDestType = (0, typeUtils_1.applySolvedTypeVars)(destType, destTypeVarContext);
@@ -66422,7 +66825,7 @@ var require_typeEvaluator = __commonJS({
               void 0,
               srcTypeVarContext,
               destTypeVarContext,
-              flags ^ 2 | 512 | 128,
+              flags ^ 2 | 128,
               recursionCount
             );
             specializedSrcType = (0, typeUtils_1.applySolvedTypeVars)(srcType, srcTypeVarContext);
@@ -66824,37 +67227,34 @@ var require_typeEvaluator = __commonJS({
             });
             const srcParamSpec = effectiveSrcType.details.paramSpec;
             const destParamSpec = effectiveDestType.details.paramSpec;
-            const targetTypeVarContext = (flags & 2) === 0 ? destTypeVarContext : srcTypeVarContext;
-            if (targetTypeVarContext.hasSolveForScope(destParamSpec.scopeId)) {
+            if (remainingParams.length > 0 || !srcParamSpec || !(0, types_1.isTypeSame)(srcParamSpec, destParamSpec, { ignoreTypeFlags: true })) {
               const remainingFunction = types_1.FunctionType.createInstance("", "", "", effectiveSrcType.details.flags | 64, effectiveSrcType.details.docString);
               remainingFunction.details.typeVarScopeId = effectiveSrcType.details.typeVarScopeId;
               remainingParams.forEach((param) => {
                 types_1.FunctionType.addParameter(remainingFunction, param);
               });
               remainingFunction.details.paramSpec = srcParamSpec ? (0, typeUtils_1.convertToInstance)(srcParamSpec) : void 0;
-              if (!(0, constraintSolver_1.assignTypeToTypeVar)(
-                evaluatorInterface,
+              if (!assignType(
                 destParamSpec,
                 remainingFunction,
                 /* diag */
                 void 0,
-                targetTypeVarContext
+                destTypeVarContext,
+                srcTypeVarContext,
+                flags
               )) {
-                if (remainingParams.length > 0 || !srcParamSpec || !(0, constraintSolver_1.assignTypeToTypeVar)(
-                  evaluatorInterface,
+                if (remainingParams.length > 0 || !srcParamSpec || !assignType(
                   destParamSpec,
                   (0, typeUtils_1.convertToInstance)(srcParamSpec),
                   /* diag */
                   void 0,
-                  targetTypeVarContext
+                  destTypeVarContext,
+                  srcTypeVarContext,
+                  flags
                 )) {
                   canAssign = false;
                 }
               }
-            } else {
-              if (!srcParamSpec || !(0, types_1.isTypeSame)(srcParamSpec, destParamSpec, { ignoreTypeFlags: true }) || remainingParams.length > 0) {
-                canAssign = false;
-              }
             }
           }
         }
@@ -66913,7 +67313,7 @@ var require_typeEvaluator = __commonJS({
             void 0,
             /* isTypeArgumentExplicit */
             false
-          ), declaredType, typeVarContext, ParseTreeUtils.getTypeVarScopesForNode(node));
+          ), declaredType, typeVarContext, ParseTreeUtils.getTypeVarScopesForNode(node), node.start);
           let replacedTypeArg = false;
           const newTypeArgs = assignedType.typeArguments.map((typeArg, index) => {
             const typeParam = assignedType.details.typeParameters[index];
@@ -66981,7 +67381,7 @@ var require_typeEvaluator = __commonJS({
         }
         return narrowedType;
       }
-      function validateOverrideMethod(baseMethod, overrideMethod, diag, enforceParamNames = true) {
+      function validateOverrideMethod(baseMethod, overrideMethod, baseClass, diag, enforceParamNames = true) {
         if (!(0, types_1.isFunction)(baseMethod) && !(0, types_1.isOverloadedFunction)(baseMethod)) {
           diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideType().format({ type: printType(baseMethod) }));
           return false;
@@ -66990,7 +67390,7 @@ var require_typeEvaluator = __commonJS({
           if ((0, types_1.isFunction)(overrideMethod)) {
             return validateOverrideMethodInternal(baseMethod, overrideMethod, diag, enforceParamNames);
           }
-          if (types_1.OverloadedFunctionType.getOverloads(overrideMethod).some((overrideOverload) => {
+          if (overrideMethod.overloads.some((overrideOverload) => {
             return validateOverrideMethodInternal(
               baseMethod,
               overrideOverload,
@@ -67001,24 +67401,75 @@ var require_typeEvaluator = __commonJS({
           })) {
             return true;
           }
-          const overrideImplementation = types_1.OverloadedFunctionType.getImplementation(overrideMethod);
-          if (overrideImplementation) {
-            if (validateOverrideMethodInternal(
-              baseMethod,
-              overrideImplementation,
-              /* diag */
-              void 0,
-              enforceParamNames
-            )) {
+          diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideNoOverloadMatches());
+          return false;
+        }
+        if ((0, types_1.isFunction)(overrideMethod)) {
+          return types_1.OverloadedFunctionType.getOverloads(baseMethod).every((overload) => {
+            if (baseClass && !isOverrideMethodApplicable(overload, baseClass)) {
               return true;
             }
+            return validateOverrideMethodInternal(overload, overrideMethod, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), enforceParamNames);
+          });
+        }
+        let previousMatchIndex = -1;
+        let overrideOverloadIndex = 0;
+        const baseOverloads = types_1.OverloadedFunctionType.getOverloads(baseMethod);
+        for (const overrideOverload of types_1.OverloadedFunctionType.getOverloads(overrideMethod)) {
+          const matchIndex = baseOverloads.findIndex((baseOverload) => {
+            if (baseClass && !isOverrideMethodApplicable(baseOverload, baseClass)) {
+              return false;
+            }
+            return validateOverrideMethodInternal(
+              baseOverload,
+              overrideOverload,
+              /* diag */
+              void 0,
+              enforceParamNames,
+              /* exemptSelfClsParam */
+              false
+            );
+          });
+          if (matchIndex < 0) {
+            diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideOverloadNoMatch().format({ index: overrideOverloadIndex }));
+            return false;
           }
-          diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideNoOverloadMatches());
-          return false;
+          if (matchIndex < previousMatchIndex) {
+            diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideOverloadOrder());
+            return false;
+          }
+          previousMatchIndex = matchIndex;
+          overrideOverloadIndex++;
         }
         return true;
       }
-      function validateOverrideMethodInternal(baseMethod, overrideMethod, diag, enforceParamNames) {
+      function isOverrideMethodApplicable(baseMethod, childClass) {
+        if (!types_1.FunctionType.isInstanceMethod(baseMethod) && !types_1.FunctionType.isClassMethod(baseMethod) && !types_1.FunctionType.isConstructorMethod(baseMethod)) {
+          return true;
+        }
+        const baseParamDetails = (0, parameterUtils_1.getParameterListDetails)(baseMethod);
+        if (baseParamDetails.params.length === 0) {
+          return true;
+        }
+        const baseParamType = baseParamDetails.params[0].param;
+        if (baseParamType.category !== 0 || !baseParamType.hasDeclaredType) {
+          return true;
+        }
+        const childSelfOrClsType = types_1.FunctionType.isInstanceMethod(baseMethod) ? types_1.ClassType.cloneAsInstance(childClass) : childClass;
+        return assignType(
+          baseParamType.type,
+          childSelfOrClsType,
+          /* diag */
+          void 0,
+          /* destTypeVarContext */
+          void 0,
+          /* srcTypeVarContext */
+          void 0,
+          8
+          /* SkipSolveTypeVars */
+        );
+      }
+      function validateOverrideMethodInternal(baseMethod, overrideMethod, diag, enforceParamNames, exemptSelfClsParam = true) {
         var _a, _b;
         const baseParamDetails = (0, parameterUtils_1.getParameterListDetails)(baseMethod);
         const overrideParamDetails = (0, parameterUtils_1.getParameterListDetails)(overrideMethod);
@@ -67034,8 +67485,7 @@ var require_typeEvaluator = __commonJS({
               diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideNotClassMethod());
               canOverride = false;
             }
-          }
-          if (types_1.FunctionType.isInstanceMethod(baseMethod)) {
+          } else if (types_1.FunctionType.isInstanceMethod(baseMethod)) {
             if (!types_1.FunctionType.isInstanceMethod(overrideMethod)) {
               diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideNotInstanceMethod());
               canOverride = false;
@@ -67083,7 +67533,7 @@ var require_typeEvaluator = __commonJS({
           }
           const positionalParamCount = Math.min(baseParamDetails.positionParamCount, overrideParamDetails.positionParamCount);
           for (let i = 0; i < positionalParamCount; i++) {
-            if (i === 0) {
+            if (i === 0 && exemptSelfClsParam) {
               if (types_1.FunctionType.isInstanceMethod(overrideMethod) || types_1.FunctionType.isClassMethod(overrideMethod) || types_1.FunctionType.isConstructorMethod(overrideMethod)) {
                 continue;
               }
@@ -67121,7 +67571,7 @@ var require_typeEvaluator = __commonJS({
               const overrideParamType = overrideParamDetails.params[i].type;
               const baseIsSynthesizedTypeVar = (0, types_1.isTypeVar)(baseParamType) && baseParamType.details.isSynthesized;
               const overrideIsSynthesizedTypeVar = (0, types_1.isTypeVar)(overrideParamType) && overrideParamType.details.isSynthesized;
-              if (!baseIsSynthesizedTypeVar && !overrideIsSynthesizedTypeVar) {
+              if (!exemptSelfClsParam || !baseIsSynthesizedTypeVar && !overrideIsSynthesizedTypeVar) {
                 if (baseParam.category !== overrideParam.category || !assignType(
                   overrideParamType,
                   baseParamType,
@@ -67179,13 +67629,13 @@ var require_typeEvaluator = __commonJS({
             (paramInfo) => paramInfo.source === parameterUtils_1.ParameterSource.KeywordOnly && paramInfo.param.category === 0
             /* Simple */
           );
-          const overrideWkOnlyParams = overrideParamDetails.params.filter(
+          const overrideKwOnlyParams = overrideParamDetails.params.filter(
             (paramInfo) => paramInfo.source === parameterUtils_1.ParameterSource.KeywordOnly && paramInfo.param.category === 0
             /* Simple */
           );
           baseKwOnlyParams.forEach((paramInfo) => {
             var _a2, _b2, _c;
-            const overrideParamInfo = overrideWkOnlyParams.find((pi) => paramInfo.param.name === pi.param.name);
+            const overrideParamInfo = overrideKwOnlyParams.find((pi) => paramInfo.param.name === pi.param.name);
             if (!overrideParamInfo && overrideParamDetails.kwargsIndex === void 0) {
               diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNameMissing().format({
                 name: (_a2 = paramInfo.param.name) !== null && _a2 !== void 0 ? _a2 : "?"
@@ -67223,7 +67673,7 @@ var require_typeEvaluator = __commonJS({
               }
             }
           });
-          overrideWkOnlyParams.forEach((paramInfo) => {
+          overrideKwOnlyParams.forEach((paramInfo) => {
             var _a2;
             const baseParamInfo = baseKwOnlyParams.find((pi) => paramInfo.param.name === pi.param.name);
             if (!baseParamInfo) {
@@ -67672,6 +68122,7 @@ var require_typeEvaluator = __commonJS({
         verifyRaiseExceptionType,
         verifyDeleteExpression,
         validateOverloadedFunctionArguments,
+        validateInitSubclassArgs,
         isAfterNodeReachable,
         isNodeReachable,
         isAsymmetricDescriptorAssignment: isAsymmetricAccessorAssignment,
@@ -67719,6 +68170,7 @@ var require_typeEvaluator = __commonJS({
         getBuiltInObject,
         getTypingType,
         verifyTypeArgumentsAssignable,
+        reportMissingTypeArguments,
         inferReturnTypeIfNecessary,
         inferTypeParameterVarianceForClass,
         isFinalVariable,
@@ -67953,6 +68405,7 @@ var require_checker = __commonJS({
           if (types_1.ClassType.isEnumClass(classTypeResult.classType)) {
             this._validateEnumClassOverride(node, classTypeResult.classType);
           }
+          this._evaluator.validateInitSubclassArgs(node, classTypeResult.classType);
         }
         this._scopedNodes.push(node);
         return false;
@@ -71102,6 +71555,8 @@ var require_checker = __commonJS({
             if (!this._evaluator.validateOverrideMethod(
               overriddenType,
               overrideFunction,
+              /* baseClass */
+              void 0,
               diagAddendum,
               /* enforceParamNameMatch */
               true
@@ -71173,6 +71628,7 @@ var require_checker = __commonJS({
             if (!mroBaseClass) {
               continue;
             }
+            (0, debug_1.assert)((0, types_1.isClass)(mroBaseClass));
             const baseClassAndSymbol = (0, typeUtils_1.lookUpClassMember)(
               mroBaseClass,
               name,
@@ -71274,7 +71730,7 @@ var require_checker = __commonJS({
             const exemptMethods = ["__init__", "__new__", "__init_subclass__"];
             const enforceParamNameMatch = !SymbolNameUtils.isDunderName(memberName);
             if (!exemptMethods.some((exempt) => exempt === memberName) && !SymbolNameUtils.isPrivateName(memberName)) {
-              if (!this._evaluator.validateOverrideMethod(baseType, overrideType, diagAddendum, enforceParamNameMatch)) {
+              if (!this._evaluator.validateOverrideMethod(baseType, overrideType, childClassType, diagAddendum, enforceParamNameMatch)) {
                 const decl = (0, types_1.isFunction)(overrideType) && overrideType.details.declaration ? overrideType.details.declaration : (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(overrideSymbol);
                 if (decl) {
                   const diag = this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportIncompatibleMethodOverride, diagnosticRules_1.DiagnosticRule.reportIncompatibleMethodOverride, localize_1.Localizer.Diagnostic.incompatibleMethodOverride().format({
@@ -71358,7 +71814,7 @@ var require_checker = __commonJS({
                   } else {
                     const subclassMethodType = (0, typeUtils_1.partiallySpecializeType)(this._evaluator.getEffectiveTypeOfSymbol(subclassPropMethod), childClassType);
                     if ((0, types_1.isFunction)(subclassMethodType)) {
-                      if (!this._evaluator.validateOverrideMethod(baseClassMethodType, subclassMethodType, diagAddendum.createAddendum())) {
+                      if (!this._evaluator.validateOverrideMethod(baseClassMethodType, subclassMethodType, childClassType, diagAddendum.createAddendum())) {
                         diagAddendum.addMessage(localize_1.Localizer.DiagnosticAddendum.propertyMethodIncompatible().format({
                           name: methodName
                         }));
@@ -71615,6 +72071,9 @@ var require_checker = __commonJS({
         if ((0, types_1.isClassInstance)(paramType) && types_1.ClassType.isProtocolClass(paramType)) {
           return;
         }
+        if (paramInfo.category === 1 && (0, types_1.isParamSpec)(paramInfo.type) && paramInfo.type.paramSpecAccess === "args") {
+          return;
+        }
         if (types_1.FunctionType.isOverloaded(functionType)) {
           return;
         }
@@ -71637,39 +72096,52 @@ var require_checker = __commonJS({
           }
         }
       }
+      // Determines whether a yield or yield from node is compatible with the
+      // return type annotation of the containing function.
       _validateYieldType(node, yieldType) {
-        let declaredReturnType;
-        let declaredYieldType;
+        var _a;
         const enclosingFunctionNode = ParseTreeUtils.getEnclosingFunction(node);
-        if (enclosingFunctionNode) {
-          const functionTypeResult = this._evaluator.getTypeOfFunction(enclosingFunctionNode);
-          if (functionTypeResult) {
-            (0, debug_1.assert)((0, types_1.isFunction)(functionTypeResult.functionType));
-            declaredReturnType = types_1.FunctionType.getSpecializedReturnType(functionTypeResult.functionType);
-            if (declaredReturnType) {
-              declaredYieldType = (0, typeUtils_1.getGeneratorYieldType)(declaredReturnType, !!enclosingFunctionNode.isAsync);
-            }
-            if (declaredReturnType && !declaredYieldType && enclosingFunctionNode.returnTypeAnnotation) {
-              this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, enclosingFunctionNode.isAsync ? localize_1.Localizer.Diagnostic.generatorAsyncReturnType() : localize_1.Localizer.Diagnostic.generatorSyncReturnType(), enclosingFunctionNode.returnTypeAnnotation);
-            }
-          }
+        if (!enclosingFunctionNode || !enclosingFunctionNode.returnTypeAnnotation) {
+          return;
         }
-        if (this._evaluator.isNodeReachable(
+        const functionTypeResult = this._evaluator.getTypeOfFunction(enclosingFunctionNode);
+        if (!functionTypeResult) {
+          return;
+        }
+        const declaredReturnType = types_1.FunctionType.getSpecializedReturnType(functionTypeResult.functionType);
+        if (!declaredReturnType) {
+          return;
+        }
+        let generatorType;
+        if (!enclosingFunctionNode.isAsync && (0, types_1.isClassInstance)(declaredReturnType) && types_1.ClassType.isBuiltIn(declaredReturnType, "AwaitableGenerator")) {
+          generatorType = this._evaluator.getTypingType(node, "AwaitableGenerator");
+        } else {
+          generatorType = this._evaluator.getTypingType(node, enclosingFunctionNode.isAsync ? "AsyncGenerator" : "Generator");
+        }
+        if (!generatorType || !(0, types_1.isInstantiableClass)(generatorType)) {
+          return;
+        }
+        if (!this._evaluator.isNodeReachable(
           node,
           /* sourceNode */
           void 0
         )) {
-          if (declaredReturnType && (0, types_1.isNever)(declaredReturnType)) {
-            this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.noReturnContainsYield(), node);
-          } else if (declaredYieldType) {
-            const diagAddendum = new diagnostic_1.DiagnosticAddendum();
-            if (!this._evaluator.assignType(declaredYieldType, yieldType, diagAddendum)) {
-              this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.yieldTypeMismatch().format({
-                exprType: this._evaluator.printType(yieldType),
-                yieldType: this._evaluator.printType(declaredYieldType)
-              }) + diagAddendum.getString(), node.expression || node);
-            }
-          }
+          return;
+        }
+        if ((0, types_1.isNever)(declaredReturnType)) {
+          this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.noReturnContainsYield(), node);
+          return;
+        }
+        const specializedGenerator = types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForSpecialization(
+          generatorType,
+          [yieldType],
+          /* isTypeArgumentExplicit */
+          true
+        ));
+        const diagAddendum = new diagnostic_1.DiagnosticAddendum();
+        if (!this._evaluator.assignType(declaredReturnType, specializedGenerator, diagAddendum)) {
+          const errorMessage = enclosingFunctionNode.isAsync ? localize_1.Localizer.Diagnostic.generatorAsyncReturnType() : localize_1.Localizer.Diagnostic.generatorSyncReturnType();
+          this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, errorMessage.format({ yieldType: this._evaluator.printType(yieldType) }) + diagAddendum.getString(), (_a = node.expression) !== null && _a !== void 0 ? _a : node);
         }
       }
       // Determines whether any of the except statements are unreachable because
@@ -72242,6 +72714,7 @@ var require_sourceFile = __commonJS({
         this.checkerDiagnostics = [];
         this.typeIgnoreLines = /* @__PURE__ */ new Map();
         this.pyrightIgnoreLines = /* @__PURE__ */ new Map();
+        this.accumulatedDiagnostics = [];
         this.circularDependencies = [];
         this.noCircularDependencyConfirmed = false;
         this.isBindingNeeded = true;
@@ -72310,154 +72783,7 @@ var require_sourceFile = __commonJS({
         if (this._writableData.diagnosticVersion === prevDiagnosticVersion) {
           return void 0;
         }
-        let includeWarningsAndErrors = true;
-        if (this._isThirdPartyImport) {
-          includeWarningsAndErrors = false;
-        }
-        let diagList = [];
-        (0, collectionUtils_1.appendArray)(diagList, this._writableData.parseDiagnostics);
-        (0, collectionUtils_1.appendArray)(diagList, this._writableData.commentDiagnostics);
-        (0, collectionUtils_1.appendArray)(diagList, this._writableData.bindDiagnostics);
-        (0, collectionUtils_1.appendArray)(diagList, this._writableData.checkerDiagnostics);
-        const prefilteredDiagList = diagList;
-        const typeIgnoreLinesClone = new Map(this._writableData.typeIgnoreLines);
-        const pyrightIgnoreLinesClone = new Map(this._writableData.pyrightIgnoreLines);
-        if (this._diagnosticRuleSet.enableTypeIgnoreComments) {
-          if (this._writableData.typeIgnoreLines.size > 0) {
-            diagList = diagList.filter((d) => {
-              if (d.category !== 3 && d.category !== 4 && d.category !== 5) {
-                for (let line = d.range.start.line; line <= d.range.end.line; line++) {
-                  if (this._writableData.typeIgnoreLines.has(line)) {
-                    typeIgnoreLinesClone.delete(line);
-                    return false;
-                  }
-                }
-              }
-              return true;
-            });
-          }
-        }
-        if (this._writableData.pyrightIgnoreLines.size > 0) {
-          diagList = diagList.filter((d) => {
-            if (d.category !== 4 && d.category !== 5) {
-              for (let line = d.range.start.line; line <= d.range.end.line; line++) {
-                const pyrightIgnoreComment = this._writableData.pyrightIgnoreLines.get(line);
-                if (pyrightIgnoreComment) {
-                  if (!pyrightIgnoreComment.rulesList) {
-                    pyrightIgnoreLinesClone.delete(line);
-                    return false;
-                  }
-                  const diagRule = d.getRule();
-                  if (!diagRule) {
-                    return true;
-                  }
-                  if (pyrightIgnoreComment.rulesList.find((rule) => rule.text === diagRule)) {
-                    const oldClone = pyrightIgnoreLinesClone.get(line);
-                    if (oldClone === null || oldClone === void 0 ? void 0 : oldClone.rulesList) {
-                      const filteredRulesList = oldClone.rulesList.filter((rule) => rule.text !== diagRule);
-                      if (filteredRulesList.length === 0) {
-                        pyrightIgnoreLinesClone.delete(line);
-                      } else {
-                        pyrightIgnoreLinesClone.set(line, {
-                          range: oldClone.range,
-                          rulesList: filteredRulesList
-                        });
-                      }
-                    }
-                    return false;
-                  }
-                  return true;
-                }
-              }
-            }
-            return true;
-          });
-        }
-        const unnecessaryTypeIgnoreDiags = [];
-        if (this._diagnosticRuleSet.reportUnnecessaryTypeIgnoreComment !== "none" && !this._writableData.isCheckingNeeded) {
-          const diagCategory = (0, diagnostic_1.convertLevelToCategory)(this._diagnosticRuleSet.reportUnnecessaryTypeIgnoreComment);
-          const prefilteredErrorList = prefilteredDiagList.filter(
-            (diag) => diag.category === 0 || diag.category === 1 || diag.category === 2
-            /* Information */
-          );
-          const isUnreachableCodeRange = (range) => {
-            return prefilteredDiagList.find((diag) => diag.category === 4 && diag.range.start.line <= range.start.line && diag.range.end.line >= range.end.line);
-          };
-          if (prefilteredErrorList.length === 0 && this._writableData.typeIgnoreAll !== void 0) {
-            const rangeStart = this._writableData.typeIgnoreAll.range.start;
-            const rangeEnd = rangeStart + this._writableData.typeIgnoreAll.range.length;
-            const range = (0, positionUtils_1.convertOffsetsToRange)(rangeStart, rangeEnd, this._writableData.parseResults.tokenizerOutput.lines);
-            if (!isUnreachableCodeRange(range) && this._diagnosticRuleSet.enableTypeIgnoreComments) {
-              unnecessaryTypeIgnoreDiags.push(new diagnostic_1.Diagnostic(diagCategory, localize_1.Localizer.Diagnostic.unnecessaryTypeIgnore(), range));
-            }
-          }
-          typeIgnoreLinesClone.forEach((ignoreComment) => {
-            var _a;
-            if ((_a = this._writableData.parseResults) === null || _a === void 0 ? void 0 : _a.tokenizerOutput.lines) {
-              const rangeStart = ignoreComment.range.start;
-              const rangeEnd = rangeStart + ignoreComment.range.length;
-              const range = (0, positionUtils_1.convertOffsetsToRange)(rangeStart, rangeEnd, this._writableData.parseResults.tokenizerOutput.lines);
-              if (!isUnreachableCodeRange(range) && this._diagnosticRuleSet.enableTypeIgnoreComments) {
-                unnecessaryTypeIgnoreDiags.push(new diagnostic_1.Diagnostic(diagCategory, localize_1.Localizer.Diagnostic.unnecessaryTypeIgnore(), range));
-              }
-            }
-          });
-          pyrightIgnoreLinesClone.forEach((ignoreComment) => {
-            var _a;
-            if ((_a = this._writableData.parseResults) === null || _a === void 0 ? void 0 : _a.tokenizerOutput.lines) {
-              if (!ignoreComment.rulesList) {
-                const rangeStart = ignoreComment.range.start;
-                const rangeEnd = rangeStart + ignoreComment.range.length;
-                const range = (0, positionUtils_1.convertOffsetsToRange)(rangeStart, rangeEnd, this._writableData.parseResults.tokenizerOutput.lines);
-                if (!isUnreachableCodeRange(range)) {
-                  unnecessaryTypeIgnoreDiags.push(new diagnostic_1.Diagnostic(diagCategory, localize_1.Localizer.Diagnostic.unnecessaryPyrightIgnore(), range));
-                }
-              } else {
-                ignoreComment.rulesList.forEach((unusedRule) => {
-                  const rangeStart = unusedRule.range.start;
-                  const rangeEnd = rangeStart + unusedRule.range.length;
-                  const range = (0, positionUtils_1.convertOffsetsToRange)(rangeStart, rangeEnd, this._writableData.parseResults.tokenizerOutput.lines);
-                  if (!isUnreachableCodeRange(range)) {
-                    unnecessaryTypeIgnoreDiags.push(new diagnostic_1.Diagnostic(diagCategory, localize_1.Localizer.Diagnostic.unnecessaryPyrightIgnoreRule().format({
-                      name: unusedRule.text
-                    }), range));
-                  }
-                });
-              }
-            }
-          });
-        }
-        if (this._diagnosticRuleSet.reportImportCycles !== "none" && this._writableData.circularDependencies.length > 0) {
-          const category = (0, diagnostic_1.convertLevelToCategory)(this._diagnosticRuleSet.reportImportCycles);
-          this._writableData.circularDependencies.forEach((cirDep) => {
-            const diag = new diagnostic_1.Diagnostic(category, localize_1.Localizer.Diagnostic.importCycleDetected() + "\n" + cirDep.getPaths().map((path12) => "  " + path12).join("\n"), (0, textRange_1.getEmptyRange)());
-            diag.setRule(diagnosticRules_1.DiagnosticRule.reportImportCycles);
-            diagList.push(diag);
-          });
-        }
-        if (this._writableData.hitMaxImportDepth !== void 0) {
-          diagList.push(new diagnostic_1.Diagnostic(0, localize_1.Localizer.Diagnostic.importDepthExceeded().format({ depth: this._writableData.hitMaxImportDepth }), (0, textRange_1.getEmptyRange)()));
-        }
-        this._addTaskListDiagnostics(options.taskListTokens, diagList);
-        if (options.ignore.find((ignoreFileSpec) => ignoreFileSpec.regExp.test(this._realFilePath))) {
-          diagList = [];
-        }
-        if (this._diagnosticRuleSet.enableTypeIgnoreComments) {
-          if (this._writableData.typeIgnoreAll !== void 0) {
-            diagList = diagList.filter(
-              (diag) => diag.category !== 0 && diag.category !== 1 && diag.category !== 2
-              /* Information */
-            );
-          }
-        }
-        diagList = diagList.concat(unnecessaryTypeIgnoreDiags);
-        if (!includeWarningsAndErrors) {
-          diagList = diagList.filter(
-            (diag) => diag.category === 3 || diag.category === 4 || diag.category === 5
-            /* Deprecated */
-          );
-        }
-        return diagList;
+        return this._writableData.accumulatedDiagnostics;
       }
       getImports() {
         return this._writableData.imports || [];
@@ -72604,7 +72930,7 @@ var require_sourceFile = __commonJS({
       }
       // Adds a new circular dependency for this file but only if
       // it hasn't already been added.
-      addCircularDependency(circDependency) {
+      addCircularDependency(configOptions, circDependency) {
         let updatedDependencyList = false;
         if (this._writableData.circularDependencies.length < _maxImportCyclesPerFile) {
           if (!this._writableData.circularDependencies.some((dep) => dep.isEqual(circDependency))) {
@@ -72613,7 +72939,7 @@ var require_sourceFile = __commonJS({
           }
         }
         if (updatedDependencyList) {
-          this._writableData.diagnosticVersion++;
+          this._recomputeDiagnostics(configOptions);
         }
       }
       setNoCircularDependencyConfirmed() {
@@ -72711,7 +73037,7 @@ var require_sourceFile = __commonJS({
           this._writableData.isCheckingNeeded = true;
           this._writableData.parseTreeNeedsCleaning = false;
           this._writableData.hitMaxImportDepth = void 0;
-          this._writableData.diagnosticVersion++;
+          this._recomputeDiagnostics(configOptions);
           return true;
         });
       }
@@ -72747,12 +73073,12 @@ var require_sourceFile = __commonJS({
           } finally {
             this._writableData.isBindingInProgress = false;
           }
-          this._writableData.diagnosticVersion++;
           this._writableData.isCheckingNeeded = true;
           this._writableData.isBindingNeeded = false;
+          this._recomputeDiagnostics(configOptions);
         });
       }
-      check(importResolver, evaluator, sourceMapper, dependentFiles) {
+      check(configOptions, importResolver, evaluator, sourceMapper, dependentFiles) {
         (0, debug_1.assert)(!this.isParseRequired(), "Check called before parsing");
         (0, debug_1.assert)(!this.isBindingRequired(), "Check called before binding");
         (0, debug_1.assert)(!this._writableData.isBindingInProgress, "Check called while binding in progress");
@@ -72782,13 +73108,166 @@ var require_sourceFile = __commonJS({
             throw e;
           } finally {
             this._writableData.circularDependencies = [];
-            this._writableData.diagnosticVersion++;
+            this._recomputeDiagnostics(configOptions);
           }
         });
       }
       test_enableIPythonMode(enable) {
         this._ipythonMode = enable ? IPythonMode.CellDocs : IPythonMode.None;
       }
+      // Computes an updated set of accumulated diagnostics for the file
+      // based on the partial diagnostics from various analysis stages.
+      _recomputeDiagnostics(configOptions) {
+        this._writableData.diagnosticVersion++;
+        let includeWarningsAndErrors = true;
+        if (this._isThirdPartyImport) {
+          includeWarningsAndErrors = false;
+        }
+        let diagList = [];
+        (0, collectionUtils_1.appendArray)(diagList, this._writableData.parseDiagnostics);
+        (0, collectionUtils_1.appendArray)(diagList, this._writableData.commentDiagnostics);
+        (0, collectionUtils_1.appendArray)(diagList, this._writableData.bindDiagnostics);
+        (0, collectionUtils_1.appendArray)(diagList, this._writableData.checkerDiagnostics);
+        const prefilteredDiagList = diagList;
+        const typeIgnoreLinesClone = new Map(this._writableData.typeIgnoreLines);
+        const pyrightIgnoreLinesClone = new Map(this._writableData.pyrightIgnoreLines);
+        if (this._diagnosticRuleSet.enableTypeIgnoreComments) {
+          if (this._writableData.typeIgnoreLines.size > 0) {
+            diagList = diagList.filter((d) => {
+              if (d.category !== 3 && d.category !== 4 && d.category !== 5) {
+                for (let line = d.range.start.line; line <= d.range.end.line; line++) {
+                  if (this._writableData.typeIgnoreLines.has(line)) {
+                    typeIgnoreLinesClone.delete(line);
+                    return false;
+                  }
+                }
+              }
+              return true;
+            });
+          }
+        }
+        if (this._writableData.pyrightIgnoreLines.size > 0) {
+          diagList = diagList.filter((d) => {
+            if (d.category !== 4 && d.category !== 5) {
+              for (let line = d.range.start.line; line <= d.range.end.line; line++) {
+                const pyrightIgnoreComment = this._writableData.pyrightIgnoreLines.get(line);
+                if (pyrightIgnoreComment) {
+                  if (!pyrightIgnoreComment.rulesList) {
+                    pyrightIgnoreLinesClone.delete(line);
+                    return false;
+                  }
+                  const diagRule = d.getRule();
+                  if (!diagRule) {
+                    return true;
+                  }
+                  if (pyrightIgnoreComment.rulesList.find((rule) => rule.text === diagRule)) {
+                    const oldClone = pyrightIgnoreLinesClone.get(line);
+                    if (oldClone === null || oldClone === void 0 ? void 0 : oldClone.rulesList) {
+                      const filteredRulesList = oldClone.rulesList.filter((rule) => rule.text !== diagRule);
+                      if (filteredRulesList.length === 0) {
+                        pyrightIgnoreLinesClone.delete(line);
+                      } else {
+                        pyrightIgnoreLinesClone.set(line, {
+                          range: oldClone.range,
+                          rulesList: filteredRulesList
+                        });
+                      }
+                    }
+                    return false;
+                  }
+                  return true;
+                }
+              }
+            }
+            return true;
+          });
+        }
+        const unnecessaryTypeIgnoreDiags = [];
+        if (this._diagnosticRuleSet.reportUnnecessaryTypeIgnoreComment !== "none" && !this._writableData.isCheckingNeeded) {
+          const diagCategory = (0, diagnostic_1.convertLevelToCategory)(this._diagnosticRuleSet.reportUnnecessaryTypeIgnoreComment);
+          const prefilteredErrorList = prefilteredDiagList.filter(
+            (diag) => diag.category === 0 || diag.category === 1 || diag.category === 2
+            /* Information */
+          );
+          const isUnreachableCodeRange = (range) => {
+            return prefilteredDiagList.find((diag) => diag.category === 4 && diag.range.start.line <= range.start.line && diag.range.end.line >= range.end.line);
+          };
+          if (prefilteredErrorList.length === 0 && this._writableData.typeIgnoreAll !== void 0) {
+            const rangeStart = this._writableData.typeIgnoreAll.range.start;
+            const rangeEnd = rangeStart + this._writableData.typeIgnoreAll.range.length;
+            const range = (0, positionUtils_1.convertOffsetsToRange)(rangeStart, rangeEnd, this._writableData.parseResults.tokenizerOutput.lines);
+            if (!isUnreachableCodeRange(range) && this._diagnosticRuleSet.enableTypeIgnoreComments) {
+              unnecessaryTypeIgnoreDiags.push(new diagnostic_1.Diagnostic(diagCategory, localize_1.Localizer.Diagnostic.unnecessaryTypeIgnore(), range));
+            }
+          }
+          typeIgnoreLinesClone.forEach((ignoreComment) => {
+            var _a;
+            if ((_a = this._writableData.parseResults) === null || _a === void 0 ? void 0 : _a.tokenizerOutput.lines) {
+              const rangeStart = ignoreComment.range.start;
+              const rangeEnd = rangeStart + ignoreComment.range.length;
+              const range = (0, positionUtils_1.convertOffsetsToRange)(rangeStart, rangeEnd, this._writableData.parseResults.tokenizerOutput.lines);
+              if (!isUnreachableCodeRange(range) && this._diagnosticRuleSet.enableTypeIgnoreComments) {
+                unnecessaryTypeIgnoreDiags.push(new diagnostic_1.Diagnostic(diagCategory, localize_1.Localizer.Diagnostic.unnecessaryTypeIgnore(), range));
+              }
+            }
+          });
+          pyrightIgnoreLinesClone.forEach((ignoreComment) => {
+            var _a;
+            if ((_a = this._writableData.parseResults) === null || _a === void 0 ? void 0 : _a.tokenizerOutput.lines) {
+              if (!ignoreComment.rulesList) {
+                const rangeStart = ignoreComment.range.start;
+                const rangeEnd = rangeStart + ignoreComment.range.length;
+                const range = (0, positionUtils_1.convertOffsetsToRange)(rangeStart, rangeEnd, this._writableData.parseResults.tokenizerOutput.lines);
+                if (!isUnreachableCodeRange(range)) {
+                  unnecessaryTypeIgnoreDiags.push(new diagnostic_1.Diagnostic(diagCategory, localize_1.Localizer.Diagnostic.unnecessaryPyrightIgnore(), range));
+                }
+              } else {
+                ignoreComment.rulesList.forEach((unusedRule) => {
+                  const rangeStart = unusedRule.range.start;
+                  const rangeEnd = rangeStart + unusedRule.range.length;
+                  const range = (0, positionUtils_1.convertOffsetsToRange)(rangeStart, rangeEnd, this._writableData.parseResults.tokenizerOutput.lines);
+                  if (!isUnreachableCodeRange(range)) {
+                    unnecessaryTypeIgnoreDiags.push(new diagnostic_1.Diagnostic(diagCategory, localize_1.Localizer.Diagnostic.unnecessaryPyrightIgnoreRule().format({
+                      name: unusedRule.text
+                    }), range));
+                  }
+                });
+              }
+            }
+          });
+        }
+        if (this._diagnosticRuleSet.reportImportCycles !== "none" && this._writableData.circularDependencies.length > 0) {
+          const category = (0, diagnostic_1.convertLevelToCategory)(this._diagnosticRuleSet.reportImportCycles);
+          this._writableData.circularDependencies.forEach((cirDep) => {
+            const diag = new diagnostic_1.Diagnostic(category, localize_1.Localizer.Diagnostic.importCycleDetected() + "\n" + cirDep.getPaths().map((path12) => "  " + path12).join("\n"), (0, textRange_1.getEmptyRange)());
+            diag.setRule(diagnosticRules_1.DiagnosticRule.reportImportCycles);
+            diagList.push(diag);
+          });
+        }
+        if (this._writableData.hitMaxImportDepth !== void 0) {
+          diagList.push(new diagnostic_1.Diagnostic(0, localize_1.Localizer.Diagnostic.importDepthExceeded().format({ depth: this._writableData.hitMaxImportDepth }), (0, textRange_1.getEmptyRange)()));
+        }
+        this._addTaskListDiagnostics(configOptions.taskListTokens, diagList);
+        if (configOptions.ignore.find((ignoreFileSpec) => ignoreFileSpec.regExp.test(this._realFilePath))) {
+          diagList = [];
+        }
+        if (this._diagnosticRuleSet.enableTypeIgnoreComments) {
+          if (this._writableData.typeIgnoreAll !== void 0) {
+            diagList = diagList.filter(
+              (diag) => diag.category !== 0 && diag.category !== 1 && diag.category !== 2
+              /* Information */
+            );
+          }
+        }
+        diagList = diagList.concat(unnecessaryTypeIgnoreDiags);
+        if (!includeWarningsAndErrors) {
+          diagList = diagList.filter(
+            (diag) => diag.category === 3 || diag.category === 4 || diag.category === 5
+            /* Deprecated */
+          );
+        }
+        this._writableData.accumulatedDiagnostics = diagList;
+      }
       _cachePreEditState() {
         if (this._writableData.clientDocumentContents !== void 0) {
           if (this._isEditMode && !this._preEditData) {
@@ -72798,7 +73277,7 @@ var require_sourceFile = __commonJS({
         }
       }
       // Get all task list diagnostics for the current file and add them
-      // to the specified diagnostic list
+      // to the specified diagnostic list.
       _addTaskListDiagnostics(taskListTokens, diagList) {
         var _a, _b;
         if (!taskListTokens || taskListTokens.length === 0 || !diagList) {
@@ -73868,6 +74347,13 @@ var require_tokenizer = __commonJS({
         );
         this._tokens.push(tokenizerTypes_1.Token.create(1, this._cs.position, 0, this._getComments()));
         this._addLineRange();
+        if (this._lineRanges.length > 0) {
+          const lastLine = this._lineRanges[this._lineRanges.length - 1];
+          const lastCharOfLastLine = text.charCodeAt(lastLine.start + lastLine.length - 1);
+          if (lastCharOfLastLine === 13 || lastCharOfLastLine === 10) {
+            this._lineRanges.push({ start: this._cs.position, length: 0 });
+          }
+        }
         let predominantEndOfLineSequence = "\n";
         if (this._crCount > this._crLfCount && this._crCount > this._lfCount) {
           predominantEndOfLineSequence = "\r";
@@ -74768,7 +75254,8 @@ var require_tokenizer = __commonJS({
             } else {
               const isEscapedQuote = this._cs.getCurrentChar() === 39 || this._cs.getCurrentChar() === 34;
               const isEscapedNewLine = this._cs.getCurrentChar() === 13 || this._cs.getCurrentChar() === 10;
-              if (!isFString || isEscapedQuote || isEscapedNewLine) {
+              const isEscapedBackslash = this._cs.getCurrentChar() === 92;
+              if (!isFString || isEscapedBackslash || isEscapedQuote || isEscapedNewLine) {
                 if (isEscapedNewLine) {
                   if (this._cs.getCurrentChar() === 13 && this._cs.nextChar === 10) {
                     escapedValueParts.push(this._cs.currentChar);
@@ -78144,10 +78631,13 @@ var require_parser = __commonJS({
             this._addError(localize_1.Localizer.Diagnostic.keywordSubscriptIllegal(), argNode.name);
           }
           if (argType !== 0) {
-            const unpackAllowed = this._parseOptions.isStubFile || this._isParsingQuotedText || this._getLanguageVersion() >= pythonVersion_1.PythonVersion.V3_11;
-            if (argType === 2 || !unpackAllowed) {
+            const unpackListAllowed = this._parseOptions.isStubFile || this._isParsingQuotedText || this._getLanguageVersion() >= pythonVersion_1.PythonVersion.V3_11;
+            if (argType === 1 && !unpackListAllowed) {
               this._addError(localize_1.Localizer.Diagnostic.unpackedSubscriptIllegal(), argNode);
             }
+            if (argType === 2) {
+              this._addError(localize_1.Localizer.Diagnostic.unpackedDictSubscriptIllegal(), argNode);
+            }
           }
           if (!this._consumeTokenIfType(
             12
@@ -83218,7 +83708,7 @@ var require_streams = __commonJS({
 });
 
 // node_modules/iconv-lite/lib/index.js
-var require_lib2 = __commonJS({
+var require_lib3 = __commonJS({
   "node_modules/iconv-lite/lib/index.js"(exports, module2) {
     "use strict";
     var Buffer2 = require_safer().Buffer;
@@ -95514,7 +96004,7 @@ var import_coc32 = require("coc.nvim");
 var import_fs = require("fs");
 var import_path7 = require("path");
 var import_semver2 = __toESM(require_semver2());
-var import_which5 = __toESM(require_which());
+var import_which5 = __toESM(require_lib());
 
 // src/commands.ts
 var child_process2 = __toESM(require("child_process"));
@@ -95524,10 +96014,10 @@ var import_path2 = __toESM(require("path"));
 // src/configSettings.ts
 var child_process = __toESM(require("child_process"));
 var import_coc = require("coc.nvim");
-var import_fs_extra = __toESM(require_lib());
+var import_fs_extra = __toESM(require_lib2());
 var import_path = __toESM(require("path"));
 var import_untildify = __toESM(require_untildify());
-var import_which = __toESM(require_which());
+var import_which = __toESM(require_lib());
 
 // src/systemVariables.ts
 var Path = __toESM(require("path"));
@@ -95925,7 +96415,7 @@ var SemanticTokensWalker = class extends import_parseTreeWalker.ParseTreeWalker
     this.semanticItems.push(item);
   }
   visitFormatString(node) {
-    node.expressions.map((f) => this.addSemanticItem(68 /* variable */, f));
+    node.fieldExpressions.map((f) => this.addSemanticItem(68 /* variable */, f));
     return super.visitFormatString(node);
   }
   visitTypeAnnotation(node) {
@@ -96332,16 +96822,16 @@ var import_coc9 = require("coc.nvim");
 
 // src/features/formatters/baseFormatter.ts
 var import_coc5 = require("coc.nvim");
-var import_fs_extra2 = __toESM(require_lib());
+var import_fs_extra2 = __toESM(require_lib2());
 var import_md5 = __toESM(require_md5());
 var import_path3 = __toESM(require("path"));
 var import_semver = __toESM(require_semver2());
 var import_util = require("util");
-var import_which2 = __toESM(require_which());
+var import_which2 = __toESM(require_lib());
 
 // src/processService.ts
 var import_child_process = require("child_process");
-var iconv = __toESM(require_lib2());
+var iconv = __toESM(require_lib3());
 var import_os = require("os");
 var import_rxjs = __toESM(require_cjs());
 
@@ -97402,10 +97892,10 @@ var PythonSemanticTokensProvider = class {
 
 // src/features/sortImports.ts
 var import_coc13 = require("coc.nvim");
-var import_fs_extra3 = __toESM(require_lib());
+var import_fs_extra3 = __toESM(require_lib2());
 var import_md52 = __toESM(require_md5());
 var path4 = __toESM(require("path"));
-var import_which3 = __toESM(require_which());
+var import_which3 = __toESM(require_lib());
 function getTempFileWithDocumentContents2(document) {
   return new Promise((resolve, reject) => {
     const fsPath = import_coc13.Uri.parse(document.uri).fsPath;
@@ -97483,7 +97973,7 @@ var import_coc28 = require("coc.nvim");
 
 // src/features/linters/lintingEngine.ts
 var import_coc27 = require("coc.nvim");
-var import_fs_extra5 = __toESM(require_lib());
+var import_fs_extra5 = __toESM(require_lib2());
 var import_minimatch = __toESM(require_minimatch());
 var import_path5 = __toESM(require("path"));
 
@@ -97724,7 +98214,7 @@ var Flake8 = class extends BaseLinter {
 // src/features/linters/linterInfo.ts
 var import_coc17 = require("coc.nvim");
 var path5 = __toESM(require("path"));
-var import_which4 = __toESM(require_which());
+var import_which4 = __toESM(require_lib());
 var LinterInfo = class {
   constructor(product, id, configService, configFileNames = []) {
     this.configService = configService;
@@ -97960,7 +98450,7 @@ var Pylint = class extends BaseLinter {
 
 // src/features/linters/pytype.ts
 var import_coc25 = require("coc.nvim");
-var import_fs_extra4 = __toESM(require_lib());
+var import_fs_extra4 = __toESM(require_lib2());
 var path8 = __toESM(require("path"));
 var pytypecfg = "pytype.cfg";
 var REGEX6 = '^File \\"(?<file>.*)\\", line (?<line>\\d+), in (<module>|\\w+): (?<message>.*)\\r?(\\n|$)';
@@ -98121,6 +98611,7 @@ var Ruff = class extends BaseLinter {
           tags: ["F401", "F841"].includes(msg.code) ? [import_coc26.DiagnosticTag.Unnecessary] : [],
           provider: this.info.id,
           file: msg.filename,
+          url: msg.url,
           fix: this.fixToWorkspaceEdit(msg.filename, msg.fix)
         };
       });
@@ -98256,6 +98747,9 @@ var LintingEngine = class {
     const severity = lintSeverityToVSSeverity.get(message.severity);
     const diagnostic = import_coc27.Diagnostic.create(range, message.message, severity);
     diagnostic.code = message.code;
+    if (message.url) {
+      diagnostic.codeDescription = { href: message.url };
+    }
     diagnostic.source = message.provider;
     diagnostic.fix = message.fix;
     diagnostic.tags = message.tags;