coc-pyright 1.1.362 → 1.1.365

package/lib/index.js

@@ -12476,7 +12476,7 @@ var require_uriUtils = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/common/uri/uriUtils.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.UriEx = exports2.encodeUri = exports2.getRootUri = exports2.deduplicateFolders = exports2.getDirectoryChangeKind = exports2.getFileSpec = exports2.hasPythonExtension = exports2.getWildcardRoot = exports2.getWildcardRegexPattern = exports2.getFileSystemEntriesFromDirEntries = exports2.getFileSystemEntries = exports2.tryRealpath = exports2.tryStat = exports2.isFile = exports2.isDirectory = exports2.directoryExists = exports2.fileExists = exports2.getFileSize = exports2.makeDirectories = exports2.forEachAncestorDirectory = exports2.FileSpec = void 0;
+    exports2.UriEx = exports2.convertUriToLspUriString = exports2.getRootUri = exports2.deduplicateFolders = exports2.getDirectoryChangeKind = exports2.getFileSpec = exports2.hasPythonExtension = exports2.getWildcardRoot = exports2.getWildcardRegexPattern = exports2.getFileSystemEntriesFromDirEntries = exports2.getFileSystemEntries = exports2.tryRealpath = exports2.tryStat = exports2.isFile = exports2.isDirectory = exports2.directoryExists = exports2.fileExists = exports2.getFileSize = exports2.makeDirectories = exports2.forEachAncestorDirectory = exports2.FileSpec = void 0;
     var pathUtils_1 = require_pathUtils();
     var uri_1 = require_uri();
     var serviceKeys_1 = require_serviceKeys();
@@ -12772,10 +12772,10 @@ var require_uriUtils = __commonJS({
       return void 0;
     }
     exports2.getRootUri = getRootUri;
-    function encodeUri(fs8, uri) {
+    function convertUriToLspUriString(fs8, uri) {
       return fs8.getOriginalUri(uri).toString();
     }
-    exports2.encodeUri = encodeUri;
+    exports2.convertUriToLspUriString = convertUriToLspUriString;
     var UriEx;
     (function(UriEx2) {
       function file(path12, arg, checkRelative) {
@@ -13207,6 +13207,10 @@ var require_console = __commonJS({
         return obj.error !== void 0 && obj.warn !== void 0 && obj.info !== void 0 && obj.log !== void 0;
       }
       ConsoleInterface2.is = is;
+      function hasLevel(console2) {
+        return is(console2) && "level" in console2;
+      }
+      ConsoleInterface2.hasLevel = hasLevel;
     })(ConsoleInterface || (exports2.ConsoleInterface = ConsoleInterface = {}));
     var levelMap = /* @__PURE__ */ new Map([
       [LogLevel.Error, 0],
@@ -13522,7 +13526,7 @@ var require_pythonVersion = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/common/pythonVersion.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.latestStablePythonVersion = exports2.pythonVersion3_13 = exports2.pythonVersion3_12 = exports2.pythonVersion3_11 = exports2.pythonVersion3_10 = exports2.pythonVersion3_9 = exports2.pythonVersion3_8 = exports2.pythonVersion3_7 = exports2.pythonVersion3_6 = exports2.pythonVersion3_5 = exports2.pythonVersion3_4 = exports2.pythonVersion3_3 = exports2.pythonVersion3_2 = exports2.pythonVersion3_1 = exports2.pythonVersion3_0 = exports2.PythonVersion = void 0;
+    exports2.latestStablePythonVersion = exports2.pythonVersion3_14 = exports2.pythonVersion3_13 = exports2.pythonVersion3_12 = exports2.pythonVersion3_11 = exports2.pythonVersion3_10 = exports2.pythonVersion3_9 = exports2.pythonVersion3_8 = exports2.pythonVersion3_7 = exports2.pythonVersion3_6 = exports2.pythonVersion3_5 = exports2.pythonVersion3_4 = exports2.pythonVersion3_3 = exports2.pythonVersion3_2 = exports2.pythonVersion3_1 = exports2.pythonVersion3_0 = exports2.PythonVersion = void 0;
     var PythonVersion = class _PythonVersion {
       constructor(_major, _minor, _micro, _releaseLevel, _serial) {
         this._major = _major;
@@ -13672,6 +13676,7 @@ var require_pythonVersion = __commonJS({
     exports2.pythonVersion3_11 = new PythonVersion(3, 11);
     exports2.pythonVersion3_12 = new PythonVersion(3, 12);
     exports2.pythonVersion3_13 = new PythonVersion(3, 13);
+    exports2.pythonVersion3_14 = new PythonVersion(3, 14);
     exports2.latestStablePythonVersion = exports2.pythonVersion3_12;
   }
 });
@@ -14272,7 +14277,7 @@ var require_configOptions = __commonJS({
     }
     exports2.matchFileSpecs = matchFileSpecs;
     var ConfigOptions = class _ConfigOptions {
-      constructor(projectRoot, typeCheckingMode) {
+      constructor(projectRoot) {
         this.include = [];
         this.exclude = [];
         this.ignore = [];
@@ -14286,8 +14291,7 @@ var require_configOptions = __commonJS({
         this.disableTaggedHints = false;
         this.executionEnvironments = [];
         this.projectRoot = projectRoot;
-        this.typeCheckingMode = typeCheckingMode;
-        this.diagnosticRuleSet = _ConfigOptions.getDiagnosticRuleSet(typeCheckingMode);
+        this.diagnosticRuleSet = _ConfigOptions.getDiagnosticRuleSet();
         this.functionSignatureDisplay = SignatureDisplayType.formatted;
       }
       static getDiagnosticRuleSet(typeCheckingMode) {
@@ -14322,8 +14326,14 @@ var require_configOptions = __commonJS({
         }
         return [this.getDefaultExecEnvironment()];
       }
+      initializeTypeCheckingMode(typeCheckingMode, severityOverrides) {
+        this.diagnosticRuleSet = _ConfigOptions.getDiagnosticRuleSet(typeCheckingMode);
+        if (severityOverrides) {
+          this.applyDiagnosticOverrides(severityOverrides);
+        }
+      }
       // Initialize the structure from a JSON object.
-      initializeFromJson(configObj, typeCheckingMode, serviceProvider, host, commandLineOptions) {
+      initializeFromJson(configObj, configDirUri, serviceProvider, host, commandLineOptions) {
         var _a;
         this.initializedFromJson = true;
         const console2 = (_a = serviceProvider.tryGet(serviceKeys_1.ServiceKeys.console)) !== null && _a !== void 0 ? _a : new console_1.NullConsole();
@@ -14339,7 +14349,7 @@ var require_configOptions = __commonJS({
               } else if ((0, path_1.isAbsolute)(fileSpec)) {
                 console2.error(`Ignoring path "${fileSpec}" in "include" array because it is not relative.`);
               } else {
-                this.include.push((0, uriUtils_1.getFileSpec)(this.projectRoot, fileSpec));
+                this.include.push((0, uriUtils_1.getFileSpec)(configDirUri, fileSpec));
               }
             });
           }
@@ -14356,7 +14366,7 @@ var require_configOptions = __commonJS({
               } else if ((0, path_1.isAbsolute)(fileSpec)) {
                 console2.error(`Ignoring path "${fileSpec}" in "exclude" array because it is not relative.`);
               } else {
-                this.exclude.push((0, uriUtils_1.getFileSpec)(this.projectRoot, fileSpec));
+                this.exclude.push((0, uriUtils_1.getFileSpec)(configDirUri, fileSpec));
               }
             });
           }
@@ -14373,7 +14383,7 @@ var require_configOptions = __commonJS({
               } else if ((0, path_1.isAbsolute)(fileSpec)) {
                 console2.error(`Ignoring path "${fileSpec}" in "ignore" array because it is not relative.`);
               } else {
-                this.ignore.push((0, uriUtils_1.getFileSpec)(this.projectRoot, fileSpec));
+                this.ignore.push((0, uriUtils_1.getFileSpec)(configDirUri, fileSpec));
               }
             });
           }
@@ -14390,15 +14400,14 @@ var require_configOptions = __commonJS({
               } else if ((0, path_1.isAbsolute)(fileSpec)) {
                 console2.error(`Ignoring path "${fileSpec}" in "strict" array because it is not relative.`);
               } else {
-                this.strict.push((0, uriUtils_1.getFileSpec)(this.projectRoot, fileSpec));
+                this.strict.push((0, uriUtils_1.getFileSpec)(configDirUri, fileSpec));
               }
             });
           }
         }
-        let configTypeCheckingMode;
         if (configObj.typeCheckingMode !== void 0) {
           if (configObj.typeCheckingMode === "off" || configObj.typeCheckingMode === "basic" || configObj.typeCheckingMode === "standard" || configObj.typeCheckingMode === "strict") {
-            configTypeCheckingMode = configObj.typeCheckingMode;
+            this.diagnosticRuleSet = { ..._ConfigOptions.getDiagnosticRuleSet(configObj.typeCheckingMode) };
           } else {
             console2.error(`Config "typeCheckingMode" entry must contain "off", "basic", "standard", or "strict".`);
           }
@@ -14410,10 +14419,6 @@ var require_configOptions = __commonJS({
             console2.error(`Config "useLibraryCodeForTypes" entry must be true or false.`);
           }
         }
-        this.typeCheckingMode = configTypeCheckingMode || typeCheckingMode;
-        const defaultSettings = _ConfigOptions.getDiagnosticRuleSet(this.typeCheckingMode);
-        this.diagnosticRuleSet = { ...defaultSettings };
-        this.applyDiagnosticOverrides(commandLineOptions === null || commandLineOptions === void 0 ? void 0 : commandLineOptions.diagnosticSeverityOverrides);
         getBooleanDiagnosticRules(
           /* includeNonOverridable */
           true
@@ -14423,15 +14428,13 @@ var require_configOptions = __commonJS({
         getDiagLevelDiagnosticRules().forEach((ruleName) => {
           this.diagnosticRuleSet[ruleName] = this._convertDiagnosticLevel(configObj[ruleName], ruleName, this.diagnosticRuleSet[ruleName]);
         });
-        this.venvPath = void 0;
         if (configObj.venvPath !== void 0) {
           if (typeof configObj.venvPath !== "string") {
             console2.error(`Config "venvPath" field must contain a string.`);
           } else {
-            this.venvPath = this.projectRoot.resolvePaths(configObj.venvPath);
+            this.venvPath = configDirUri.resolvePaths(configObj.venvPath);
           }
         }
-        this.venv = void 0;
         if (configObj.venv !== void 0) {
           if (typeof configObj.venv !== "string") {
             console2.error(`Config "venv" field must contain a string.`);
@@ -14449,7 +14452,7 @@ var require_configOptions = __commonJS({
               if (typeof path12 !== "string") {
                 console2.error(`Config "extraPaths" field ${pathIndex} must be a string.`);
               } else {
-                this.defaultExtraPaths.push(this.projectRoot.resolvePaths(path12));
+                this.defaultExtraPaths.push(configDirUri.resolvePaths(path12));
               }
             });
           }
@@ -14481,28 +14484,26 @@ var require_configOptions = __commonJS({
           this.defaultPythonPlatform = commandLineOptions.pythonPlatform;
         }
         this.ensureDefaultPythonPlatform(host, console2);
-        this.typeshedPath = void 0;
         if (configObj.typeshedPath !== void 0) {
           if (typeof configObj.typeshedPath !== "string") {
             console2.error(`Config "typeshedPath" field must contain a string.`);
           } else {
-            this.typeshedPath = configObj.typeshedPath ? this.projectRoot.resolvePaths(configObj.typeshedPath) : void 0;
+            this.typeshedPath = configObj.typeshedPath ? configDirUri.resolvePaths(configObj.typeshedPath) : void 0;
           }
         }
-        this.stubPath = void 0;
         if (configObj.typingsPath !== void 0) {
           if (typeof configObj.typingsPath !== "string") {
             console2.error(`Config "typingsPath" field must contain a string.`);
           } else {
             console2.error(`Config "typingsPath" is now deprecated. Please, use stubPath instead.`);
-            this.stubPath = this.projectRoot.resolvePaths(configObj.typingsPath);
+            this.stubPath = configDirUri.resolvePaths(configObj.typingsPath);
           }
         }
         if (configObj.stubPath !== void 0) {
           if (typeof configObj.stubPath !== "string") {
             console2.error(`Config "stubPath" field must contain a string.`);
           } else {
-            this.stubPath = this.projectRoot.resolvePaths(configObj.stubPath);
+            this.stubPath = configDirUri.resolvePaths(configObj.stubPath);
           }
         }
         if (configObj.verboseOutput !== void 0) {
@@ -14535,14 +14536,14 @@ var require_configOptions = __commonJS({
             this.useLibraryCodeForTypes = configObj.useLibraryCodeForTypes;
           }
         }
-        this.executionEnvironments = [];
         if (configObj.executionEnvironments !== void 0) {
           if (!Array.isArray(configObj.executionEnvironments)) {
             console2.error(`Config "executionEnvironments" field must contain an array.`);
           } else {
+            this.executionEnvironments = [];
             const execEnvironments = configObj.executionEnvironments;
             execEnvironments.forEach((env, index) => {
-              const execEnv = this._initExecutionEnvironmentFromJson(env, index, console2, commandLineOptions);
+              const execEnv = this._initExecutionEnvironmentFromJson(env, configDirUri, index, console2, commandLineOptions);
               if (execEnv) {
                 this.executionEnvironments.push(execEnv);
               }
@@ -14587,6 +14588,16 @@ var require_configOptions = __commonJS({
           }
         }
       }
+      static resolveExtends(configObj, configDirUri) {
+        if (configObj.extends !== void 0) {
+          if (typeof configObj.extends !== "string") {
+            console.error(`Config "extends" field must contain a string.`);
+          } else {
+            return configDirUri.resolvePaths(configObj.extends);
+          }
+        }
+        return void 0;
+      }
       ensureDefaultPythonPlatform(host, console2) {
         if (this.defaultPythonPlatform !== void 0) {
           return;
@@ -14667,11 +14678,11 @@ var require_configOptions = __commonJS({
         console.log(`Config "${fieldName}" entry must be true, false, "error", "warning", "information" or "none".`);
         return defaultValue;
       }
-      _initExecutionEnvironmentFromJson(envObj, index, console2, commandLineOptions) {
+      _initExecutionEnvironmentFromJson(envObj, configDirUri, index, console2, commandLineOptions) {
         try {
-          const newExecEnv = new ExecutionEnvironment(this._getEnvironmentName(), this.projectRoot, this.defaultPythonVersion, this.defaultPythonPlatform, this.defaultExtraPaths);
+          const newExecEnv = new ExecutionEnvironment(this._getEnvironmentName(), configDirUri, this.defaultPythonVersion, this.defaultPythonPlatform, this.defaultExtraPaths);
           if (envObj.root && typeof envObj.root === "string") {
-            newExecEnv.root = this.projectRoot.resolvePaths(envObj.root);
+            newExecEnv.root = configDirUri.resolvePaths(envObj.root);
           } else {
             console2.error(`Config executionEnvironments index ${index}: missing root value.`);
           }
@@ -14684,7 +14695,7 @@ var require_configOptions = __commonJS({
                 if (typeof path12 !== "string") {
                   console2.error(`Config executionEnvironments index ${index}: extraPaths field ${pathIndex} must be a string.`);
                 } else {
-                  newExecEnv.extraPaths.push(this.projectRoot.resolvePaths(path12));
+                  newExecEnv.extraPaths.push(configDirUri.resolvePaths(path12));
                 }
               });
             }
@@ -15471,7 +15482,6 @@ var require_package_nls_cs = __commonJS({
         paramSpecFirstArg: "O\u010Dek\xE1val se n\xE1zev parametru ParamSpec jako prvn\xED argument",
         paramSpecKwargsUsage: "Atribut kwargs ParamSpec je platn\xFD jenom v p\u0159\xEDpad\u011B, \u017Ee se pou\u017E\xEDv\xE1 s parametrem **kwargs.",
         paramSpecNotUsedByOuterScope: "Parametr ParamSpec {name} nem\xE1 v tomto kontextu \u017E\xE1dn\xFD v\xFDznam",
-        paramSpecScopedToReturnType: "Parametr ParamSpec {name} je vymezen\xFD na volatelnou prom\u011Bnnou v r\xE1mci n\xE1vratov\xE9ho typu a ned\xE1 se na n\u011Bj odkazovat v t\u011Ble funkce jazyka",
         paramSpecUnknownArg: "Parametr ParamSpec nepodporuje v\xEDce ne\u017E jeden argument",
         paramSpecUnknownMember: "{name} nen\xED zn\xE1m\xFD atribut ParamSpec.",
         paramSpecUnknownParam: "\u201E{name}\u201C je nezn\xE1m\xFD parametr parametru ParamSpec",
@@ -15623,7 +15633,6 @@ var require_package_nls_cs = __commonJS({
         typeVarNotSubscriptable: "TypeVar {type} nen\xED mo\u017En\xE9 zadat jako doln\xED index",
         typeVarNotUsedByOuterScope: "Prom\u011Bnn\xE1 typu {name} nem\xE1 v tomto kontextu \u017E\xE1dn\xFD v\xFDznam",
         typeVarPossiblyUnsolvable: "Prom\u011Bnn\xE1 typu \u201E{name}\u201C m\u016F\u017Ee b\xFDt nevy\u0159e\u0161en\xE1, pokud volaj\xEDc\xED nezad\xE1 \u017E\xE1dn\xFD argument pro parametr \u201E{param}\u201C",
-        typeVarScopedToReturnType: "Prom\u011Bnn\xE1 typu \u201E{name}\u201C je vymezen\xE1 na volatelnou prom\u011Bnnou v r\xE1mci n\xE1vratov\xE9ho typu a ned\xE1 se na to odkazovat v t\u011Ble funkce",
         typeVarSingleConstraint: "TypeVar mus\xED m\xEDt alespo\u0148 dva omezen\xE9 typy",
         typeVarTupleConstraints: "TypeVarTuple nem\u016F\u017Ee m\xEDt omezen\xED hodnoty",
         typeVarTupleContext: "TypeVarTuple se v tomto kontextu nepovoluje",
@@ -15694,7 +15703,7 @@ var require_package_nls_cs = __commonJS({
         unpackNotAllowed: "Rozbalen\xED se v tomto kontextu nepovoluje",
         unpackOperatorNotAllowed: "Operace rozbalen\xED nen\xED v tomto kontextu povolen\xE1",
         unpackTuplesIllegal: "Operace rozbalen\xED nen\xED povolen\xE1 v \u0159azen\xFDch kolekc\xEDch \u010Dlen\u016F p\u0159ed Pythonem 3.8",
-        unpackedArgInTypeArgument: "Rozbalen\xE9 argumenty nen\xED mo\u017En\xE9 pou\u017E\xEDt v seznamech argument\u016F typu",
+        unpackedArgInTypeArgument: "V tomto kontextu nelze pou\u017E\xEDt rozbalen\xE9 argumenty.",
         unpackedArgWithVariadicParam: "Pro parametr TypeVarTuple nejde pou\u017E\xEDt rozbalen\xFD argument",
         unpackedDictArgumentNotMapping: "V\xFDraz argumentu za ** mus\xED b\xFDt mapov\xE1n\xED s typem kl\xED\u010De str",
         unpackedDictSubscriptIllegal: "Oper\xE1tor rozbalen\xED slovn\xEDku v doln\xEDm indexu nen\xED povolen\xFD",
@@ -16159,7 +16168,7 @@ var require_package_nls_de = __commonJS({
         incompatibleMethodOverride: 'Die Methode "{name}" \xFCberschreibt die Klasse "{className}" auf inkompatible Weise.',
         inconsistentIndent: "Der Betrag f\xFCr Nichteinzug stimmt nicht mit dem vorherigen Einzug \xFCberein.",
         inconsistentTabs: "Inkonsistente Verwendung von Tabulatoren und Leerzeichen im Einzug.",
-        initMethodSelfParamTypeVar: "Die Typanmerkung f\xFCr den Parameter \u201Eself\u201C der Methode \u201E__init__\u201C darf keine klassenbezogenen Typvariablen enthalten",
+        initMethodSelfParamTypeVar: 'Typ-Anmerkung f\xFCr "self"-Parameter der "__init__"-Methode kann keine klassen\xFCbergreifenden Typvariablen enthalten',
         initMustReturnNone: 'Der R\xFCckgabetyp von "__init__" muss "None" sein.',
         initSubclassCallFailed: "Falsche Schl\xFCsselwortargumente f\xFCr __init_subclass__ Methode.",
         initSubclassClsParam: '__init_subclass__ Au\xDFerkraftsetzung sollte einen "cls"-Parameter annehmen.',
@@ -16281,7 +16290,6 @@ var require_package_nls_de = __commonJS({
         paramSpecFirstArg: "Der Name von ParamSpec wurde als erstes Argument erwartet.",
         paramSpecKwargsUsage: "Das Attribut \u201Ekwargs\u201C von ParamSpec ist nur g\xFCltig, wenn es mit dem Parameter \u201E*kwargs\u201C verwendet wird",
         paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" hat in diesem Kontext keine Bedeutung.',
-        paramSpecScopedToReturnType: 'ParamSpec "{name}" ist auf einen Aufruf innerhalb des R\xFCckgabetyps beschr\xE4nkt und kann im Funktionstext nicht referenziert werden.',
         paramSpecUnknownArg: "ParamSpec unterst\xFCtzt nur ein Argument.",
         paramSpecUnknownMember: "\u201E{name}\u201C ist kein bekanntes Attribut von ParamSpec",
         paramSpecUnknownParam: '"{name}" ist ein unbekannter Parameter f\xFCr ParamSpec.',
@@ -16433,7 +16441,6 @@ var require_package_nls_de = __commonJS({
         typeVarNotSubscriptable: 'TypeVar "{type}" kann nicht tiefgestellt werden.',
         typeVarNotUsedByOuterScope: 'Die Typvariable "{name}" hat in diesem Kontext keine Bedeutung.',
         typeVarPossiblyUnsolvable: 'Die Typvariable "{name}" wird m\xF6glicherweise nicht aufgel\xF6st, wenn der Aufrufer kein Argument f\xFCr Parameter "{param}" bereitstellt',
-        typeVarScopedToReturnType: 'Die Typvariable "{name}" ist auf einen Aufruf innerhalb des R\xFCckgabetyps beschr\xE4nkt und kann im Funktionstext nicht referenziert werden.',
         typeVarSingleConstraint: "TypeVar muss mindestens zwei eingeschr\xE4nkte Typen aufweisen.",
         typeVarTupleConstraints: "TypeVarTuple darf keine Werteinschr\xE4nkungen aufweisen.",
         typeVarTupleContext: "TypeVarTuple ist in diesem Kontext nicht zul\xE4ssig.",
@@ -16504,7 +16511,7 @@ var require_package_nls_de = __commonJS({
         unpackNotAllowed: '"Unpack" ist in diesem Kontext nicht zul\xE4ssig.',
         unpackOperatorNotAllowed: "Der Entpackvorgang ist in diesem Kontext nicht zul\xE4ssig.",
         unpackTuplesIllegal: "Der Entpackvorgang ist in Tupeln vor Python 3.8 nicht zul\xE4ssig.",
-        unpackedArgInTypeArgument: "Ungepackte Argumente k\xF6nnen nicht in Typargumentlisten verwendet werden.",
+        unpackedArgInTypeArgument: "Nicht gepackte Argumente k\xF6nnen in diesem Kontext nicht verwendet werden.",
         unpackedArgWithVariadicParam: 'Das nicht gepackte Argument kann nicht f\xFCr den Parameter "TypeVarTuple" verwendet werden.',
         unpackedDictArgumentNotMapping: 'Der Argumentausdruck nach ** muss eine Zuordnung mit dem Schl\xFCsseltyp "str" sein.',
         unpackedDictSubscriptIllegal: "Der Operator zum Entpacken des W\xF6rterbuchs in tiefgestellten Zeichen ist nicht zul\xE4ssig.",
@@ -16857,6 +16864,8 @@ var require_package_nls_en_us = __commonJS({
         ellipsisContext: '"..." is not allowed in this context',
         ellipsisSecondArg: '"..." is allowed only as the second of two arguments',
         enumClassOverride: 'Enum class "{name}" is final and cannot be subclassed',
+        enumMemberDelete: 'Enum member "{name}" cannot be deleted',
+        enumMemberSet: 'Enum member "{name}" cannot be assigned',
         exceptionGroupIncompatible: 'Exception group syntax ("except*") requires Python 3.11 or newer',
         exceptionTypeIncorrect: '"{type}" does not derive from BaseException',
         exceptionTypeNotClass: '"{type}" is not a valid exception class',
@@ -16956,7 +16965,7 @@ var require_package_nls_en_us = __commonJS({
         inconsistentIndent: "Unindent amount does not match previous indent",
         initMustReturnNone: 'Return type of "__init__" must be None',
         inconsistentTabs: "Inconsistent use of tabs and spaces in indentation",
-        initMethodSelfParamTypeVar: 'Type annotation for "self" parameter of "__init__" method cannot contain class-scoped type varaiables',
+        initMethodSelfParamTypeVar: 'Type annotation for "self" parameter of "__init__" method cannot contain class-scoped type variables',
         initSubclassClsParam: '__init_subclass__ override should take a "cls" parameter',
         initSubclassCallFailed: "Incorrect keyword arguments for __init_subclass__ method",
         initVarNotAllowed: '"InitVar" is not allowed in this context',
@@ -17076,7 +17085,6 @@ var require_package_nls_en_us = __commonJS({
         paramSpecFirstArg: "Expected name of ParamSpec as first argument",
         paramSpecKwargsUsage: '"kwargs" attribute of ParamSpec is valid only when used with **kwargs parameter',
         paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" has no meaning in this context',
-        paramSpecScopedToReturnType: 'ParamSpec "{name}" is scoped to a callable within the return type and cannot be referenced in the function body',
         paramSpecUnknownArg: "ParamSpec does not support more than one argument",
         paramSpecUnknownMember: '"{name}" is not a known attribute of ParamSpec',
         paramSpecUnknownParam: '"{name}" is unknown parameter to ParamSpec',
@@ -17250,7 +17258,6 @@ var require_package_nls_en_us = __commonJS({
         typeVarNotSubscriptable: 'TypeVar "{type}" is not subscriptable',
         typeVarNotUsedByOuterScope: 'Type variable "{name}" has no meaning in this context',
         typeVarPossiblyUnsolvable: 'Type variable "{name}" may go unsolved if caller supplies no argument for parameter "{param}"',
-        typeVarScopedToReturnType: 'Type variable "{name}" is scoped to a callable within the return type and cannot be referenced in the function body',
         typeVarSingleConstraint: "TypeVar must have at least two constrained types",
         typeVarsNotInGenericOrProtocol: "Generic[] or Protocol[] must include all type variables",
         typeVarTupleContext: "TypeVarTuple is not allowed in this context",
@@ -17396,8 +17403,8 @@ var require_package_nls_en_us = __commonJS({
         missingGetter: "Property getter method is missing",
         missingSetter: "Property setter method is missing",
         missingDeleter: "Property deleter method is missing",
-        namedParamMissingInDest: 'Keyword parameter "{name}" is missing in destination',
-        namedParamMissingInSource: 'Keyword parameter "{name}" is missing in source',
+        namedParamMissingInDest: 'Extra parameter "{name}"',
+        namedParamMissingInSource: 'Missing keyword parameter "{name}"',
         namedParamTypeMismatch: 'Keyword parameter "{name}" of type "{sourceType}" is incompatible with type "{destType}"',
         namedTupleNotAllowed: "NamedTuple cannot be used for instance or class checks",
         newMethodLocation: 'The __new__ method is defined in class "{type}"',
@@ -17779,7 +17786,7 @@ var require_package_nls_es = __commonJS({
         incompatibleMethodOverride: 'El m\xE9todo "{name}" sobrescribe la clase "{className}" de forma incompatible',
         inconsistentIndent: "La cantidad sin sangr\xEDa no coincide con la sangr\xEDa anterior",
         inconsistentTabs: "Uso incoherente de tabuladores y espacios en la sangr\xEDa",
-        initMethodSelfParamTypeVar: 'La anotaci\xF3n de tipo para el par\xE1metro "self" del m\xE9todo "__init__" no puede contener tipos con \xE1mbito de clase.',
+        initMethodSelfParamTypeVar: 'La anotaci\xF3n de tipo para el par\xE1metro "self" del m\xE9todo "__init__" no puede contener variables de tipo con \xE1mbito de clase',
         initMustReturnNone: 'El tipo de retorno de "__init__" debe ser None',
         initSubclassCallFailed: "Argumentos de palabra clave incorrectos para el m\xE9todo __init_subclass__",
         initSubclassClsParam: '__init_subclass__ debe tomar un par\xE1metro "cls"',
@@ -17901,7 +17908,6 @@ var require_package_nls_es = __commonJS({
         paramSpecFirstArg: "Se esperaba el nombre de ParamSpec como primer argumento",
         paramSpecKwargsUsage: 'El miembro "kwargs" de ParamSpec solo es v\xE1lido cuando se utiliza con el par\xE1metro **kwargs',
         paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" no tiene significado en este contexto',
-        paramSpecScopedToReturnType: 'El \xE1mbito de ParamSpec "{name}" es un \xE1mbito al que se puede llamar dentro del tipo de valor devuelto y no se puede hacer referencia a \xE9l en el cuerpo de la funci\xF3n.',
         paramSpecUnknownArg: "ParamSpec no admite m\xE1s de un argumento",
         paramSpecUnknownMember: '"{name}" no es un atributo conocido de ParamSpec',
         paramSpecUnknownParam: '"{name}" es un par\xE1metro desconocido para ParamSpec',
@@ -18053,7 +18059,6 @@ var require_package_nls_es = __commonJS({
         typeVarNotSubscriptable: 'TypeVar "{type}" no es subscribible',
         typeVarNotUsedByOuterScope: 'La variable de tipo "{name}" no tiene ning\xFAn significado en este contexto',
         typeVarPossiblyUnsolvable: 'La variable de tipo "{name}" puede quedar sin resolver si el autor de la llamada no proporciona ning\xFAn argumento para el par\xE1metro "{param}"',
-        typeVarScopedToReturnType: 'La variable de tipo "{name}" tiene como \xE1mbito una llamada dentro del tipo de valor devuelto y no se puede hacer referencia a ella en el cuerpo de la funci\xF3n.',
         typeVarSingleConstraint: "TypeVar debe tener al menos dos tipos restringidos",
         typeVarTupleConstraints: "TypeVarTuple no puede tener restricciones de valor",
         typeVarTupleContext: "TypeVarTuple no est\xE1 permitido en este contexto",
@@ -18124,7 +18129,7 @@ var require_package_nls_es = __commonJS({
         unpackNotAllowed: "El desempaquetado no est\xE1 permitido en este contexto",
         unpackOperatorNotAllowed: "La operaci\xF3n de desempaquetado no est\xE1 permitida en este contexto",
         unpackTuplesIllegal: "Operaci\xF3n de desempaquetado no permitida en tuplas anteriores a Python 3.8",
-        unpackedArgInTypeArgument: "Los argumentos sin empaquetar no pueden utilizarse en listas de argumentos de tipo",
+        unpackedArgInTypeArgument: "No se pueden usar argumentos sin empaquetar en este contexto",
         unpackedArgWithVariadicParam: "No se puede usar un argumento desempaquetado para el par\xE1metro TypeVarTuple",
         unpackedDictArgumentNotMapping: 'La expresi\xF3n del argumento despu\xE9s de ** debe ser un mapeo con un tipo de clave "str".',
         unpackedDictSubscriptIllegal: "El operador de desempaquetado del diccionario en el sub\xEDndice no est\xE1 permitido",
@@ -18589,7 +18594,7 @@ var require_package_nls_fr = __commonJS({
         incompatibleMethodOverride: "La m\xE9thode \xAB\xA0{name}\xA0\xBB remplace la classe \xAB\xA0{className}\xA0\xBB de mani\xE8re incompatible",
         inconsistentIndent: "Le montant du retrait ne correspond pas au retrait pr\xE9c\xE9dent",
         inconsistentTabs: "Utilisation incoh\xE9rente des onglets et des espaces dans la mise en retrait",
-        initMethodSelfParamTypeVar: "L\u2019annotation de type pour le param\xE8tre \xAB\xA0self\xA0\xBB de la m\xE9thode \xAB\xA0__init__\xA0\xBB ne peut pas contenir de variables de type dont l\u2019\xE9tendue est une classe",
+        initMethodSelfParamTypeVar: "L\u2019annotation de type pour le param\xE8tre \xAB self \xBB de la m\xE9thode \xAB __init__ \xBB ne peut pas contenir de variables de type de port\xE9e de classe",
         initMustReturnNone: "Le type de retour de \xAB __init__ \xBB doit \xEAtre None",
         initSubclassCallFailed: "Arguments de mot cl\xE9 incorrects pour la m\xE9thode __init_subclass__",
         initSubclassClsParam: "__init_subclass__ remplacement doit prendre un param\xE8tre \xAB cls \xBB",
@@ -18711,7 +18716,6 @@ var require_package_nls_fr = __commonJS({
         paramSpecFirstArg: "Nom attendu de ParamSpec comme premier argument",
         paramSpecKwargsUsage: "L\u2019attribut \xAB\xA0kwargs\xA0\xBB de ParamSpec n\u2019est valide que lorsqu\u2019il est utilis\xE9 avec le param\xE8tre **kwargs",
         paramSpecNotUsedByOuterScope: "ParamSpec \xAB\xA0{name}\xA0\xBB n\u2019a aucune signification dans ce contexte",
-        paramSpecScopedToReturnType: 'ParamSpec "{name}" est limit\xE9 \xE0 un appelable dans le type de retour et ne peut pas \xEAtre r\xE9f\xE9renc\xE9 dans le corps de la fonction',
         paramSpecUnknownArg: "ParamSpec ne prend pas en charge plus d'un argument",
         paramSpecUnknownMember: "\xAB\xA0{name}\xA0\xBB n\u2019est pas un attribut connu de ParamSpec",
         paramSpecUnknownParam: '"{name}" est un param\xE8tre inconnu pour ParamSpec',
@@ -18863,7 +18867,6 @@ var require_package_nls_fr = __commonJS({
         typeVarNotSubscriptable: "TypeVar \xAB\xA0{type}\xA0\xBB n\u2019est pas subscriptible",
         typeVarNotUsedByOuterScope: "La variable de type \xAB\xA0{name}\xA0\xBB n\u2019a aucune signification dans ce contexte",
         typeVarPossiblyUnsolvable: `La variable de type "{name}" peut rester non r\xE9solue si l'appelant ne fournit aucun argument pour le param\xE8tre "{param}"`,
-        typeVarScopedToReturnType: 'La variable de type "{name}" est limit\xE9e \xE0 un appelable dans le type de retour et ne peut pas \xEAtre r\xE9f\xE9renc\xE9e dans le corps de la fonction',
         typeVarSingleConstraint: "TypeVar doit avoir au moins deux types contraints",
         typeVarTupleConstraints: "TypeVarTuple ne peut pas avoir de contraintes de valeur",
         typeVarTupleContext: "TypeVarTuple n\u2019est pas autoris\xE9 dans ce contexte",
@@ -18934,7 +18937,7 @@ var require_package_nls_fr = __commonJS({
         unpackNotAllowed: "Le d\xE9compression n\u2019est pas autoris\xE9 dans ce contexte",
         unpackOperatorNotAllowed: "L\u2019op\xE9ration de d\xE9compression n\u2019est pas autoris\xE9e dans ce contexte",
         unpackTuplesIllegal: "Op\xE9ration de d\xE9compression non autoris\xE9e dans les tuples avant Python 3.8",
-        unpackedArgInTypeArgument: "Les arguments d\xE9compress\xE9s ne peuvent pas \xEAtre utilis\xE9s dans les listes d\u2019arguments de type",
+        unpackedArgInTypeArgument: "Les arguments d\xE9compress\xE9s ne peuvent pas \xEAtre utilis\xE9s dans ce contexte",
         unpackedArgWithVariadicParam: "L'argument d\xE9compress\xE9 ne peut pas \xEAtre utilis\xE9 pour le param\xE8tre TypeVarTuple",
         unpackedDictArgumentNotMapping: "L\u2019expression d\u2019argument apr\xE8s ** doit \xEAtre un mappage avec un type de cl\xE9 \xAB\xA0str\xA0\xBB",
         unpackedDictSubscriptIllegal: "L\u2019op\xE9rateur de d\xE9compression de dictionnaire dans l\u2019indice n\u2019est pas autoris\xE9",
@@ -19521,7 +19524,6 @@ var require_package_nls_it = __commonJS({
         paramSpecFirstArg: "Nome previsto di ParamSpec come primo argomento",
         paramSpecKwargsUsage: `L'attributo "kwargs" di ParamSpec \xE8 valido solo se usato con il parametro *kwargs`,
         paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" non ha significato in questo contesto',
-        paramSpecScopedToReturnType: `L\u2019ambito ParamSpec "{name}" \xE8 un elemento richiamabile all'interno del tipo restituito e non pu\xF2 essere usato come riferimento nel corpo della funzione`,
         paramSpecUnknownArg: "ParamSpec non supporta pi\xF9 di un argomento",
         paramSpecUnknownMember: '"{name}" non \xE8 un attributo noto di ParamSpec',
         paramSpecUnknownParam: '"{name}" \xE8 un parametro sconosciuto per ParamSpec',
@@ -19673,7 +19675,6 @@ var require_package_nls_it = __commonJS({
         typeVarNotSubscriptable: 'TypeVar "{type}" non sottoponibile a script',
         typeVarNotUsedByOuterScope: 'La variabile di tipo "{name}" non ha significato in questo contesto',
         typeVarPossiblyUnsolvable: 'La variabile di tipo "{name}" potrebbe non essere risolta se il chiamante non fornisce alcun argomento per il parametro "{param}"',
-        typeVarScopedToReturnType: `La variabile di tipo "{name}" ha come ambito un elemento richiamabile all'interno del tipo restituito e non pu\xF2 essere usato come riferimento nel corpo della funzione`,
         typeVarSingleConstraint: "TypeVar deve contenere almeno due tipi vincolati",
         typeVarTupleConstraints: "TypeVarTuple non pu\xF2 avere vincoli di valore",
         typeVarTupleContext: "TypeVarTuple non \xE8 consentito in questo contesto",
@@ -19744,7 +19745,7 @@ var require_package_nls_it = __commonJS({
         unpackNotAllowed: "La decompressione non \xE8 consentita in questo contesto",
         unpackOperatorNotAllowed: "L\u2019operazione di decompressione non \xE8 consentita in questo contesto",
         unpackTuplesIllegal: "L'operazione di decompressione non \xE8 consentita nelle tuple precedenti a Python 3.8",
-        unpackedArgInTypeArgument: "Gli argomenti non compressi non possono essere usati negli elenchi di argomenti tipo",
+        unpackedArgInTypeArgument: "Non \xE8 possibile usare argomenti decompressi in questo contesto",
         unpackedArgWithVariadicParam: "Non \xE8 possibile usare l'argomento decompresso per il parametro TypeVarTuple",
         unpackedDictArgumentNotMapping: `L'espressione dell'argomento dopo ** deve essere un mapping con un tipo di chiave "str"`,
         unpackedDictSubscriptIllegal: "L'operatore di decompressione del dizionario nel pedice non \xE8 consentito",
@@ -20209,7 +20210,7 @@ var require_package_nls_ja = __commonJS({
         incompatibleMethodOverride: '\u30E1\u30BD\u30C3\u30C9 "{name}" \u306F\u4E92\u63DB\u6027\u306E\u306A\u3044\u65B9\u6CD5\u3067\u30AF\u30E9\u30B9 "{className}" \u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059',
         inconsistentIndent: "\u5143\u306E\u30B5\u30A4\u30BA\u304C\u524D\u306E\u30A4\u30F3\u30C7\u30F3\u30C8\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093",
         inconsistentTabs: "\u30A4\u30F3\u30C7\u30F3\u30C8\u3067\u306E\u30BF\u30D6\u3068\u30B9\u30DA\u30FC\u30B9\u306E\u4E00\u8CAB\u6027\u306E\u306A\u3044\u4F7F\u7528",
-        initMethodSelfParamTypeVar: '"__init__" \u30E1\u30BD\u30C3\u30C9\u306E "self" \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u578B\u6CE8\u91C8\u306B\u30AF\u30E9\u30B9 \u30B9\u30B3\u30FC\u30D7\u578B\u306E\u5909\u6570\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093',
+        initMethodSelfParamTypeVar: '"__init__" \u30E1\u30BD\u30C3\u30C9\u306E "self" \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u578B\u6CE8\u91C8\u306B\u3001\u30AF\u30E9\u30B9 \u30B9\u30B3\u30FC\u30D7\u578B\u306E\u5909\u6570\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093',
         initMustReturnNone: '"__init__" \u306E\u623B\u308A\u5024\u306E\u578B\u306F None \u3067\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093',
         initSubclassCallFailed: "__init_subclass__ \u30E1\u30BD\u30C3\u30C9\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u5F15\u6570\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093",
         initSubclassClsParam: '__class_getitem__ override \u306F "cls" \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u53D7\u3051\u53D6\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059',
@@ -20331,7 +20332,6 @@ var require_package_nls_ja = __commonJS({
         paramSpecFirstArg: "\u6700\u521D\u306E\u5F15\u6570\u3068\u3057\u3066 ParamSpec \u306E\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059",
         paramSpecKwargsUsage: 'ParamSpec \u306E "kwargs" \u5C5E\u6027\u306F\u3001**kwargs \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3068\u5171\u306B\u4F7F\u7528\u3059\u308B\u5834\u5408\u306B\u306E\u307F\u6709\u52B9\u3067\u3059',
         paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" \u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u610F\u5473\u304C\u3042\u308A\u307E\u305B\u3093',
-        paramSpecScopedToReturnType: 'ParamSpec "{name}" \u306F\u3001\u623B\u308A\u5024\u306E\u578B\u5185\u306E\u547C\u3073\u51FA\u3057\u53EF\u80FD\u306A\u30B9\u30B3\u30FC\u30D7\u3067\u3042\u308A\u3001\u95A2\u6570\u672C\u4F53\u3067\u306F\u53C2\u7167\u3067\u304D\u307E\u305B\u3093',
         paramSpecUnknownArg: "ParamSpec \u306F\u8907\u6570\u306E\u5F15\u6570\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093",
         paramSpecUnknownMember: '"{name}" \u306F ParamSpec \u306E\u65E2\u77E5\u306E\u5C5E\u6027\u3067\u306F\u3042\u308A\u307E\u305B\u3093',
         paramSpecUnknownParam: '"{name}" \u306F ParamSpec \u306B\u5BFE\u3059\u308B\u4E0D\u660E\u306A\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3067\u3059',
@@ -20483,7 +20483,6 @@ var require_package_nls_ja = __commonJS({
         typeVarNotSubscriptable: 'TypeVar "{type}" \u306F\u6DFB\u5B57\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093',
         typeVarNotUsedByOuterScope: '\u578B\u5909\u6570 "{name}" \u306F\u3001\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u610F\u5473\u304C\u3042\u308A\u307E\u305B\u3093',
         typeVarPossiblyUnsolvable: '\u547C\u3073\u51FA\u3057\u5143\u304C\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC "{param}" \u306B\u5F15\u6570\u3092\u6307\u5B9A\u3057\u306A\u3044\u5834\u5408\u3001\u578B\u5909\u6570 "{name}" \u306F\u89E3\u6C7A\u3055\u308C\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059',
-        typeVarScopedToReturnType: '\u578B\u5909\u6570 "{name}" \u306E\u30B9\u30B3\u30FC\u30D7\u306F\u623B\u308A\u5024\u306E\u578B\u5185\u306E\u547C\u3073\u51FA\u3057\u53EF\u80FD\u306A\u5909\u6570\u3067\u3042\u308A\u3001\u95A2\u6570\u672C\u4F53\u3067\u306F\u53C2\u7167\u3067\u304D\u307E\u305B\u3093',
         typeVarSingleConstraint: "TypeVar \u306B\u306F\u5C11\u306A\u304F\u3068\u3082 2 \u3064\u306E\u5236\u7D04\u4ED8\u304D\u578B\u304C\u5FC5\u8981\u3067\u3059",
         typeVarTupleConstraints: "TypeVarTuple \u306B\u5024\u5236\u7D04\u3092\u6301\u305F\u305B\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093",
         typeVarTupleContext: "TypeVarTuple \u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093",
@@ -20554,7 +20553,7 @@ var require_package_nls_ja = __commonJS({
         unpackNotAllowed: "\u30A2\u30F3\u30D1\u30C3\u30AF\u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093",
         unpackOperatorNotAllowed: "\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u30A2\u30F3\u30D1\u30C3\u30AF\u64CD\u4F5C\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093",
         unpackTuplesIllegal: "Python 3.8 \u3088\u308A\u524D\u306E\u30BF\u30D7\u30EB\u3067\u306F\u30A2\u30F3\u30D1\u30C3\u30AF\u64CD\u4F5C\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093",
-        unpackedArgInTypeArgument: "\u30A2\u30F3\u30D1\u30C3\u30AF\u3055\u308C\u305F\u5F15\u6570\u306F\u3001\u578B\u5F15\u6570\u30EA\u30B9\u30C8\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093",
+        unpackedArgInTypeArgument: "\u30A2\u30F3\u30D1\u30C3\u30AF\u3055\u308C\u305F\u5F15\u6570\u306F\u3001\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093",
         unpackedArgWithVariadicParam: "\u30A2\u30F3\u30D1\u30C3\u30AF\u3055\u308C\u305F\u5F15\u6570\u306F TypeVarTuple \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093",
         unpackedDictArgumentNotMapping: '** \u306E\u5F8C\u306E\u5F15\u6570\u5F0F\u306F\u3001"str" \u30AD\u30FC\u578B\u306E\u30DE\u30C3\u30D4\u30F3\u30B0\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059',
         unpackedDictSubscriptIllegal: "\u4E0B\u4ED8\u304D\u6587\u5B57\u306E\u8F9E\u66F8\u30A2\u30F3\u30D1\u30C3\u30AF\u6F14\u7B97\u5B50\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093",
@@ -21019,7 +21018,7 @@ var require_package_nls_ko = __commonJS({
         incompatibleMethodOverride: '"{name}" \uBA54\uC11C\uB4DC\uAC00 \uD638\uD658\uB418\uC9C0 \uC54A\uB294 \uBC29\uC2DD\uC73C\uB85C "{className}" \uD074\uB798\uC2A4\uB97C \uC7AC\uC815\uC758\uD569\uB2C8\uB2E4.',
         inconsistentIndent: "\uB4E4\uC5EC\uC4F0\uAE30\uD558\uC9C0 \uC54A\uC740 \uC591\uC774 \uC774\uC804 \uB4E4\uC5EC\uC4F0\uAE30\uC640 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.",
         inconsistentTabs: "\uB4E4\uC5EC\uC4F0\uAE30\uC5D0\uC11C \uD0ED \uBC0F \uACF5\uBC31\uC758 \uC77C\uAD00\uC131 \uC5C6\uB294 \uC0AC\uC6A9",
-        initMethodSelfParamTypeVar: '"__init__" \uBA54\uC11C\uB4DC\uC758 "self" \uB9E4\uAC1C \uBCC0\uC218\uC758 \uD615\uC2DD \uC8FC\uC11D\uC5D0\uB294 \uD074\uB798\uC2A4 \uBC94\uC704 \uD615\uC2DD varaiable\uC744 \uD3EC\uD568\uD560 \uC218 \uC5C6\uC74C',
+        initMethodSelfParamTypeVar: '"__init__" \uBA54\uC11C\uB4DC\uC758 "self" \uB9E4\uAC1C \uBCC0\uC218\uC758 \uD615\uC2DD \uC8FC\uC11D\uC5D0\uB294 \uD074\uB798\uC2A4 \uBC94\uC704 \uD615\uC2DD variable\uC744 \uD3EC\uD568\uD560 \uC218 \uC5C6\uC74C',
         initMustReturnNone: '"__init__"\uC758 \uBC18\uD658 \uD615\uC2DD\uC740 None\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.',
         initSubclassCallFailed: "__init_subclass__ \uBA54\uC11C\uB4DC\uC758 \uD0A4\uC6CC\uB4DC \uC778\uC218\uAC00 \uC798\uBABB\uB428",
         initSubclassClsParam: '__init_subclass__ \uC7AC\uC815\uC758\uB294 "cls" \uB9E4\uAC1C \uBCC0\uC218\uB97C \uC0AC\uC6A9\uD574\uC57C \uD569\uB2C8\uB2E4.',
@@ -21141,7 +21140,6 @@ var require_package_nls_ko = __commonJS({
         paramSpecFirstArg: "\uCCAB \uBC88\uC9F8 \uC778\uC218\uB85C ParamSpec\uC758 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.",
         paramSpecKwargsUsage: 'ParamSpec\uC758 "kwargs" \uD2B9\uC131\uC740 *kwargs \uB9E4\uAC1C \uBCC0\uC218\uC640 \uD568\uAED8 \uC0AC\uC6A9\uD560 \uACBD\uC6B0\uC5D0\uB9CC \uC720\uD6A8\uD568',
         paramSpecNotUsedByOuterScope: 'ParamSpec "{name}"\uC740(\uB294) \uC774 \uCEE8\uD14D\uC2A4\uD2B8\uC5D0\uC11C \uC758\uBBF8\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.',
-        paramSpecScopedToReturnType: "ParamSpec \u2018{name}\u2019\uC740 \uBC18\uD658 \uD615\uC2DD \uB0B4\uC5D0\uC11C \uD638\uCD9C \uAC00\uB2A5\uC73C\uB85C \uBC94\uC704\uAC00 \uC9C0\uC815\uB418\uBA70 \uD568\uC218 \uBCF8\uBB38\uC5D0\uC11C \uCC38\uC870\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
         paramSpecUnknownArg: "ParamSpec\uC740 \uD55C \uAC1C \uC774\uC0C1\uC758 \uC778\uC218\uB97C \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.",
         paramSpecUnknownMember: '"{name}"\uC740(\uB294) ParamSpec\uC758 \uC54C\uB824\uC9C4 \uD2B9\uC131\uC774 \uC544\uB2D8',
         paramSpecUnknownParam: "\u2018{name}\u2019\uC740(\uB294) ParamSpec\uC5D0 \uB300\uD55C \uC54C \uC218 \uC5C6\uB294 \uB9E4\uAC1C \uBCC0\uC218\uC785\uB2C8\uB2E4.",
@@ -21293,7 +21291,6 @@ var require_package_nls_ko = __commonJS({
         typeVarNotSubscriptable: 'TypeVar "{type}"\uC744(\uB97C) \uCCA8\uC790\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.',
         typeVarNotUsedByOuterScope: '\uD615\uC2DD \uBCC0\uC218 "{name}"\uC740(\uB294) \uC774 \uCEE8\uD14D\uC2A4\uD2B8\uC5D0\uC11C \uC758\uBBF8\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.',
         typeVarPossiblyUnsolvable: "\uD638\uCD9C\uC790\uAC00 \u2018{param}\u2019 \uB9E4\uAC1C \uBCC0\uC218\uC5D0 \uB300\uD55C \uC778\uC218\uB97C \uC81C\uACF5\uD558\uC9C0 \uC54A\uC73C\uBA74 \u2018{name}\u2019 \uD615\uC2DD \uBCC0\uC218\uAC00 \uD655\uC778\uB418\uC9C0 \uC54A\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4.",
-        typeVarScopedToReturnType: "\u2018{name}\u2019 \uD615\uC2DD \uBCC0\uC218\uB294 \uBC18\uD658 \uD615\uC2DD \uB0B4\uC5D0\uC11C \uD638\uCD9C \uAC00\uB2A5\uC73C\uB85C \uBC94\uC704\uAC00 \uC9C0\uC815\uB418\uBA70 \uD568\uC218 \uBCF8\uBB38\uC5D0\uC11C \uCC38\uC870\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
         typeVarSingleConstraint: "TypeVar\uC5D0\uB294 \uB450 \uAC1C \uC774\uC0C1\uC758 \uC81C\uD55C\uB41C \uD615\uC2DD\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.",
         typeVarTupleConstraints: "TypeVarTuple\uC5D0\uB294 \uAC12 \uC81C\uC57D \uC870\uAC74\uC774 \uC788\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
         typeVarTupleContext: "TypeVarTuple\uC740 \uC774 \uCEE8\uD14D\uC2A4\uD2B8\uC5D0\uC11C \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.",
@@ -21364,7 +21361,7 @@ var require_package_nls_ko = __commonJS({
         unpackNotAllowed: "\uC774 \uCEE8\uD14D\uC2A4\uD2B8\uC5D0\uC11C\uB294 \uC555\uCD95 \uD480\uAE30\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.",
         unpackOperatorNotAllowed: "\uC774 \uCEE8\uD14D\uC2A4\uD2B8\uC5D0\uC11C\uB294 \uC555\uCD95 \uD480\uAE30 \uC791\uC5C5\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.",
         unpackTuplesIllegal: "Python 3.8 \uC774\uC804\uC758 \uD29C\uD50C\uC5D0\uC11C\uB294 \uC555\uCD95 \uD480\uAE30 \uC791\uC5C5\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.",
-        unpackedArgInTypeArgument: "\uC555\uCD95\uB418\uC9C0 \uC54A\uC740 \uC778\uC218\uB294 \uD615\uC2DD \uC778\uC218 \uBAA9\uB85D\uC5D0 \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
+        unpackedArgInTypeArgument: "\uC555\uCD95\uC744 \uD47C \uC778\uC218\uB294 \uC774 \uCEE8\uD14D\uC2A4\uD2B8\uC5D0\uC11C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC74C",
         unpackedArgWithVariadicParam: "\uC555\uCD95\uC744 \uD47C \uC778\uC218\uB294 TypeVarTuple \uB9E4\uAC1C \uBCC0\uC218\uC5D0 \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
         unpackedDictArgumentNotMapping: '** \uB4A4\uC758 \uC778\uC218 \uC2DD\uC740 "str" \uD0A4 \uD615\uC2DD\uC758 \uB9E4\uD551\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.',
         unpackedDictSubscriptIllegal: "\uC544\uB798 \uCCA8\uC790\uC5D0\uC11C \uC0AC\uC804 \uC555\uCD95 \uD480\uAE30 \uC5F0\uC0B0\uC790\uB294 \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
@@ -21951,7 +21948,6 @@ var require_package_nls_pl = __commonJS({
         paramSpecFirstArg: "Oczekiwano nazwy parametru ParamSpec jako pierwszego argumentu",
         paramSpecKwargsUsage: "Atrybut \u201Ekwargs\u201D parametru ParamSpec jest wa\u017Cna tylko wtedy, gdy jest u\u017Cywana z parametrem **kwargs",
         paramSpecNotUsedByOuterScope: "Element ParamSpec \u201E{name}\u201D nie ma znaczenia w tym kontek\u015Bcie",
-        paramSpecScopedToReturnType: "Parametr ParamSpec \u201E{name}\u201D jest obj\u0119ty zakresem mo\u017Cliwo\u015Bci wywo\u0142ania w ramach zwracanego typu i nie mo\u017Cna odwo\u0142ywa\u0107 si\u0119 do niego w tre\u015Bci funkcji",
         paramSpecUnknownArg: "Parametr ParamSpec nie obs\u0142uguje wi\u0119cej ni\u017C jednego argumentu",
         paramSpecUnknownMember: "\u201E{name}\u201D nie jest znanym atrybutem parametru ParamSpec",
         paramSpecUnknownParam: "\u201E{name}\u201D jest nieznanym parametrem dla parametru ParamSpec",
@@ -22103,7 +22099,6 @@ var require_package_nls_pl = __commonJS({
         typeVarNotSubscriptable: "Typ TypeVar \u201E{type}\u201D nie mo\u017Ce by\u0107 subskrybowany",
         typeVarNotUsedByOuterScope: "Zmienna typu \u201E{name}\u201D nie ma w tym kontek\u015Bcie \u017Cadnego znaczenia",
         typeVarPossiblyUnsolvable: "Zmienna typu \u201E{name}\u201D mo\u017Ce zosta\u0107 nierozwi\u0105zana, je\u015Bli obiekt wywo\u0142uj\u0105cy nie poda argumentu dla parametru \u201E{param}\u201D",
-        typeVarScopedToReturnType: "Zmienna typu \u201E{name}\u201D jest obj\u0119ta zakresem mo\u017Cliwo\u015Bci wywo\u0142ania w typie zwracanym i nie mo\u017Cna odwo\u0142ywa\u0107 si\u0119 do niej w tre\u015Bci funkcji",
         typeVarSingleConstraint: "Typ TypeVar musi mie\u0107 co najmniej dwa typy ograniczone",
         typeVarTupleConstraints: "Element TypeVarTuple nie mo\u017Ce mie\u0107 ogranicze\u0144 warto\u015Bci",
         typeVarTupleContext: "Warto\u015B\u0107 TypeVarTuple jest niedozwolona w tym kontek\u015Bcie",
@@ -22174,7 +22169,7 @@ var require_package_nls_pl = __commonJS({
         unpackNotAllowed: "Rozpakowywanie jest niedozwolone w tym kontek\u015Bcie",
         unpackOperatorNotAllowed: "Operacja rozpakowywania jest niedozwolona w tym kontek\u015Bcie",
         unpackTuplesIllegal: "Operacja rozpakowywania nie jest dozwolona w krotkach przed j\u0119zykiem Python w wersji 3.8",
-        unpackedArgInTypeArgument: "Rozpakowanych argument\xF3w nie mo\u017Cna u\u017Cywa\u0107 na listach argument\xF3w typu",
+        unpackedArgInTypeArgument: "Nie mo\u017Cna u\u017Cy\u0107 nierozpakowanych argument\xF3w w tym kontek\u015Bcie",
         unpackedArgWithVariadicParam: "Nie mo\u017Cna u\u017Cy\u0107 nierozpakowanego argumentu dla parametru TypeVarTuple",
         unpackedDictArgumentNotMapping: "Wyra\u017Cenie argumentu po znakach ** musi by\u0107 mapowaniem z typem klucza \u201Estr\u201D",
         unpackedDictSubscriptIllegal: "Operator rozpakowywania s\u0142ownika w indeksie dolnym jest niedozwolony",
@@ -22761,7 +22756,6 @@ var require_package_nls_pt_br = __commonJS({
         paramSpecFirstArg: "Nome esperado de ParamSpec como primeiro argumento",
         paramSpecKwargsUsage: 'O atributo "kwargs" de ParamSpec \xE9 v\xE1lido somente quando usado com o par\xE2metro **kwargs',
         paramSpecNotUsedByOuterScope: 'O ParamSpec "{name}" n\xE3o tem significado neste contexto',
-        paramSpecScopedToReturnType: 'ParamSpec "{name}" tem como escopo um chamador dentro do tipo de retorno e n\xE3o pode ser referenciado no corpo da fun\xE7\xE3o',
         paramSpecUnknownArg: "ParamSpec n\xE3o \xE9 compat\xEDvel com mais de um argumento",
         paramSpecUnknownMember: '"{name}" n\xE3o \xE9 um atributo conhecido de ParamSpec',
         paramSpecUnknownParam: '"{name}" \xE9 um par\xE2metro desconhecido para ParamSpec',
@@ -22913,7 +22907,6 @@ var require_package_nls_pt_br = __commonJS({
         typeVarNotSubscriptable: 'N\xE3o \xE9 poss\xEDvel subscrever TypeVar "{type}"',
         typeVarNotUsedByOuterScope: 'A vari\xE1vel de tipo "{name}" n\xE3o tem significado neste contexto',
         typeVarPossiblyUnsolvable: 'A vari\xE1vel de tipo "{name}" pode ficar sem resolu\xE7\xE3o se o chamador n\xE3o fornecer nenhum argumento para o par\xE2metro "{param}"',
-        typeVarScopedToReturnType: 'A vari\xE1vel de tipo "{name}" tem como escopo um chamador dentro do tipo de retorno e n\xE3o pode ser referenciada no corpo da fun\xE7\xE3o',
         typeVarSingleConstraint: "TypeVar deve ter pelo menos dois tipos restritos",
         typeVarTupleConstraints: "TypeVarTuple n\xE3o pode ter restri\xE7\xF5es de valor",
         typeVarTupleContext: "TypeVarTuple n\xE3o \xE9 permitido neste contexto",
@@ -22984,7 +22977,7 @@ var require_package_nls_pt_br = __commonJS({
         unpackNotAllowed: "Descompactar n\xE3o \xE9 permitido neste contexto",
         unpackOperatorNotAllowed: "A opera\xE7\xE3o de descompacta\xE7\xE3o n\xE3o \xE9 permitida neste contexto",
         unpackTuplesIllegal: "Opera\xE7\xE3o de desempacotamento n\xE3o permitida em tuplas anteriores ao Python 3.8",
-        unpackedArgInTypeArgument: "Argumentos desempacotamento n\xE3o podem ser usados em listas de argumentos de tipo",
+        unpackedArgInTypeArgument: "Os argumentos descompactados n\xE3o podem ser usados nesse contexto",
         unpackedArgWithVariadicParam: "O argumento desempacotado n\xE3o pode ser usado para o par\xE2metro TypeVarTuple",
         unpackedDictArgumentNotMapping: 'A express\xE3o de argumento ap\xF3s ** deve ser um mapeamento com um tipo de chave "str"',
         unpackedDictSubscriptIllegal: "O operador de desempacotamento de dicion\xE1rio no subscrito n\xE3o \xE9 permitido",
@@ -23449,7 +23442,7 @@ var require_package_nls_qps_ploc = __commonJS({
         incompatibleMethodOverride: '[i45Ka][\u0E19\u0E31\u0E49M\xEBth\xF8\xF0 "{\xF1\xE6m\xEB}" \xF8v\xEBrr\xEF\xF0\xEBs \xE7l\xE6ss "{\xE7l\xE6ss\xD1\xE6m\xEB}" \xEF\xF1 \xE6\xF1 \xEF\xF1\xE7\xF8mp\xE6t\xEF\xFEl\xEB m\xE6\xF1\xF1\xEBr\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
         inconsistentIndent: "[gdrcy][\u0E19\u0E31\u0E49\xDC\xF1\xEF\xF1\xF0\xEB\xF1t \xE6m\xF8\xB5\xF1t \xF0\xF8\xEBs \xF1\xF8t m\xE6t\xE7h pr\xEBv\xEF\xF8\xB5s \xEF\xF1\xF0\xEB\xF1t\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
         inconsistentTabs: "[I3Z6K][\u0E19\u0E31\u0E49\xCF\xF1\xE7\xF8\xF1s\xEFst\xEB\xF1t \xB5s\xEB \xF8f t\xE6\xFEs \xE6\xF1\xF0 sp\xE6\xE7\xEBs \xEF\xF1 \xEF\xF1\xF0\xEB\xF1t\xE6t\xEF\xF8\xF1\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
-        initMethodSelfParamTypeVar: '[S5RC7][\u0E19\u0E31\u0E49T\xFFp\xEB \xE6\xF1\xF1\xF8t\xE6t\xEF\xF8\xF1 f\xF8r "s\xEBlf" p\xE6r\xE6m\xEBt\xEBr \xF8f "__\xEF\xF1\xEFt__" m\xEBth\xF8\xF0 \xE7\xE6\xF1\xF1\xF8t \xE7\xF8\xF1t\xE6\xEF\xF1 \xE7l\xE6ss-s\xE7\xF8p\xEB\xF0 t\xFFp\xEB v\xE6r\xE6\xEF\xE6\xFEl\xEBs\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
+        initMethodSelfParamTypeVar: '[S5RC7][\u0E19\u0E31\u0E49T\xFFp\xEB \xE6\xF1\xF1\xF8t\xE6t\xEF\xF8\xF1 f\xF8r "s\xEBlf" p\xE6r\xE6m\xEBt\xEBr \xF8f "__\xEF\xF1\xEFt__" m\xEBth\xF8\xF0 \xE7\xE6\xF1\xF1\xF8t \xE7\xF8\xF1t\xE6\xEF\xF1 \xE7l\xE6ss-s\xE7\xF8p\xEB\xF0 t\xFFp\xEB v\xE6r\xEF\xE6\xFEl\xEBs\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
         initMustReturnNone: '[RlXyC][\u0E19\u0E31\u0E49R\xEBt\xB5r\xF1 t\xFFp\xEB \xF8f "__\xEF\xF1\xEFt__" m\xB5st \xFE\xEB \xD1\xF8\xF1\xEB\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
         initSubclassCallFailed: "[w22Kh][\u0E19\u0E31\u0E49\xCF\xF1\xE7\xF8rr\xEB\xE7t k\xEB\xFFw\xF8r\xF0 \xE6rg\xB5m\xEB\xF1ts f\xF8r __\xEF\xF1\xEFt_s\xB5\xFE\xE7l\xE6ss__ m\xEBth\xF8\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
         initSubclassClsParam: '[6CWuS][\u0E19\u0E31\u0E49__\xEF\xF1\xEFt_s\xB5\xFE\xE7l\xE6ss__ \xF8v\xEBrr\xEF\xF0\xEB sh\xF8\xB5l\xF0 t\xE6k\xEB \xE6 "\xE7ls" p\xE6r\xE6m\xEBt\xEBr\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
@@ -23571,7 +23564,6 @@ var require_package_nls_qps_ploc = __commonJS({
         paramSpecFirstArg: "[W2Y3X][\u0E19\u0E31\u0E49\xCBxp\xEB\xE7t\xEB\xF0 \xF1\xE6m\xEB \xF8f P\xE6r\xE6m\xA7p\xEB\xE7 \xE6s f\xEFrst \xE6rg\xB5m\xEB\xF1t\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
         paramSpecKwargsUsage: '[2UE71][\u0E19\u0E31\u0E49"kw\xE6rgs" \xE6ttr\xEF\xFE\xB5t\xEB \xF8f P\xE6r\xE6m\xA7p\xEB\xE7 \xEFs v\xE6l\xEF\xF0 \xF8\xF1l\xFF wh\xEB\xF1 \xB5s\xEB\xF0 w\xEFth **kw\xE6rgs p\xE6r\xE6m\xEBt\xEBr\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
         paramSpecNotUsedByOuterScope: '[5Pk7H][\u0E19\u0E31\u0E49P\xE6r\xE6m\xA7p\xEB\xE7 "{\xF1\xE6m\xEB}" h\xE6s \xF1\xF8 m\xEB\xE6\xF1\xEF\xF1g \xEF\xF1 th\xEFs \xE7\xF8\xF1t\xEBxt\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
-        paramSpecScopedToReturnType: '[vVuXS][\u0E19\u0E31\u0E49P\xE6r\xE6m\xA7p\xEB\xE7 "{\xF1\xE6m\xEB}" \xEFs s\xE7\xF8p\xEB\xF0 t\xF8 \xE6 \xE7\xE6ll\xE6\xFEl\xEB w\xEFth\xEF\xF1 th\xEB r\xEBt\xB5r\xF1 t\xFFp\xEB \xE6\xF1\xF0 \xE7\xE6\xF1\xF1\xF8t \xFE\xEB r\xEBf\xEBr\xEB\xF1\xE7\xEB\xF0 \xEF\xF1 th\xEB f\xB5\xF1\xE7t\xEF\xF8\xF1 \xFE\xF8\xF0\xFF\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
         paramSpecUnknownArg: "[6zeYc][\u0E19\u0E31\u0E49P\xE6r\xE6m\xA7p\xEB\xE7 \xF0\xF8\xEBs \xF1\xF8t s\xB5pp\xF8rt m\xF8r\xEB th\xE6\xF1 \xF8\xF1\xEB \xE6rg\xB5m\xEB\xF1t\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
         paramSpecUnknownMember: '[GhhiY][\u0E19\u0E31\u0E49"{\xF1\xE6m\xEB}" \xEFs \xF1\xF8t \xE6 k\xF1\xF8w\xF1 \xE6ttr\xEF\xFE\xB5t\xEB \xF8f P\xE6r\xE6m\xA7p\xEB\xE7\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
         paramSpecUnknownParam: '[YADLo][\u0E19\u0E31\u0E49"{\xF1\xE6m\xEB}" \xEFs \xB5\xF1k\xF1\xF8w\xF1 p\xE6r\xE6m\xEBt\xEBr t\xF8 P\xE6r\xE6m\xA7p\xEB\xE7\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
@@ -23723,7 +23715,6 @@ var require_package_nls_qps_ploc = __commonJS({
         typeVarNotSubscriptable: '[3KoEm][\u0E19\u0E31\u0E49T\xFFp\xEBV\xE6r "{t\xFFp\xEB}" \xEFs \xF1\xF8t s\xB5\xFEs\xE7r\xEFpt\xE6\xFEl\xEB\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
         typeVarNotUsedByOuterScope: '[on7uQ][\u0E19\u0E31\u0E49T\xFFp\xEB v\xE6r\xEF\xE6\xFEl\xEB "{\xF1\xE6m\xEB}" h\xE6s \xF1\xF8 m\xEB\xE6\xF1\xEF\xF1g \xEF\xF1 th\xEFs \xE7\xF8\xF1t\xEBxt\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
         typeVarPossiblyUnsolvable: '[PP5xz][\u0E19\u0E31\u0E49T\xFFp\xEB v\xE6r\xEF\xE6\xFEl\xEB "{\xF1\xE6m\xEB}" m\xE6\xFF g\xF8 \xB5\xF1s\xF8lv\xEB\xF0 \xEFf \xE7\xE6ll\xEBr s\xB5ppl\xEF\xEBs \xF1\xF8 \xE6rg\xB5m\xEB\xF1t f\xF8r p\xE6r\xE6m\xEBt\xEBr "{p\xE6r\xE6m}"\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
-        typeVarScopedToReturnType: '[AYNcY][\u0E19\u0E31\u0E49T\xFFp\xEB v\xE6r\xEF\xE6\xFEl\xEB "{\xF1\xE6m\xEB}" \xEFs s\xE7\xF8p\xEB\xF0 t\xF8 \xE6 \xE7\xE6ll\xE6\xFEl\xEB w\xEFth\xEF\xF1 th\xEB r\xEBt\xB5r\xF1 t\xFFp\xEB \xE6\xF1\xF0 \xE7\xE6\xF1\xF1\xF8t \xFE\xEB r\xEBf\xEBr\xEB\xF1\xE7\xEB\xF0 \xEF\xF1 th\xEB f\xB5\xF1\xE7t\xEF\xF8\xF1 \xFE\xF8\xF0\xFF\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
         typeVarSingleConstraint: "[51MwX][\u0E19\u0E31\u0E49T\xFFp\xEBV\xE6r m\xB5st h\xE6v\xEB \xE6t l\xEB\xE6st tw\xF8 \xE7\xF8\xF1str\xE6\xEF\xF1\xEB\xF0 t\xFFp\xEBs\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
         typeVarTupleConstraints: "[ouP8u][\u0E19\u0E31\u0E49T\xFFp\xEBV\xE6rT\xB5pl\xEB \xE7\xE6\xF1\xF1\xF8t h\xE6v\xEB v\xE6l\xB5\xEB \xE7\xF8\xF1str\xE6\xEF\xF1ts\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
         typeVarTupleContext: "[Q8vE2][\u0E19\u0E31\u0E49T\xFFp\xEBV\xE6rT\xB5pl\xEB \xEFs \xF1\xF8t \xE6ll\xF8w\xEB\xF0 \xEF\xF1 th\xEFs \xE7\xF8\xF1t\xEBxt\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
@@ -23794,7 +23785,7 @@ var require_package_nls_qps_ploc = __commonJS({
         unpackNotAllowed: "[MZq6e][\u0E19\u0E31\u0E49\xDC\xF1p\xE6\xE7k \xEFs \xF1\xF8t \xE6ll\xF8w\xEB\xF0 \xEF\xF1 th\xEFs \xE7\xF8\xF1t\xEBxt\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
         unpackOperatorNotAllowed: "[lMq2B][\u0E19\u0E31\u0E49\xDC\xF1p\xE6\xE7k \xF8p\xEBr\xE6t\xEF\xF8\xF1 \xEFs \xF1\xF8t \xE6ll\xF8w\xEB\xF0 \xEF\xF1 th\xEFs \xE7\xF8\xF1t\xEBxt\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
         unpackTuplesIllegal: "[RJvzW][\u0E19\u0E31\u0E49\xDC\xF1p\xE6\xE7k \xF8p\xEBr\xE6t\xEF\xF8\xF1 \xF1\xF8t \xE6ll\xF8w\xEB\xF0 \xEF\xF1 t\xB5pl\xEBs pr\xEF\xF8r t\xF8 P\xFFth\xF8\xF1 3.8\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
-        unpackedArgInTypeArgument: "[skxlo][\u0E19\u0E31\u0E49\xDC\xF1p\xE6\xE7k\xEB\xF0 \xE6rg\xB5m\xEB\xF1ts \xE7\xE6\xF1\xF1\xF8t \xFE\xEB \xB5s\xEB\xF0 \xEF\xF1 t\xFFp\xEB \xE6rg\xB5m\xEB\xF1t l\xEFsts\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
+        unpackedArgInTypeArgument: "[skxlo][\u0E19\u0E31\u0E49\xDC\xF1p\xE6\xE7k\xEB\xF0 \xE6rg\xB5m\xEB\xF1ts \xE7\xE6\xF1\xF1\xF8t \xFE\xEB \xB5s\xEB\xF0 \xEF\xF1 th\xEFs \xE7\xF8\xF1t\xEBxt\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
         unpackedArgWithVariadicParam: "[ZP3kP][\u0E19\u0E31\u0E49\xDC\xF1p\xE6\xE7k\xEB\xF0 \xE6rg\xB5m\xEB\xF1t \xE7\xE6\xF1\xF1\xF8t \xFE\xEB \xB5s\xEB\xF0 f\xF8r T\xFFp\xEBV\xE6rT\xB5pl\xEB p\xE6r\xE6m\xEBt\xEBr\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
         unpackedDictArgumentNotMapping: '[iSTnU][\u0E19\u0E31\u0E49\xC6rg\xB5m\xEB\xF1t \xEBxpr\xEBss\xEF\xF8\xF1 \xE6ft\xEBr ** m\xB5st \xFE\xEB \xE6 m\xE6pp\xEF\xF1g w\xEFth \xE6 "str" k\xEB\xFF t\xFFp\xEB\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
         unpackedDictSubscriptIllegal: "[slATr][\u0E19\u0E31\u0E49\xD0\xEF\xE7t\xEF\xF8\xF1\xE6r\xFF \xB5\xF1p\xE6\xE7k \xF8p\xEBr\xE6t\xF8r \xEF\xF1 s\xB5\xFEs\xE7r\xEFpt \xEFs \xF1\xF8t \xE6ll\xF8w\xEB\xF0\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
@@ -24259,7 +24250,7 @@ var require_package_nls_ru = __commonJS({
         incompatibleMethodOverride: '\u041C\u0435\u0442\u043E\u0434 "{name}" \u043F\u0435\u0440\u0435\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442 \u043A\u043B\u0430\u0441\u0441 "{className}" \u043D\u0435\u0441\u043E\u0432\u043C\u0435\u0441\u0442\u0438\u043C\u044B\u043C \u043E\u0431\u0440\u0430\u0437\u043E\u043C',
         inconsistentIndent: "\u0421\u0443\u043C\u043C\u0430 \u043E\u0442\u0441\u0442\u0443\u043F\u0430 \u043D\u0435 \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u043F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0435\u043C\u0443 \u043E\u0442\u0441\u0442\u0443\u043F\u0443",
         inconsistentTabs: "\u041D\u0435\u043F\u043E\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435 \u0432\u043A\u043B\u0430\u0434\u043E\u043A \u0438 \u043F\u0440\u043E\u0431\u0435\u043B\u043E\u0432 \u0432 \u043E\u0442\u0441\u0442\u0443\u043F\u0430\u0445",
-        initMethodSelfParamTypeVar: '\u0410\u043D\u043D\u043E\u0442\u0430\u0446\u0438\u044F \u0442\u0438\u043F\u0430 \u0434\u043B\u044F \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430 "self" \u043C\u0435\u0442\u043E\u0434\u0430 "__init__" \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0442\u044C \u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435 \u0442\u0438\u043F\u043E\u0432 \u0441 \u043E\u0431\u043B\u0430\u0441\u0442\u044C\u044E \u043A\u043B\u0430\u0441\u0441\u0430',
+        initMethodSelfParamTypeVar: '\u0417\u0430\u043C\u0435\u0442\u043A\u0430 \u0442\u0438\u043F\u0430 \u0434\u043B\u044F \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430 "self" \u043C\u0435\u0442\u043E\u0434\u0430 "__init__" \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0442\u044C \u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435 \u0442\u0438\u043F\u0430 \u0432 \u043E\u0431\u043B\u0430\u0441\u0442\u0438 \u043A\u043B\u0430\u0441\u0441\u0430.',
         initMustReturnNone: '\u041C\u0435\u0442\u043E\u0434 "__init__" \u0434\u043E\u043B\u0436\u0435\u043D \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0430\u0442\u044C \u0442\u0438\u043F None',
         initSubclassCallFailed: "\u041D\u0435\u0432\u0435\u0440\u043D\u044B\u0435 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B \u043A\u043B\u044E\u0447\u0435\u0432\u044B\u0445 \u0441\u043B\u043E\u0432 \u0434\u043B\u044F \u043C\u0435\u0442\u043E\u0434\u0430 __init_subclass__",
         initSubclassClsParam: '\u041F\u0435\u0440\u0435\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u0435 \u043C\u0435\u0442\u043E\u0434\u0430 __init_subclass__ \u0434\u043E\u043B\u0436\u043D\u043E \u043F\u0440\u0438\u043D\u0438\u043C\u0430\u0442\u044C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 "cls"',
@@ -24381,7 +24372,6 @@ var require_package_nls_ru = __commonJS({
         paramSpecFirstArg: "\u041E\u0436\u0438\u0434\u0430\u0435\u0442\u0441\u044F \u0438\u043C\u044F ParamSpec \u0432 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u043F\u0435\u0440\u0432\u043E\u0433\u043E \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u0430",
         paramSpecKwargsUsage: '\u0410\u0442\u0440\u0438\u0431\u0443\u0442 "kwargs" ParamSpec \u0434\u043E\u043F\u0443\u0441\u0442\u0438\u043C \u0442\u043E\u043B\u044C\u043A\u043E \u043F\u0440\u0438 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0438 \u0441 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u043C *kwargs',
         paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" \u043D\u0435 \u0438\u043C\u0435\u0435\u0442 \u0441\u043C\u044B\u0441\u043B\u0430 \u0432 \u044D\u0442\u043E\u043C \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0435',
-        paramSpecScopedToReturnType: 'ParamSpec "{name}" \u043E\u0442\u043D\u043E\u0441\u0438\u0442\u0441\u044F \u043A \u043E\u0431\u043B\u0430\u0441\u0442\u0438 \u0432\u044B\u0437\u044B\u0432\u0430\u0435\u043C\u043E\u0433\u043E \u043E\u0431\u044A\u0435\u043A\u0442\u0430 \u0432 \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0430\u0435\u043C\u043E\u043C \u0442\u0438\u043F\u0435, \u0438 \u043D\u0430 \u043D\u0435\u0433\u043E \u043D\u0435\u043B\u044C\u0437\u044F \u0441\u0441\u044B\u043B\u0430\u0442\u044C\u0441\u044F \u0432 \u0442\u0435\u043A\u0441\u0442\u0435 \u0444\u0443\u043D\u043A\u0446\u0438\u0438.',
         paramSpecUnknownArg: "ParamSpec \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0431\u043E\u043B\u0435\u0435 \u043E\u0434\u043D\u043E\u0433\u043E \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u0430",
         paramSpecUnknownMember: '"{name}" \u043D\u0435 \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u0438\u0437\u0432\u0435\u0441\u0442\u043D\u044B\u043C \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u043E\u043C ParamSpec',
         paramSpecUnknownParam: '"{name}" \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u044B\u043C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u043C \u0434\u043B\u044F ParamSpec',
@@ -24533,7 +24523,6 @@ var require_package_nls_ru = __commonJS({
         typeVarNotSubscriptable: '\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0432\u0437\u044F\u0442\u044C \u043F\u043E\u0434\u0441\u0442\u0440\u043E\u043A\u0443 \u043E\u0442 "{type}" TypeVar',
         typeVarNotUsedByOuterScope: '\u041F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u0430\u044F \u0442\u0438\u043F\u0430 "{name}" \u043D\u0435 \u0438\u043C\u0435\u0435\u0442 \u0441\u043C\u044B\u0441\u043B\u0430 \u0432 \u044D\u0442\u043E\u043C \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0435',
         typeVarPossiblyUnsolvable: '\u041F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u0430\u044F \u0442\u0438\u043F\u0430 "{name}" \u043C\u043E\u0436\u0435\u0442 \u043E\u0441\u0442\u0430\u0442\u044C\u0441\u044F \u043D\u0435\u0440\u0435\u0448\u0435\u043D\u043D\u043E\u0439, \u0435\u0441\u043B\u0438 \u0432\u044B\u0437\u044B\u0432\u0430\u044E\u0449\u0430\u044F \u0441\u0442\u043E\u0440\u043E\u043D\u0430 \u043D\u0435 \u0443\u043A\u0430\u0437\u044B\u0432\u0430\u0435\u0442 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442 \u0434\u043B\u044F \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430 "{param}"',
-        typeVarScopedToReturnType: '\u041F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u0430\u044F \u0442\u0438\u043F\u0430 "{name}" \u043E\u0442\u043D\u043E\u0441\u0438\u0442\u0441\u044F \u043A \u0432\u044B\u0437\u044B\u0432\u0430\u0435\u043C\u043E\u043C\u0443 \u043E\u0431\u044A\u0435\u043A\u0442\u0443 \u0432 \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0430\u0435\u043C\u043E\u043C \u0442\u0438\u043F\u0435, \u0438 \u043D\u0430 \u043D\u0435\u0435 \u043D\u0435\u043B\u044C\u0437\u044F \u0441\u0441\u044B\u043B\u0430\u0442\u044C\u0441\u044F \u0432 \u0442\u0435\u043A\u0441\u0442\u0435 \u0444\u0443\u043D\u043A\u0446\u0438\u0438.',
         typeVarSingleConstraint: "TypeVar \u0434\u043E\u043B\u0436\u0435\u043D \u0438\u043C\u0435\u0442\u044C \u043D\u0435 \u043C\u0435\u043D\u0435\u0435 \u0434\u0432\u0443\u0445 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u043D\u044B\u0445 \u0442\u0438\u043F\u043E\u0432",
         typeVarTupleConstraints: "TypeVarTuple \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u044F \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0439",
         typeVarTupleContext: "TypeVarTuple \u043D\u0435 \u0434\u043E\u043F\u0443\u0441\u043A\u0430\u0435\u0442\u0441\u044F \u0432 \u044D\u0442\u043E\u043C \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0435",
@@ -24604,7 +24593,7 @@ var require_package_nls_ru = __commonJS({
         unpackNotAllowed: "\u0420\u0430\u0441\u043F\u0430\u043A\u043E\u0432\u043A\u0430 \u0434\u043E\u043F\u0443\u0441\u043A\u0430\u0435\u0442\u0441\u044F \u0432 \u044D\u0442\u043E\u043C \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0435",
         unpackOperatorNotAllowed: "\u041E\u043F\u0435\u0440\u0430\u0446\u0438\u044F \u0440\u0430\u0441\u043F\u0430\u043A\u043E\u0432\u043A\u0438 \u0434\u043E\u043F\u0443\u0441\u043A\u0430\u0435\u0442\u0441\u044F \u0432 \u044D\u0442\u043E\u043C \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0435",
         unpackTuplesIllegal: "\u041E\u043F\u0435\u0440\u0430\u0446\u0438\u044E \u0440\u0430\u0441\u043F\u0430\u043A\u043E\u0432\u043A\u0438 \u0432 \u043A\u043E\u0440\u0442\u0435\u0436\u0430\u0445 \u043C\u043E\u0436\u043D\u043E \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0432 Python \u0432\u0435\u0440\u0441\u0438\u0438 \u043D\u0435 \u043D\u0438\u0436\u0435 3.8",
-        unpackedArgInTypeArgument: "\u041D\u0435\u0443\u043F\u0430\u043A\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B \u043D\u0435\u043B\u044C\u0437\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0432 \u0441\u043F\u0438\u0441\u043A\u0430\u0445 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u043E\u0432 \u0442\u0438\u043F\u0430",
+        unpackedArgInTypeArgument: "\u0412 \u044D\u0442\u043E\u043C \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0435 \u043D\u0435\u043B\u044C\u0437\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0440\u0430\u0441\u043F\u0430\u043A\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B",
         unpackedArgWithVariadicParam: "\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0440\u0430\u0441\u043F\u0430\u043A\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442 \u0434\u043B\u044F \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430 TypeVarTuple",
         unpackedDictArgumentNotMapping: '\u0412\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u0430 \u043F\u043E\u0441\u043B\u0435 ** \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u0441\u043E\u043F\u043E\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0438\u0435\u043C \u0441 \u0442\u0438\u043F\u043E\u043C \u043A\u043B\u044E\u0447\u0430 "str".',
         unpackedDictSubscriptIllegal: "\u041E\u043F\u0435\u0440\u0430\u0442\u043E\u0440 \u0440\u0430\u0441\u043F\u0430\u043A\u043E\u0432\u043A\u0438 \u0441\u043B\u043E\u0432\u0430\u0440\u044F \u043D\u0435 \u0434\u043E\u043F\u0443\u0441\u043A\u0430\u0435\u0442\u0441\u044F \u0432\u043D\u0443\u0442\u0440\u0438 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u0438 \u0432\u0437\u044F\u0442\u0438\u044F \u043F\u043E\u0434\u0441\u0442\u0440\u043E\u043A\u0438",
@@ -25191,7 +25180,6 @@ var require_package_nls_tr = __commonJS({
         paramSpecFirstArg: "\u0130lk ba\u011F\u0131ms\u0131z de\u011Fi\u015Fken olarak ParamSpec ad\u0131 bekleniyordu",
         paramSpecKwargsUsage: `ParamSpec'in "kwargs" \xF6zniteli\u011Fi yaln\u0131zca **kwargs parametresiyle kullan\u0131ld\u0131\u011F\u0131nda ge\xE7erlidir`,
         paramSpecNotUsedByOuterScope: '"{name}" adl\u0131 ParamSpec bu ba\u011Flamda bir anlam ifade etmiyor',
-        paramSpecScopedToReturnType: 'ParamSpec "{name}" d\xF6n\xFC\u015F t\xFCr\xFC i\xE7inde \xE7a\u011Fr\u0131labilir kapsam\u0131na al\u0131nd\u0131 ve i\u015Flev g\xF6vdesinde ba\u015Fvurulamaz',
         paramSpecUnknownArg: "ParamSpec birden fazla ba\u011F\u0131ms\u0131z de\u011Fi\u015Fkeni desteklemiyor",
         paramSpecUnknownMember: '"{name}" bilinen bir ParamSpec \xF6zniteli\u011Fi de\u011Fil',
         paramSpecUnknownParam: '"{name}", ParamSpec i\xE7in bilinmeyen bir parametre',
@@ -25343,7 +25331,6 @@ var require_package_nls_tr = __commonJS({
         typeVarNotSubscriptable: 'TypeVar "{type}" alt yaz\u0131labilir de\u011Fil',
         typeVarNotUsedByOuterScope: '"{name}" t\xFCr de\u011Fi\u015Fkeni bu ba\u011Flamda bir anlam ifade etmiyor',
         typeVarPossiblyUnsolvable: '"{name}" t\xFCr de\u011Fi\u015Fkeni, \xE7a\u011F\u0131ran "{param}" parametresi i\xE7in ba\u011F\u0131ms\u0131z de\u011Fi\u015Fken sa\u011Flamazsa \xE7\xF6z\xFCmlenemeyebilir',
-        typeVarScopedToReturnType: '"{name}" t\xFCr de\u011Fi\u015Fkeni, d\xF6n\xFC\u015F t\xFCr\xFC i\xE7inde \xE7a\u011Fr\u0131labilir kapsam\u0131na al\u0131nd\u0131 ve i\u015Flev g\xF6vdesinde ba\u015Fvurulamaz',
         typeVarSingleConstraint: "TypeVar en az iki k\u0131s\u0131tlanm\u0131\u015F t\xFCre sahip olmal\u0131d\u0131r",
         typeVarTupleConstraints: "TypeVarTuple de\u011Fer k\u0131s\u0131tlamalar\u0131na sahip olamaz",
         typeVarTupleContext: "TypeVarTuple bu ba\u011Flamda kullan\u0131lamaz",
@@ -25414,7 +25401,7 @@ var require_package_nls_tr = __commonJS({
         unpackNotAllowed: "Bu ba\u011Flamda paketi a\xE7ma i\u015Flemine izin verilmiyor",
         unpackOperatorNotAllowed: "Bu ba\u011Flamda paket a\xE7ma i\u015Flemi kullan\u0131lamaz",
         unpackTuplesIllegal: "Python 3.8'den \xF6nceki demetler i\xE7inde paket a\xE7ma i\u015Flemi kullan\u0131lam\u0131yor",
-        unpackedArgInTypeArgument: "Paketlenmemi\u015F ba\u011F\u0131ms\u0131z de\u011Fi\u015Fkenler t\xFCr ba\u011F\u0131ms\u0131z de\u011Fi\u015Fkeni listelerinde kullan\u0131lamaz",
+        unpackedArgInTypeArgument: "Paketlenmemi\u015F ba\u011F\u0131ms\u0131z de\u011Fi\u015Fkenler bu ba\u011Flamda kullan\u0131lamaz",
         unpackedArgWithVariadicParam: "Paketlenmemi\u015F ba\u011F\u0131ms\u0131z de\u011Fi\u015Fken, TypeVarTuple parametresi i\xE7in kullan\u0131lamaz",
         unpackedDictArgumentNotMapping: '** sonras\u0131ndaki ba\u011F\u0131ms\u0131z de\u011Fi\u015Fken ifadesi "str" anahtar t\xFCr\xFCne sahip bir e\u015Fleme olmal\u0131d\u0131r',
         unpackedDictSubscriptIllegal: "Alt simgede s\xF6zl\xFCk a\xE7ma i\u015Flecine izin verilmiyor",
@@ -25879,7 +25866,7 @@ var require_package_nls_zh_cn = __commonJS({
         incompatibleMethodOverride: "\u65B9\u6CD5\u201C{name}\u201D\u4EE5\u4E0D\u517C\u5BB9\u7684\u65B9\u5F0F\u66FF\u4EE3\u7C7B\u201C{className}\u201D",
         inconsistentIndent: "\u53D6\u6D88\u7F29\u8FDB\u91CF\u4E0E\u4EE5\u524D\u7684\u7F29\u8FDB\u4E0D\u5339\u914D",
         inconsistentTabs: "\u7F29\u8FDB\u4E2D\u5236\u8868\u7B26\u548C\u7A7A\u683C\u7684\u4F7F\u7528\u4E0D\u4E00\u81F4",
-        initMethodSelfParamTypeVar: '"__init__" \u65B9\u6CD5 \u201Cself\u201D \u53C2\u6570\u7684\u7C7B\u578B\u6279\u6CE8\u4E0D\u80FD\u5305\u542B\u7C7B\u8303\u56F4\u7684\u7C7B\u578B\u53D8\u91CF',
+        initMethodSelfParamTypeVar: '"__init__" \u65B9\u6CD5 \u201Cself\u201D \u53C2\u6570\u7684\u7C7B\u578B\u6CE8\u91CA\u4E0D\u80FD\u5305\u542B\u7C7B\u8303\u56F4\u7684\u7C7B\u578B\u53D8\u91CF',
         initMustReturnNone: "\u201C__init__\u201D\u7684\u8FD4\u56DE\u7C7B\u578B\u5FC5\u987B\u4E3A None",
         initSubclassCallFailed: "__init_subclass__ \u65B9\u6CD5\u7684\u5173\u952E\u5B57\u53C2\u6570\u4E0D\u6B63\u786E",
         initSubclassClsParam: "__init_subclass__\u66FF\u4EE3\u5E94\u91C7\u7528\u201Ccls\u201D\u53C2\u6570",
@@ -26001,7 +25988,6 @@ var require_package_nls_zh_cn = __commonJS({
         paramSpecFirstArg: "ParamSpec \u4F5C\u4E3A\u7B2C\u4E00\u4E2A\u53C2\u6570\u7684\u9884\u671F\u540D\u79F0",
         paramSpecKwargsUsage: 'ParamSpec \u7684 "kwargs" \u5C5E\u6027\u4EC5\u5728\u4E0E **kwargs \u53C2\u6570\u4E00\u8D77\u4F7F\u7528\u65F6\u6709\u6548',
         paramSpecNotUsedByOuterScope: "ParamSpec\u201C{name}\u201D\u5728\u6B64\u4E0A\u4E0B\u6587\u4E2D\u6CA1\u6709\u610F\u4E49",
-        paramSpecScopedToReturnType: 'ParamSpec "{name}"\u5728\u8FD4\u56DE\u7C7B\u578B\u5185\u7684\u4F5C\u7528\u57DF\u4E3A\u53EF\u8C03\u7528\uFF0C\u4E0D\u80FD\u5728\u51FD\u6570\u4F53\u4E2D\u5F15\u7528',
         paramSpecUnknownArg: "ParamSpec \u4E0D\u652F\u6301\u591A\u4E2A\u53C2\u6570",
         paramSpecUnknownMember: "\u201C{name}\u201D\u4E0D\u662F ParamSpec \u7684\u5DF2\u77E5\u5C5E\u6027",
         paramSpecUnknownParam: "\u201C{name}\u201D\u662F ParamSpec \u7684\u672A\u77E5\u53C2\u6570",
@@ -26153,7 +26139,6 @@ var require_package_nls_zh_cn = __commonJS({
         typeVarNotSubscriptable: "TypeVar\u201C{type}\u201D\u4E0D\u53EF\u4E0B\u6807",
         typeVarNotUsedByOuterScope: "\u7C7B\u578B\u53D8\u91CF\u201C{name}\u201D\u5728\u6B64\u4E0A\u4E0B\u6587\u4E2D\u6CA1\u6709\u610F\u4E49",
         typeVarPossiblyUnsolvable: '\u5982\u679C\u8C03\u7528\u65B9\u6CA1\u6709\u4E3A\u53C2\u6570\u63D0\u4F9B\u53C2\u6570"{param}"\uFF0C\u5219\u7C7B\u578B\u53D8\u91CF"{name}"\u53EF\u80FD\u65E0\u6CD5\u89E3\u6790',
-        typeVarScopedToReturnType: '\u7C7B\u578B\u53D8\u91CF"{name}"\u5728\u8FD4\u56DE\u7C7B\u578B\u5185\u7684\u4F5C\u7528\u57DF\u4E3A\u53EF\u8C03\u7528\uFF0C\u4E0D\u80FD\u5728\u51FD\u6570\u4F53\u4E2D\u5F15\u7528',
         typeVarSingleConstraint: "TypeVar \u5FC5\u987B\u81F3\u5C11\u6709\u4E24\u79CD\u7EA6\u675F\u7C7B\u578B",
         typeVarTupleConstraints: "TypeVarTuple \u4E0D\u80FD\u6709\u503C\u7EA6\u675F",
         typeVarTupleContext: "\u6B64\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528 TypeVarTuple",
@@ -26224,7 +26209,7 @@ var require_package_nls_zh_cn = __commonJS({
         unpackNotAllowed: "\u6B64\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u5141\u8BB8\u89E3\u5305",
         unpackOperatorNotAllowed: "\u6B64\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u5141\u8BB8\u89E3\u538B\u7F29\u64CD\u4F5C",
         unpackTuplesIllegal: "Python 3.8 \u4E4B\u524D\u7684\u5143\u7EC4\u4E2D\u4E0D\u5141\u8BB8\u89E3\u5305\u64CD\u4F5C",
-        unpackedArgInTypeArgument: "\u65E0\u6CD5\u5728\u7C7B\u578B\u53C2\u6570\u5217\u8868\u4E2D\u4F7F\u7528\u672A\u6253\u5305\u7684\u53C2\u6570",
+        unpackedArgInTypeArgument: "\u672A\u6253\u5305\u7684\u53C2\u6570\u4E0D\u80FD\u7528\u4E8E\u6B64\u4E0A\u4E0B\u6587",
         unpackedArgWithVariadicParam: "\u672A\u6253\u5305\u7684\u53C2\u6570\u4E0D\u80FD\u7528\u4E8E TypeVarTuple \u53C2\u6570",
         unpackedDictArgumentNotMapping: "** \u540E\u9762\u7684\u53C2\u6570\u8868\u8FBE\u5F0F\u5FC5\u987B\u662F\u5177\u6709\u201Cstr\u201D\u952E\u7C7B\u578B\u7684\u6620\u5C04",
         unpackedDictSubscriptIllegal: "\u4E0D\u5141\u8BB8\u5728\u4E0B\u6807\u4E2D\u4F7F\u7528\u5B57\u5178\u89E3\u5305\u8FD0\u7B97\u7B26",
@@ -26811,7 +26796,6 @@ var require_package_nls_zh_tw = __commonJS({
         paramSpecFirstArg: "\u61C9\u4EE5 ParamSpec \u7684\u540D\u7A31\u4F5C\u70BA\u7B2C\u4E00\u500B\u5F15\u6578",
         paramSpecKwargsUsage: '\u53EA\u6709\u642D\u914D **kwargs \u53C3\u6578\u4F7F\u7528\u6642\uFF0CParamSpec \u7684 "kwargs" \u5C6C\u6027\u624D\u6709\u6548',
         paramSpecNotUsedByOuterScope: 'ParamSpec "{name}" \u5728\u6B64\u5167\u5BB9\u4E2D\u6C92\u6709\u610F\u7FA9',
-        paramSpecScopedToReturnType: 'ParamSpec "{name}" \u7684\u7BC4\u570D\u70BA\u50B3\u56DE\u578B\u5225\u5167\u7684\u53EF\u547C\u53EB\u9805\u76EE\uFF0C\u7121\u6CD5\u5728\u51FD\u5F0F\u4E3B\u9AD4\u4E2D\u53C3\u8003',
         paramSpecUnknownArg: "ParamSpec \u4E0D\u652F\u63F4\u4E00\u500B\u4EE5\u4E0A\u7684\u5F15\u6578",
         paramSpecUnknownMember: '"{name}" \u4E0D\u662F ParamSpec \u7684\u5DF2\u77E5\u5C6C\u6027',
         paramSpecUnknownParam: '"{name}" \u5C0D ParamSpec \u662F\u672A\u77E5\u7684\u53C3\u6578',
@@ -26963,7 +26947,6 @@ var require_package_nls_zh_tw = __commonJS({
         typeVarNotSubscriptable: 'TypeVar "{type}" \u4E0D\u80FD\u4E0B\u6A19',
         typeVarNotUsedByOuterScope: '\u985E\u578B\u8B8A\u6578 "{name}" \u5728\u6B64\u5167\u5BB9\u4E2D\u6C92\u6709\u610F\u7FA9',
         typeVarPossiblyUnsolvable: '\u5982\u679C\u547C\u53EB\u8005\u672A\u63D0\u4F9B\u53C3\u6578 "{param}" \u7684\u5F15\u6578\uFF0C\u5247\u578B\u5225\u8B8A\u6578 "{name}" \u53EF\u80FD\u7121\u6CD5\u89E3\u6790',
-        typeVarScopedToReturnType: '\u578B\u5225\u8B8A\u6578 "{name}" \u7684\u7BC4\u570D\u70BA\u50B3\u56DE\u578B\u5225\u5167\u7684\u53EF\u547C\u53EB\u9805\u76EE\uFF0C\u7121\u6CD5\u5728\u51FD\u5F0F\u4E3B\u9AD4\u4E2D\u53C3\u8003',
         typeVarSingleConstraint: "TypeVar \u81F3\u5C11\u5FC5\u9808\u6709\u5169\u500B\u9650\u5236\u985E\u578B",
         typeVarTupleConstraints: "TypeVarTuple \u4E0D\u80FD\u6709\u503C\u689D\u4EF6\u7D04\u675F",
         typeVarTupleContext: "\u6B64\u5167\u5BB9\u4E2D\u4E0D\u5141\u8A31 TypeVarTuple",
@@ -27034,7 +27017,7 @@ var require_package_nls_zh_tw = __commonJS({
         unpackNotAllowed: "\u6B64\u5167\u5BB9\u4E2D\u4E0D\u5141\u8A31\u89E3\u58D3\u7E2E",
         unpackOperatorNotAllowed: "\u6B64\u5167\u5BB9\u4E2D\u4E0D\u5141\u8A31\u89E3\u58D3\u7E2E\u4F5C\u696D",
         unpackTuplesIllegal: "Python 3.8 \u4E4B\u524D\u7684 Tuple \u4E2D\u4E0D\u5141\u8A31\u89E3\u58D3\u7E2E\u4F5C\u696D",
-        unpackedArgInTypeArgument: "\u89E3\u58D3\u7E2E\u7684\u5F15\u6578\u4E0D\u80FD\u7528\u65BC\u985E\u578B\u5F15\u6578\u6E05\u55AE",
+        unpackedArgInTypeArgument: "\u7121\u6CD5\u5728\u6B64\u5167\u5BB9\u4E2D\u4F7F\u7528\u672A\u5C01\u88DD\u7684\u5F15\u6578",
         unpackedArgWithVariadicParam: "\u672A\u5C01\u88DD\u7684\u5F15\u6578\u7121\u6CD5\u7528\u65BC TypeVarTuple \u53C3\u6578",
         unpackedDictArgumentNotMapping: '** \u5F8C\u7684\u5F15\u6578\u904B\u7B97\u5F0F\u5FC5\u9808\u662F\u5177\u6709 "str" \u91D1\u9470\u985E\u578B\u7684\u5C0D\u61C9',
         unpackedDictSubscriptIllegal: "\u5B57\u5178\u89E3\u58D3\u7E2E\u904B\u7B97\u5B50\u5728\u4E0B\u6A19\u4E2D\u4E0D\u88AB\u5141\u8A31",
@@ -27536,6 +27519,8 @@ var require_localize = __commonJS({
         Diagnostic6.ellipsisContext = () => getRawString("Diagnostic.ellipsisContext");
         Diagnostic6.ellipsisSecondArg = () => getRawString("Diagnostic.ellipsisSecondArg");
         Diagnostic6.enumClassOverride = () => new ParameterizedString(getRawString("Diagnostic.enumClassOverride"));
+        Diagnostic6.enumMemberDelete = () => new ParameterizedString(getRawString("Diagnostic.enumMemberDelete"));
+        Diagnostic6.enumMemberSet = () => new ParameterizedString(getRawString("Diagnostic.enumMemberSet"));
         Diagnostic6.exceptionGroupIncompatible = () => getRawString("Diagnostic.exceptionGroupIncompatible");
         Diagnostic6.exceptionTypeIncorrect = () => new ParameterizedString(getRawString("Diagnostic.exceptionTypeIncorrect"));
         Diagnostic6.exceptionTypeNotClass = () => new ParameterizedString(getRawString("Diagnostic.exceptionTypeNotClass"));
@@ -27755,7 +27740,6 @@ var require_localize = __commonJS({
         Diagnostic6.paramSpecFirstArg = () => getRawString("Diagnostic.paramSpecFirstArg");
         Diagnostic6.paramSpecKwargsUsage = () => getRawString("Diagnostic.paramSpecKwargsUsage");
         Diagnostic6.paramSpecNotUsedByOuterScope = () => new ParameterizedString(getRawString("Diagnostic.paramSpecNotUsedByOuterScope"));
-        Diagnostic6.paramSpecScopedToReturnType = () => new ParameterizedString(getRawString("Diagnostic.paramSpecScopedToReturnType"));
         Diagnostic6.paramSpecUnknownArg = () => getRawString("Diagnostic.paramSpecUnknownArg");
         Diagnostic6.paramSpecUnknownMember = () => new ParameterizedString(getRawString("Diagnostic.paramSpecUnknownMember"));
         Diagnostic6.paramSpecUnknownParam = () => new ParameterizedString(getRawString("Diagnostic.paramSpecUnknownParam"));
@@ -27928,7 +27912,6 @@ var require_localize = __commonJS({
         Diagnostic6.typeVarNotSubscriptable = () => new ParameterizedString(getRawString("Diagnostic.typeVarNotSubscriptable"));
         Diagnostic6.typeVarNotUsedByOuterScope = () => new ParameterizedString(getRawString("Diagnostic.typeVarNotUsedByOuterScope"));
         Diagnostic6.typeVarPossiblyUnsolvable = () => new ParameterizedString(getRawString("Diagnostic.typeVarPossiblyUnsolvable"));
-        Diagnostic6.typeVarScopedToReturnType = () => new ParameterizedString(getRawString("Diagnostic.typeVarScopedToReturnType"));
         Diagnostic6.typeVarSingleConstraint = () => getRawString("Diagnostic.typeVarSingleConstraint");
         Diagnostic6.typeVarsNotInGenericOrProtocol = () => getRawString("Diagnostic.typeVarsNotInGenericOrProtocol");
         Diagnostic6.typeVarTupleContext = () => getRawString("Diagnostic.typeVarTupleContext");
@@ -37155,6 +37138,10 @@ var require_tokenizerTypes = __commonJS({
         return token;
       }
       KeywordToken2.create = create;
+      function isSoftKeyword(token) {
+        return exports2.softKeywords.some((t) => token.keywordType === t);
+      }
+      KeywordToken2.isSoftKeyword = isSoftKeyword;
     })(KeywordToken || (exports2.KeywordToken = KeywordToken = {}));
     var StringToken;
     (function(StringToken2) {
@@ -38420,7 +38407,7 @@ var require_tokenizer = __commonJS({
         this._cs.skipToEol();
         const length = this._cs.position - start;
         const comment = tokenizerTypes_1.Comment.create(start, length, this._cs.getText().slice(start, start + length));
-        const typeIgnoreRegexMatch = comment.value.match(/((^|#)\s*)type:\s*ignore(\s*\[([\s*\w-,]*)\]|\s|$)/);
+        const typeIgnoreRegexMatch = comment.value.match(/((^|#)\s*)type:\s*ignore(\s*\[([\s\w-,]*)\]|\s|$)/);
         if (typeIgnoreRegexMatch) {
           const commentStart = start + ((_a = typeIgnoreRegexMatch.index) !== null && _a !== void 0 ? _a : 0);
           const textRange = {
@@ -38440,7 +38427,7 @@ var require_tokenizer = __commonJS({
             this._typeIgnoreLines.set(this._lineRanges.length, ignoreComment);
           }
         }
-        const pyrightIgnoreRegexMatch = comment.value.match(/((^|#)\s*)pyright:\s*ignore(\s*\[([\s*\w-,]*)\]|\s|$)/);
+        const pyrightIgnoreRegexMatch = comment.value.match(/((^|#)\s*)pyright:\s*ignore(\s*\[([\s\w-,]*)\]|\s|$)/);
         if (pyrightIgnoreRegexMatch) {
           const commentStart = start + ((_b = pyrightIgnoreRegexMatch.index) !== null && _b !== void 0 ? _b : 0);
           const textRange = {
@@ -39395,13 +39382,16 @@ var require_scope = __commonJS({
               symbol,
               isOutsideCallerModule: !!(options === null || options === void 0 ? void 0 : options.isOutsideCallerModule),
               isBeyondExecutionScope: !!(options === null || options === void 0 ? void 0 : options.isBeyondExecutionScope),
-              scope: effectiveScope
+              scope: effectiveScope,
+              usesNonlocalBinding: !!(options === null || options === void 0 ? void 0 : options.usesNonlocalBinding),
+              usesGlobalBinding: !!(options === null || options === void 0 ? void 0 : options.usesGlobalBinding)
             };
           }
         }
         let parentScope;
         let isNextScopeBeyondExecutionScope = (options === null || options === void 0 ? void 0 : options.isBeyondExecutionScope) || this.isIndependentlyExecutable();
-        if (this.notLocalBindings.get(name) === 1) {
+        const notLocalBinding = this.notLocalBindings.get(name);
+        if (notLocalBinding === 1) {
           const globalScopeResult = this.getGlobalScope();
           if (globalScopeResult.scope !== this) {
             parentScope = globalScopeResult.scope;
@@ -39415,7 +39405,9 @@ var require_scope = __commonJS({
         if (parentScope) {
           return parentScope.lookUpSymbolRecursive(name, {
             isOutsideCallerModule: !!(options === null || options === void 0 ? void 0 : options.isOutsideCallerModule) || this.type === 4,
-            isBeyondExecutionScope: isNextScopeBeyondExecutionScope
+            isBeyondExecutionScope: isNextScopeBeyondExecutionScope,
+            usesNonlocalBinding: notLocalBinding === 0 || !!(options === null || options === void 0 ? void 0 : options.usesNonlocalBinding),
+            usesGlobalBinding: notLocalBinding === 1 || !!(options === null || options === void 0 ? void 0 : options.usesGlobalBinding)
           });
         }
         return void 0;
@@ -40640,7 +40632,8 @@ var require_binder = __commonJS({
               uri: this._fileInfo.fileUri,
               range: (0, positionUtils_1.convertTextRangeToRange)(node.name, this._fileInfo.lines),
               moduleName: this._fileInfo.moduleName,
-              isInExceptSuite: this._isInExceptSuite
+              isInExceptSuite: this._isInExceptSuite,
+              isExplicitBinding: this._currentScope.getBindingType(node.name.value) !== void 0
             };
             symbol.addDeclaration(declaration);
           }
@@ -41255,7 +41248,8 @@ var require_binder = __commonJS({
               uri: this._fileInfo.fileUri,
               range: (0, positionUtils_1.convertTextRangeToRange)(node.target, this._fileInfo.lines),
               moduleName: this._fileInfo.moduleName,
-              isInExceptSuite: this._isInExceptSuite
+              isInExceptSuite: this._isInExceptSuite,
+              isExplicitBinding: this._currentScope.getBindingType(node.target.value) !== void 0
             };
             symbol.addDeclaration(declaration);
           }
@@ -41316,7 +41310,8 @@ var require_binder = __commonJS({
             uri: this._fileInfo.fileUri,
             range: (0, positionUtils_1.convertTextRangeToRange)(slotNameNode, this._fileInfo.lines),
             moduleName: this._fileInfo.moduleName,
-            isInExceptSuite: this._isInExceptSuite
+            isInExceptSuite: this._isInExceptSuite,
+            isExplicitBinding: this._currentScope.getBindingType(slotName) !== void 0
           };
           symbol.addDeclaration(declaration);
         }
@@ -41364,7 +41359,8 @@ var require_binder = __commonJS({
             uri: this._fileInfo.fileUri,
             range: (0, positionUtils_1.convertTextRangeToRange)(target, this._fileInfo.lines),
             moduleName: this._fileInfo.moduleName,
-            isInExceptSuite: this._isInExceptSuite
+            isInExceptSuite: this._isInExceptSuite,
+            isExplicitBinding: this._currentScope.getBindingType(target.value) !== void 0
           };
           symbol.addDeclaration(declaration);
         }
@@ -42222,7 +42218,8 @@ var require_binder = __commonJS({
                 range: (0, positionUtils_1.convertTextRangeToRange)(name, this._fileInfo.lines),
                 moduleName: this._fileInfo.moduleName,
                 isInExceptSuite: this._isInExceptSuite,
-                docString: this._getVariableDocString(target)
+                docString: this._getVariableDocString(target),
+                isExplicitBinding: this._currentScope.getBindingType(name.value) !== void 0
               };
               symbolWithScope.symbol.addDeclaration(declaration);
             }
@@ -42334,7 +42331,8 @@ var require_binder = __commonJS({
                 range: (0, positionUtils_1.convertTextRangeToRange)(name, this._fileInfo.lines),
                 moduleName: this._fileInfo.moduleName,
                 isInExceptSuite: this._isInExceptSuite,
-                docString: this._getVariableDocString(target)
+                docString: this._getVariableDocString(target),
+                isExplicitBinding: this._currentScope.getBindingType(name.value) !== void 0
               };
               symbolWithScope.symbol.addDeclaration(declaration);
               if (isFinalAssignedInClassBody) {
@@ -42450,6 +42448,10 @@ var require_binder = __commonJS({
         let isFinal = false;
         let finalTypeNode;
         if (typeAnnotation) {
+          const classVarInfo = this._isAnnotationClassVar(typeAnnotation);
+          if (classVarInfo === null || classVarInfo === void 0 ? void 0 : classVarInfo.classVarTypeNode) {
+            typeAnnotation = classVarInfo.classVarTypeNode;
+          }
           if (this._isTypingAnnotation(typeAnnotation, "Final")) {
             isFinal = true;
           } else if (typeAnnotation.nodeType === 24 && typeAnnotation.items.length === 1) {
@@ -44773,6 +44775,9 @@ var require_types = __commonJS({
           if (params1.length !== params2.length) {
             return false;
           }
+          if (FunctionType.shouldSkipArgsKwargsCompatibilityCheck(type1) !== FunctionType.shouldSkipArgsKwargsCompatibilityCheck(functionType2)) {
+            return false;
+          }
           const positionOnlyIndex1 = params1.findIndex((param) => isPositionOnlySeparator(param));
           const positionOnlyIndex2 = params2.findIndex((param) => isPositionOnlySeparator(param));
           for (let i = 0; i < params1.length; i++) {
@@ -45646,8 +45651,8 @@ var require_typeUtils = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.isTupleClass = exports2.isMaybeDescriptorInstance = exports2.isDescriptorInstance = exports2.isCallableType = exports2.isProperty = exports2.isEllipsisType = exports2.getUnionSubtypeCount = exports2.getLiteralTypeClassName = exports2.containsLiteralType = exports2.isLiteralTypeOrUnion = exports2.isLiteralType = exports2.getSpecializedTupleType = exports2.selfSpecializeClass = exports2.getUnknownTypeForCallable = exports2.getUnknownTypeForParamSpec = exports2.getUnknownTypeForTypeVar = exports2.specializeWithUnknownTypeArgs = exports2.specializeWithDefaultTypeArgs = exports2.getTypeVarScopeIds = exports2.getTypeVarScopeId = exports2.transformPossibleRecursiveTypeAlias = exports2.isTypeAliasRecursive = exports2.isTypeAliasPlaceholder = exports2.getTypeCondition = exports2.addConditionToType = exports2.getFullNameOfType = exports2.derivesFromAnyOrUnknown = exports2.isUnionableType = exports2.preserveUnknown = exports2.areTypesSame = exports2.doForEachSignature = exports2.allSubtypes = exports2.someSubtypes = exports2.doForEachSubtype = exports2.sortTypes = exports2.cleanIncompleteUnknown = exports2.mapSignatures = exports2.mapSubtypes = exports2.makeInferenceContext = exports2.isBuiltInDeprecatedType = exports2.isTypeVarSame = exports2.isIncompleteUnknown = exports2.removeNoneFromUnion = exports2.isNoneTypeClass = exports2.isNoneInstance = exports2.isOptionalType = exports2.UniqueSignatureTracker = exports2.AssignTypeFlags = exports2.ClassIteratorFlags = exports2.MemberAccessFlags = void 0;
-    exports2.requiresTypeArguments = exports2.getGeneratorTypeArgs = exports2.removeParamSpecVariadicsFromFunction = exports2.removeParamSpecVariadicsFromSignature = exports2.specializeTupleClass = exports2.combineSameSizedTuples = exports2.explodeGenericClass = exports2.isPartlyUnknown = exports2.containsAnyOrUnknown = exports2.containsAnyRecursive = exports2.getMembersForModule = exports2.getMembersForClass = exports2.convertToInstantiable = exports2.convertToInstance = exports2.isEffectivelyInstantiable = exports2.isMetaclassInstance = exports2.isInstantiableMetaclass = exports2.getGeneratorYieldType = exports2.getDeclaredGeneratorReturnType = exports2.synthesizeTypeVarForSelfCls = exports2.derivesFromClassRecursive = exports2.derivesFromStdlibClass = exports2.specializeForBaseClass = exports2.buildTypeVarContext = exports2.buildTypeVarContextFromSpecializedClass = exports2.setTypeArgumentsRecursive = exports2.specializeClassType = exports2.isTypeVarLimitedToCallable = exports2.getTypeVarArgumentsRecursive = exports2.addTypeVarsToListIfUnique = exports2.getClassFieldsRecursive = exports2.getClassIterator = exports2.getClassMemberIterator = exports2.lookUpClassMember = exports2.lookUpObjectMember = exports2.getContainerDepth = exports2.getProtocolSymbolsRecursive = exports2.getProtocolSymbols = exports2.transformExpectedType = exports2.replaceTypeVarsWithAny = exports2.validateTypeVarDefault = exports2.applyInScopePlaceholders = exports2.applySourceContextTypeVarsToSignature = exports2.applySourceContextTypeVars = exports2.applySolvedTypeVars = exports2.ensureFunctionSignaturesAreUnique = exports2.populateTypeVarContextForSelfType = exports2.partiallySpecializeType = exports2.isTupleIndexUnambiguous = exports2.isUnboundedTupleClass = void 0;
-    exports2.convertParamSpecValueToType = exports2.convertTypeToParamSpecValue = exports2.getDeclaringModulesForType = exports2.computeMroLinearization = exports2.isVarianceOfTypeArgumentCompatible = exports2.combineVariances = exports2.requiresSpecialization = void 0;
+    exports2.requiresSpecialization = exports2.requiresTypeArguments = exports2.getGeneratorTypeArgs = exports2.removeParamSpecVariadicsFromFunction = exports2.removeParamSpecVariadicsFromSignature = exports2.specializeTupleClass = exports2.combineSameSizedTuples = exports2.explodeGenericClass = exports2.isPartlyUnknown = exports2.containsAnyOrUnknown = exports2.containsAnyRecursive = exports2.getMembersForModule = exports2.getMembersForClass = exports2.convertToInstantiable = exports2.convertToInstance = exports2.isEffectivelyInstantiable = exports2.isMetaclassInstance = exports2.isInstantiableMetaclass = exports2.getGeneratorYieldType = exports2.getDeclaredGeneratorReturnType = exports2.synthesizeTypeVarForSelfCls = exports2.derivesFromClassRecursive = exports2.derivesFromStdlibClass = exports2.specializeForBaseClass = exports2.buildTypeVarContext = exports2.buildTypeVarContextFromSpecializedClass = exports2.setTypeArgumentsRecursive = exports2.specializeClassType = exports2.getTypeVarArgumentsRecursive = exports2.addTypeVarsToListIfUnique = exports2.getClassFieldsRecursive = exports2.getClassIterator = exports2.getClassMemberIterator = exports2.lookUpClassMember = exports2.lookUpObjectMember = exports2.getContainerDepth = exports2.getProtocolSymbolsRecursive = exports2.getProtocolSymbols = exports2.transformExpectedType = exports2.replaceTypeVarsWithAny = exports2.validateTypeVarDefault = exports2.applyInScopePlaceholders = exports2.applySourceContextTypeVarsToSignature = exports2.applySourceContextTypeVars = exports2.applySolvedTypeVars = exports2.ensureFunctionSignaturesAreUnique = exports2.populateTypeVarContextForSelfType = exports2.partiallySpecializeType = exports2.isTupleIndexUnambiguous = exports2.isUnboundedTupleClass = void 0;
+    exports2.convertParamSpecValueToType = exports2.convertTypeToParamSpecValue = exports2.getDeclaringModulesForType = exports2.computeMroLinearization = exports2.isVarianceOfTypeArgumentCompatible = exports2.combineVariances = void 0;
     var collectionUtils_1 = require_collectionUtils();
     var debug_1 = require_debug();
     var symbol_1 = require_symbol();
@@ -45796,11 +45801,11 @@ var require_typeUtils = __commonJS({
       return false;
     }
     exports2.isBuiltInDeprecatedType = isBuiltInDeprecatedType;
-    function makeInferenceContext(expectedType, isTypeIncomplete, signatureTracker) {
+    function makeInferenceContext(expectedType, isTypeIncomplete) {
       if (!expectedType) {
         return void 0;
       }
-      return { expectedType, isTypeIncomplete, signatureTracker };
+      return { expectedType, isTypeIncomplete };
     }
     exports2.makeInferenceContext = makeInferenceContext;
     function mapSubtypes(type, callback, sortSubtypes = false) {
@@ -46283,6 +46288,14 @@ var require_typeUtils = __commonJS({
       if (type.details.typeParameters.length === 0) {
         return type;
       }
+      if (isTupleClass(type)) {
+        return types_1.ClassType.cloneIncludeSubclasses(specializeTupleClass(
+          type,
+          [{ type: types_1.UnknownType.create(), isUnbounded: true }],
+          /* isTypeArgumentExplicit */
+          false
+        ), !!type.includeSubclasses);
+      }
       return types_1.ClassType.cloneForSpecialization(
         type,
         type.details.typeParameters.map((param) => getUnknownTypeForTypeVar(param)),
@@ -46985,73 +46998,6 @@ var require_typeUtils = __commonJS({
       return [];
     }
     exports2.getTypeVarArgumentsRecursive = getTypeVarArgumentsRecursive;
-    function isTypeVarLimitedToCallable(type, typeVar) {
-      const info = getTypeVarWithinTypeInfoRecursive(type, typeVar);
-      return info.isTypeVarUsed && info.isUsedInCallable;
-    }
-    exports2.isTypeVarLimitedToCallable = isTypeVarLimitedToCallable;
-    function getTypeVarWithinTypeInfoRecursive(type, typeVar, recursionCount = 0) {
-      if (recursionCount > types_1.maxTypeRecursionCount) {
-        return { isTypeVarUsed: false, isUsedInCallable: false };
-      }
-      recursionCount++;
-      let typeVarUsedCount = 0;
-      let usedInCallableCount = 0;
-      if ((0, types_1.isTypeVar)(type)) {
-        if (!(0, types_1.isParamSpec)(type) || !type.paramSpecAccess) {
-          if ((0, types_1.isTypeSame)(typeVar, convertToInstance(type))) {
-            typeVarUsedCount++;
-          }
-        }
-      } else if ((0, types_1.isClass)(type)) {
-        if (type.typeArguments) {
-          type.typeArguments.forEach((typeArg) => {
-            const subResult = getTypeVarWithinTypeInfoRecursive(typeArg, typeVar, recursionCount);
-            if (subResult.isTypeVarUsed) {
-              typeVarUsedCount++;
-            }
-            if (subResult.isUsedInCallable) {
-              usedInCallableCount++;
-            }
-          });
-        }
-      } else if ((0, types_1.isUnion)(type)) {
-        doForEachSubtype(type, (subtype) => {
-          const subResult = getTypeVarWithinTypeInfoRecursive(subtype, typeVar, recursionCount);
-          if (subResult.isTypeVarUsed) {
-            typeVarUsedCount++;
-          }
-          if (subResult.isUsedInCallable) {
-            usedInCallableCount++;
-          }
-        });
-      } else if ((0, types_1.isFunction)(type)) {
-        for (let i = 0; i < type.details.parameters.length; i++) {
-          if (getTypeVarWithinTypeInfoRecursive(types_1.FunctionType.getEffectiveParameterType(type, i), typeVar, recursionCount).isTypeVarUsed) {
-            typeVarUsedCount++;
-          }
-        }
-        if (type.details.paramSpec) {
-          if ((0, types_1.isTypeSame)(typeVar, convertToInstance(type.details.paramSpec))) {
-            typeVarUsedCount++;
-          }
-        }
-        const returnType = types_1.FunctionType.getSpecializedReturnType(type);
-        if (returnType) {
-          if (getTypeVarWithinTypeInfoRecursive(returnType, typeVar, recursionCount).isTypeVarUsed) {
-            typeVarUsedCount++;
-          }
-        }
-        if (typeVarUsedCount > 0) {
-          typeVarUsedCount = 1;
-          usedInCallableCount = 1;
-        }
-      }
-      return {
-        isTypeVarUsed: typeVarUsedCount > 0,
-        isUsedInCallable: usedInCallableCount === 1 && typeVarUsedCount === 1
-      };
-    }
     function specializeClassType(type) {
       const typeVarContext = new typeVarContext_1.TypeVarContext(getTypeVarScopeId(type));
       const typeParams = types_1.ClassType.getTypeParameters(type);
@@ -48229,10 +48175,8 @@ var require_typeUtils = __commonJS({
               specializationNeeded = true;
             } else {
               const newTypeArgType = this.apply(typeParams[0], recursionCount);
-              if (typeParams[0] !== newTypeArgType) {
-                newTupleTypeArgs = [{ type: newTypeArgType, isUnbounded: true }];
-                specializationNeeded = true;
-              }
+              newTupleTypeArgs = [{ type: newTypeArgType, isUnbounded: true }];
+              specializationNeeded = true;
             }
           }
           if (newTupleTypeArgs && newTupleTypeArgs.length > 0) {
@@ -48556,7 +48500,7 @@ var require_typeUtils = __commonJS({
                     subtype = types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneAsInstantiable(subtype));
                   }
                   if (this._options.unknownIfNotFound) {
-                    return specializeWithDefaultTypeArgs(subtype);
+                    return this._options.useUnknownOverDefault ? specializeWithUnknownTypeArgs(subtype) : specializeWithDefaultTypeArgs(subtype);
                   }
                 }
                 return subtype;
@@ -48565,7 +48509,9 @@ var require_typeUtils = __commonJS({
             if ((0, types_1.isTypeVar)(replacement) && typeVar.isVariadicUnpacked && replacement.details.isVariadic) {
               return types_1.TypeVarType.cloneForUnpacked(replacement, typeVar.isVariadicInUnion);
             }
-            return replacement;
+            if (!(0, types_1.isTypeVar)(replacement) || !replacement.isInScopePlaceholder || !this._options.unknownIfNotFound) {
+              return replacement;
+            }
           }
           let useDefaultOrUnknown = false;
           if (this._options.unknownIfNotFound) {
@@ -48578,7 +48524,7 @@ var require_typeUtils = __commonJS({
             useDefaultOrUnknown = true;
           }
           if (useDefaultOrUnknown) {
-            if (typeVar.details.isDefaultExplicit) {
+            if (typeVar.details.isDefaultExplicit && !this._options.useUnknownOverDefault) {
               return this._solveDefaultType(typeVar.details.defaultType, recursionCount);
             }
             return types_1.UnknownType.create();
@@ -48656,7 +48602,7 @@ var require_typeUtils = __commonJS({
           useDefaultOrUnknown = true;
         }
         if (useDefaultOrUnknown) {
-          if (paramSpec.details.isDefaultExplicit) {
+          if (paramSpec.details.isDefaultExplicit && !this._options.useUnknownOverDefault) {
             return convertTypeToParamSpecValue(this._solveDefaultType(paramSpec.details.defaultType, recursionCount));
           }
           return getUnknownTypeForParamSpec();
@@ -49909,6 +49855,7 @@ var require_typeEvaluatorTypes = __commonJS({
       EvaluatorFlags2[EvaluatorFlags2["SkipConvertParamSpecToRuntimeObject"] = 33554432] = "SkipConvertParamSpecToRuntimeObject";
       EvaluatorFlags2[EvaluatorFlags2["DisallowNonTypeSpecialForms"] = 67108864] = "DisallowNonTypeSpecialForms";
       EvaluatorFlags2[EvaluatorFlags2["AllowConcatenate"] = 134217728] = "AllowConcatenate";
+      EvaluatorFlags2[EvaluatorFlags2["StripLiteralTypeForTuple"] = 268435456] = "StripLiteralTypeForTuple";
       EvaluatorFlags2[EvaluatorFlags2["CallBaseDefaults"] = 2] = "CallBaseDefaults";
       EvaluatorFlags2[EvaluatorFlags2["IndexBaseDefaults"] = 2] = "IndexBaseDefaults";
       EvaluatorFlags2[EvaluatorFlags2["MemberAccessBaseDefaults"] = 2] = "MemberAccessBaseDefaults";
@@ -50214,24 +50161,24 @@ var require_constraintSolver = __commonJS({
         }
         if (curWideTypeBound && newNarrowTypeBound) {
           if (!(0, types_1.isTypeSame)(curWideTypeBound, newNarrowTypeBound, {}, recursionCount)) {
-            let makeConcrete = true;
-            if ((0, types_1.isTypeVar)(curWideTypeBound)) {
-              if ((0, types_1.isTypeSame)(newNarrowTypeBound, curWideTypeBound)) {
-                makeConcrete = false;
-              } else if ((0, types_1.isUnion)(newNarrowTypeBound) && newNarrowTypeBound.subtypes.some((subtype) => (0, types_1.isTypeSame)(subtype, curWideTypeBound))) {
-                makeConcrete = false;
-              }
-            }
-            const adjWideTypeBound = makeConcrete ? evaluator.makeTopLevelTypeVarsConcrete(
+            let adjWideTypeBound = evaluator.makeTopLevelTypeVarsConcrete(
               curWideTypeBound,
               /* makeParamSpecsConcrete */
               true
-            ) : curWideTypeBound;
+            );
+            adjWideTypeBound = (0, typeUtils_1.transformExpectedType)(
+              adjWideTypeBound,
+              /* liveTypeVarScopes */
+              [],
+              /* usageOffset */
+              void 0
+            );
             if (!evaluator.assignType(
               adjWideTypeBound,
               newNarrowTypeBound,
               diag === null || diag === void 0 ? void 0 : diag.createAddendum(),
-              typeVarContext,
+              /* destTypeVarContext */
+              void 0,
               /* srcTypeVarContext */
               void 0,
               1024,
@@ -50820,7 +50767,7 @@ var require_parameterUtils = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/analyzer/parameterUtils.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.isParamSpecKwargsArgument = exports2.isParamSpecArgsArgument = exports2.getParameterListDetails = exports2.firstParametersExcludingSelf = exports2.ParameterSource = exports2.isTypedKwargs = void 0;
+    exports2.isParamSpecKwargsArgument = exports2.isParamSpecArgsArgument = exports2.getParameterListDetails = exports2.firstParametersExcludingSelf = exports2.ParameterKind = exports2.isTypedKwargs = void 0;
     var symbolNameUtils_1 = require_symbolNameUtils();
     var types_1 = require_types();
     var typeUtils_1 = require_typeUtils();
@@ -50828,12 +50775,12 @@ var require_parameterUtils = __commonJS({
       return param.category === 2 && (0, types_1.isClassInstance)(param.type) && (0, types_1.isUnpackedClass)(param.type) && types_1.ClassType.isTypedDictClass(param.type) && !!param.type.details.typedDictEntries;
     }
     exports2.isTypedKwargs = isTypedKwargs;
-    var ParameterSource;
-    (function(ParameterSource2) {
-      ParameterSource2[ParameterSource2["PositionOnly"] = 0] = "PositionOnly";
-      ParameterSource2[ParameterSource2["PositionOrKeyword"] = 1] = "PositionOrKeyword";
-      ParameterSource2[ParameterSource2["KeywordOnly"] = 2] = "KeywordOnly";
-    })(ParameterSource || (exports2.ParameterSource = ParameterSource = {}));
+    var ParameterKind;
+    (function(ParameterKind2) {
+      ParameterKind2[ParameterKind2["Positional"] = 0] = "Positional";
+      ParameterKind2[ParameterKind2["Standard"] = 1] = "Standard";
+      ParameterKind2[ParameterKind2["Keyword"] = 2] = "Keyword";
+    })(ParameterKind || (exports2.ParameterKind = ParameterKind = {}));
     function firstParametersExcludingSelf(type) {
       return type.details.parameters.find((p) => !((0, types_1.isTypeVar)(p.type) && p.type.details.isSynthesizedSelf));
     }
@@ -50876,24 +50823,24 @@ var require_parameterUtils = __commonJS({
       let sawKeywordOnlySeparator = false;
       const addVirtualParameter = (param, index, typeOverride, defaultArgTypeOverride, sourceOverride) => {
         if (param.name) {
-          let source;
+          let kind;
           if (sourceOverride !== void 0) {
-            source = sourceOverride;
+            kind = sourceOverride;
           } else if (param.category === 1) {
-            source = ParameterSource.PositionOnly;
+            kind = ParameterKind.Positional;
           } else if (sawKeywordOnlySeparator) {
-            source = ParameterSource.KeywordOnly;
+            kind = ParameterKind.Keyword;
           } else if (positionOnlyIndex >= 0 && index < positionOnlyIndex) {
-            source = ParameterSource.PositionOnly;
+            kind = ParameterKind.Positional;
           } else {
-            source = ParameterSource.PositionOrKeyword;
+            kind = ParameterKind.Standard;
           }
           result.params.push({
             param,
             index,
             type: typeOverride !== null && typeOverride !== void 0 ? typeOverride : types_1.FunctionType.getEffectiveParameterType(type, index),
             defaultArgType: defaultArgTypeOverride,
-            source
+            kind
           });
         }
       };
@@ -50923,7 +50870,7 @@ var require_parameterUtils = __commonJS({
                 tupleArg.type,
                 /* defaultArgTypeOverride */
                 void 0,
-                ParameterSource.PositionOnly
+                ParameterKind.Positional
               );
               if (category === 0) {
                 result.positionParamCount++;
@@ -51011,7 +50958,7 @@ var require_parameterUtils = __commonJS({
           result.paramSpec = types_1.TypeVarType.cloneForParamSpecAccess(secondLastParam.type, void 0);
         }
       }
-      result.firstPositionOrKeywordIndex = result.params.findIndex((p) => p.source !== ParameterSource.PositionOnly);
+      result.firstPositionOrKeywordIndex = result.params.findIndex((p) => p.kind !== ParameterKind.Positional);
       if (result.firstPositionOrKeywordIndex < 0) {
         result.firstPositionOrKeywordIndex = result.params.length;
       }
@@ -51078,14 +51025,14 @@ var require_constructorTransform = __commonJS({
       return false;
     }
     exports2.hasConstructorTransform = hasConstructorTransform;
-    function applyConstructorTransform(evaluator, errorNode, argList, classType, result) {
+    function applyConstructorTransform(evaluator, errorNode, argList, classType, result, signatureTracker) {
       if (classType.details.fullName === "functools.partial") {
-        return applyPartialTransform(evaluator, errorNode, argList, result);
+        return applyPartialTransform(evaluator, errorNode, argList, result, signatureTracker);
       }
       return result;
     }
     exports2.applyConstructorTransform = applyConstructorTransform;
-    function applyPartialTransform(evaluator, errorNode, argList, result) {
+    function applyPartialTransform(evaluator, errorNode, argList, result, signatureTracker) {
       if (!(0, types_1.isClassInstance)(result.returnType) || result.returnType.details.fullName !== "functools.partial") {
         return result;
       }
@@ -51105,7 +51052,12 @@ var require_constructorTransform = __commonJS({
       if (argList.length < 1) {
         return result;
       }
-      const origFunctionTypeResult = evaluator.getTypeOfArgument(argList[0]);
+      const origFunctionTypeResult = evaluator.getTypeOfArgument(
+        argList[0],
+        /* inferenceContext */
+        void 0,
+        signatureTracker
+      );
       let origFunctionType = origFunctionTypeResult.type;
       const origFunctionTypeConcrete = evaluator.makeTopLevelTypeVarsConcrete(origFunctionType);
       if ((0, types_1.isInstantiableClass)(origFunctionTypeConcrete)) {
@@ -51198,7 +51150,7 @@ var require_constructorTransform = __commonJS({
           return;
         }
         if (!arg.name) {
-          if (argIndex >= paramListDetails.params.length || paramListDetails.params[argIndex].source === parameterUtils_1.ParameterSource.KeywordOnly) {
+          if (argIndex >= paramListDetails.params.length || paramListDetails.params[argIndex].kind === parameterUtils_1.ParameterKind.Keyword) {
             if (paramListDetails.argsIndex !== void 0) {
               const paramType = types_1.FunctionType.getEffectiveParameterType(origFunctionType, paramListDetails.params[paramListDetails.argsIndex].index);
               const diag = new diagnostic_1.DiagnosticAddendum();
@@ -51256,7 +51208,7 @@ var require_constructorTransform = __commonJS({
         } else {
           const matchingParam = paramListDetails.params.find((paramInfo) => {
             var _a2;
-            return paramInfo.param.name === ((_a2 = arg.name) === null || _a2 === void 0 ? void 0 : _a2.value) && paramInfo.source !== parameterUtils_1.ParameterSource.PositionOnly;
+            return paramInfo.param.name === ((_a2 = arg.name) === null || _a2 === void 0 ? void 0 : _a2.value) && paramInfo.kind !== parameterUtils_1.ParameterKind.Positional;
           });
           if (!matchingParam) {
             if (paramListDetails.kwargsIndex === void 0) {
@@ -51402,9 +51354,9 @@ var require_constructors = __commonJS({
       );
     }
     exports2.getBoundCallMethod = getBoundCallMethod;
-    function validateConstructorArguments(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext) {
+    function validateConstructorArguments(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext, signatureTracker) {
       var _a;
-      const metaclassResult = validateMetaclassCall(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext);
+      const metaclassResult = validateMetaclassCall(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext, signatureTracker);
       if (metaclassResult) {
         const metaclassReturnType = (_a = metaclassResult.returnType) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
         if (metaclassResult.argumentErrors || shouldSkipNewAndInitEvaluation(evaluator, type, metaclassReturnType)) {
@@ -51418,19 +51370,19 @@ var require_constructors = __commonJS({
       }
       const useConstructorTransform = (0, constructorTransform_1.hasConstructorTransform)(type);
       const returnResult = evaluator.useSpeculativeMode(useConstructorTransform ? errorNode : void 0, () => {
-        return validateNewAndInitMethods(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext, newMethodTypeResult);
+        return validateNewAndInitMethods(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext, signatureTracker, newMethodTypeResult);
       });
       let validatedArgExpressions = !useConstructorTransform || returnResult.argumentErrors;
       if (useConstructorTransform) {
         if (returnResult.argumentErrors) {
-          validateNewAndInitMethods(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext, newMethodTypeResult);
+          validateNewAndInitMethods(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext, signatureTracker, newMethodTypeResult);
           validatedArgExpressions = true;
         } else if (returnResult.returnType) {
           const transformed = (0, constructorTransform_1.applyConstructorTransform)(evaluator, errorNode, argList, type, {
             argumentErrors: !!returnResult.argumentErrors,
             returnType: returnResult.returnType,
             isTypeIncomplete: !!returnResult.isTypeIncomplete
-          });
+          }, signatureTracker);
           returnResult.returnType = transformed.returnType;
           if (transformed.isTypeIncomplete) {
             returnResult.isTypeIncomplete = true;
@@ -51451,7 +51403,7 @@ var require_constructors = __commonJS({
       return returnResult;
     }
     exports2.validateConstructorArguments = validateConstructorArguments;
-    function validateNewAndInitMethods(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext, newMethodTypeResult) {
+    function validateNewAndInitMethods(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext, signatureTracker, newMethodTypeResult) {
       var _a, _b;
       let returnType;
       let validatedArgExpressions = false;
@@ -51467,6 +51419,7 @@ var require_constructors = __commonJS({
           type,
           skipUnknownArgCheck,
           inferenceContext,
+          signatureTracker,
           newMethodTypeResult,
           /* useSpeculativeModeForArgs */
           true
@@ -51498,7 +51451,7 @@ var require_constructors = __commonJS({
           evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, initMethodDiag.getString(), errorNode);
         }
         if (initMethodTypeResult) {
-          const initCallResult = validateInitMethod(evaluator, errorNode, argList, initMethodBindToType, skipUnknownArgCheck, inferenceContext, initMethodTypeResult.type);
+          const initCallResult = validateInitMethod(evaluator, errorNode, argList, initMethodBindToType, skipUnknownArgCheck, inferenceContext, signatureTracker, initMethodTypeResult.type);
           if (initCallResult.argumentErrors) {
             argumentErrors = true;
           } else if (initCallResult.overloadsUsedForCall) {
@@ -51521,6 +51474,7 @@ var require_constructors = __commonJS({
             type,
             skipUnknownArgCheck,
             inferenceContext,
+            signatureTracker,
             newMethodTypeResult,
             /* useSpeculativeModeForArgs */
             false
@@ -51543,13 +51497,13 @@ var require_constructors = __commonJS({
       }
       return { argumentErrors, returnType, isTypeIncomplete, overloadsUsedForCall };
     }
-    function validateNewMethod(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext, newMethodTypeResult, useSpeculativeModeForArgs) {
+    function validateNewMethod(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext, signatureTracker, newMethodTypeResult, useSpeculativeModeForArgs) {
       let newReturnType;
       let isTypeIncomplete = false;
       let argumentErrors = false;
       const overloadsUsedForCall = [];
-      if (inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.signatureTracker) {
-        newMethodTypeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(newMethodTypeResult.type, inferenceContext.signatureTracker, errorNode.start);
+      if (signatureTracker) {
+        newMethodTypeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(newMethodTypeResult.type, signatureTracker, errorNode.start);
       }
       const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(type));
       typeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeId)(newMethodTypeResult.type));
@@ -51557,7 +51511,7 @@ var require_constructors = __commonJS({
         typeVarContext.addSolveForScope(type.typeAliasInfo.typeVarScopeId);
       }
       const callResult = evaluator.useSpeculativeMode(useSpeculativeModeForArgs ? errorNode : void 0, () => {
-        return evaluator.validateCallArguments(errorNode, argList, newMethodTypeResult, typeVarContext, skipUnknownArgCheck, inferenceContext);
+        return evaluator.validateCallArguments(errorNode, argList, newMethodTypeResult, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
       });
       if (callResult.isTypeIncomplete) {
         isTypeIncomplete = true;
@@ -51565,7 +51519,7 @@ var require_constructors = __commonJS({
       if (callResult.argumentErrors) {
         argumentErrors = true;
         typeVarContext.unlock();
-        evaluator.validateCallArguments(errorNode, argList, newMethodTypeResult, typeVarContext, skipUnknownArgCheck);
+        evaluator.validateCallArguments(errorNode, argList, newMethodTypeResult, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
       } else {
         newReturnType = callResult.returnType;
         if (overloadsUsedForCall.length === 0 && callResult.overloadsUsedForCall) {
@@ -51586,13 +51540,13 @@ var require_constructors = __commonJS({
       }
       return { argumentErrors, returnType: newReturnType, isTypeIncomplete, overloadsUsedForCall };
     }
-    function validateInitMethod(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext, initMethodType) {
+    function validateInitMethod(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext, signatureTracker, initMethodType) {
       let returnType;
       let isTypeIncomplete = false;
       let argumentErrors = false;
       const overloadsUsedForCall = [];
-      if (inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.signatureTracker) {
-        initMethodType = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(initMethodType, inferenceContext.signatureTracker, errorNode.start);
+      if (signatureTracker) {
+        initMethodType = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(initMethodType, signatureTracker, errorNode.start);
       }
       if (inferenceContext) {
         let foundWorkingExpectedType = false;
@@ -51612,10 +51566,28 @@ var require_constructors = __commonJS({
               const specializedConstructor = (0, typeUtils_1.applySolvedTypeVars)(initMethodType, typeVarContext);
               let callResult;
               callResult = evaluator.useSpeculativeMode(errorNode, () => {
-                return evaluator.validateCallArguments(errorNode, argList, { type: specializedConstructor }, typeVarContext.clone(), skipUnknownArgCheck);
+                return evaluator.validateCallArguments(
+                  errorNode,
+                  argList,
+                  { type: specializedConstructor },
+                  typeVarContext.clone(),
+                  skipUnknownArgCheck,
+                  /* inferenceContext */
+                  void 0,
+                  signatureTracker
+                );
               });
               if (!callResult.argumentErrors) {
-                callResult = evaluator.validateCallArguments(errorNode, argList, { type: specializedConstructor }, typeVarContext, skipUnknownArgCheck);
+                callResult = evaluator.validateCallArguments(
+                  errorNode,
+                  argList,
+                  { type: specializedConstructor },
+                  typeVarContext,
+                  skipUnknownArgCheck,
+                  /* inferenceContext */
+                  void 0,
+                  signatureTracker
+                );
                 if (callResult.isTypeIncomplete) {
                   isTypeIncomplete = true;
                 }
@@ -51641,7 +51613,16 @@ var require_constructors = __commonJS({
       if (!returnType) {
         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);
+        const callResult = evaluator.validateCallArguments(
+          errorNode,
+          argList,
+          { type: initMethodType },
+          typeVarContext,
+          skipUnknownArgCheck,
+          /* inferenceContext */
+          void 0,
+          signatureTracker
+        );
         let adjustedClassType = type;
         if (callResult.specializedInitSelfType && (0, types_1.isClassInstance)(callResult.specializedInitSelfType) && types_1.ClassType.isSameGenericClass(callResult.specializedInitSelfType, adjustedClassType)) {
           adjustedClassType = types_1.ClassType.cloneAsInstantiable(callResult.specializedInitSelfType);
@@ -51704,7 +51685,7 @@ var require_constructors = __commonJS({
         returnType: applyExpectedTypeForConstructor(evaluator, type, inferenceContext, typeVarContext)
       };
     }
-    function validateMetaclassCall(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext) {
+    function validateMetaclassCall(evaluator, errorNode, argList, type, skipUnknownArgCheck, inferenceContext, signatureTracker) {
       const metaclassCallMethodInfo = getBoundCallMethod(evaluator, errorNode, type);
       if (!metaclassCallMethodInfo) {
         return void 0;
@@ -51716,7 +51697,8 @@ var require_constructors = __commonJS({
         /* typeVarContext */
         void 0,
         skipUnknownArgCheck,
-        inferenceContext
+        inferenceContext,
+        signatureTracker
       );
       const callType = metaclassCallMethodInfo.type;
       if ((0, types_1.isFunction)(callType) && !callType.details.declaredReturnType) {
@@ -52186,7 +52168,8 @@ var require_deprecatedSymbols = __commonJS({
         {
           version: pythonVersion_1.pythonVersion3_9,
           fullName: "typing.AbstractSet",
-          replacementText: "collections.abc.Set"
+          replacementText: "collections.abc.Set",
+          typingImportOnly: true
         }
       ],
       [
@@ -53684,6 +53667,7 @@ var require_typeGuards = __commonJS({
     var parseNodes_1 = require_parseNodes();
     var analyzerNodeInfo_1 = require_analyzerNodeInfo();
     var constraintSolver_1 = require_constraintSolver();
+    var enums_1 = require_enums();
     var ParseTreeUtils = __importStar(require_parseTreeUtils());
     var scopeUtils_1 = require_scopeUtils();
     var symbol_1 = require_symbol();
@@ -53988,8 +53972,8 @@ var require_typeGuards = __commonJS({
               const isInstanceCheck = callType.details.builtInName === "isinstance";
               const arg1TypeResult = evaluator.getTypeOfExpression(
                 arg1Expr,
-                512 | 8 | 32 | 64
-                /* EvaluatorFlags.DisallowTypeVarTuple */
+                512 | 8 | 32 | 64 | 16 | 2
+                /* EvaluatorFlags.DoNotSpecialize */
               );
               const arg1Type = arg1TypeResult.type;
               const classTypeList = getIsInstanceClassTypes(arg1Type);
@@ -53997,7 +53981,16 @@ var require_typeGuards = __commonJS({
               if (classTypeList) {
                 return (type) => {
                   return {
-                    type: narrowTypeForIsInstance(evaluator, type, classTypeList, isInstanceCheck, isPositiveTest, testExpression),
+                    type: narrowTypeForIsInstance(
+                      evaluator,
+                      type,
+                      classTypeList,
+                      isInstanceCheck,
+                      /* isTypeIsCheck */
+                      false,
+                      isPositiveTest,
+                      testExpression
+                    ),
                     isIncomplete
                   };
                 };
@@ -54213,6 +54206,8 @@ var require_typeGuards = __commonJS({
         filterTypes,
         /* isInstanceCheck */
         true,
+        /* isTypeIsCheck */
+        true,
         isPositiveTest,
         errorNode
       );
@@ -54323,6 +54318,12 @@ var require_typeGuards = __commonJS({
       const classTypeList = [];
       const addClassTypesToList = (types) => {
         types.forEach((subtype) => {
+          if ((0, types_1.isClass)(subtype)) {
+            subtype = (0, typeUtils_1.specializeWithUnknownTypeArgs)(subtype);
+            if ((0, types_1.isInstantiableClass)(subtype) && types_1.ClassType.isBuiltIn(subtype, "Callable")) {
+              subtype = (0, typeUtils_1.convertToInstantiable)((0, typeUtils_1.getUnknownTypeForCallable)());
+            }
+          }
           if ((0, types_1.isInstantiableClass)(subtype) || (0, types_1.isTypeVar)(subtype) && types_1.TypeBase.isInstantiable(subtype)) {
             classTypeList.push(subtype);
           } else if ((0, typeUtils_1.isNoneTypeClass)(subtype)) {
@@ -54389,12 +54390,13 @@ var require_typeGuards = __commonJS({
       return false;
     }
     exports2.isIsinstanceFilterSubclass = isIsinstanceFilterSubclass;
-    function narrowTypeForIsInstance(evaluator, type, filterTypes, isInstanceCheck, isPositiveTest, errorNode) {
+    function narrowTypeForIsInstance(evaluator, type, filterTypes, isInstanceCheck, isTypeIsCheck, isPositiveTest, errorNode) {
       const narrowedType = narrowTypeForIsInstanceInternal(
         evaluator,
         type,
         filterTypes,
         isInstanceCheck,
+        isTypeIsCheck,
         isPositiveTest,
         /* allowIntersections */
         false,
@@ -54408,13 +54410,14 @@ var require_typeGuards = __commonJS({
         type,
         filterTypes,
         isInstanceCheck,
+        isTypeIsCheck,
         isPositiveTest,
         /* allowIntersections */
         true,
         errorNode
       );
     }
-    function narrowTypeForIsInstanceInternal(evaluator, type, filterTypes, isInstanceCheck, isPositiveTest, allowIntersections, errorNode) {
+    function narrowTypeForIsInstanceInternal(evaluator, type, filterTypes, isInstanceCheck, isTypeIsCheck, isPositiveTest, allowIntersections, errorNode) {
       let expandedTypes = (0, typeUtils_1.mapSubtypes)(type, (subtype) => {
         return (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(subtype);
       });
@@ -54426,17 +54429,24 @@ var require_typeGuards = __commonJS({
         for (const filterType of filterTypes) {
           let concreteFilterType = evaluator.makeTopLevelTypeVarsConcrete(filterType);
           if ((0, types_1.isInstantiableClass)(concreteFilterType)) {
-            if (concreteFilterType.typeArguments && !concreteFilterType.isTypeArgumentExplicit) {
-              concreteFilterType = (0, typeUtils_1.specializeWithUnknownTypeArgs)(types_1.ClassType.cloneForSpecialization(
-                concreteFilterType,
-                /* typeArguments */
-                void 0,
-                /* isTypeArgumentExplicit */
-                false
-              ));
+            let filterIsSuperclass;
+            let filterIsSubclass;
+            if (isTypeIsCheck) {
+              filterIsSuperclass = evaluator.assignType(filterType, concreteVarType);
+              filterIsSubclass = evaluator.assignType(concreteVarType, filterType);
+            } else {
+              if (concreteFilterType.typeArguments && !concreteFilterType.isTypeArgumentExplicit) {
+                concreteFilterType = (0, typeUtils_1.specializeWithUnknownTypeArgs)(types_1.ClassType.cloneForSpecialization(
+                  concreteFilterType,
+                  /* typeArguments */
+                  void 0,
+                  /* isTypeArgumentExplicit */
+                  false
+                ));
+              }
+              filterIsSuperclass = isIsinstanceFilterSuperclass(evaluator, varType, concreteVarType, filterType, concreteFilterType, isInstanceCheck);
+              filterIsSubclass = isIsinstanceFilterSubclass(evaluator, concreteVarType, concreteFilterType, isInstanceCheck);
             }
-            const filterIsSuperclass = isIsinstanceFilterSuperclass(evaluator, varType, concreteVarType, filterType, concreteFilterType, isInstanceCheck);
-            const filterIsSubclass = isIsinstanceFilterSubclass(evaluator, concreteVarType, concreteFilterType, isInstanceCheck);
             if (filterIsSuperclass) {
               foundSuperclass = true;
             }
@@ -54469,24 +54479,26 @@ var require_typeGuards = __commonJS({
                   let specializedFilterType = filterType;
                   if ((0, types_1.isClass)(filterType)) {
                     if (types_1.ClassType.isSpecialBuiltIn(filterType) || filterType.details.typeParameters.length > 0) {
-                      const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(filterType));
-                      const unspecializedFilterType = types_1.ClassType.cloneForSpecialization(
-                        filterType,
-                        /* typeArguments */
-                        void 0,
-                        /* isTypeArgumentExplicit */
-                        false
-                      );
-                      if ((0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(
-                        evaluator,
-                        unspecializedFilterType,
-                        concreteVarType,
-                        typeVarContext,
-                        /* liveTypeVarScopes */
-                        void 0,
-                        errorNode.start
-                      )) {
-                        specializedFilterType = (0, typeUtils_1.applySolvedTypeVars)(unspecializedFilterType, typeVarContext, { unknownIfNotFound: true });
+                      if (!filterType.typeArguments || !filterType.isTypeArgumentExplicit || !types_1.ClassType.isSameGenericClass(concreteVarType, filterType)) {
+                        const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(filterType));
+                        const unspecializedFilterType = types_1.ClassType.cloneForSpecialization(
+                          filterType,
+                          /* typeArguments */
+                          void 0,
+                          /* isTypeArgumentExplicit */
+                          false
+                        );
+                        if ((0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(
+                          evaluator,
+                          unspecializedFilterType,
+                          concreteVarType,
+                          typeVarContext,
+                          /* liveTypeVarScopes */
+                          void 0,
+                          errorNode.start
+                        )) {
+                          specializedFilterType = (0, typeUtils_1.applySolvedTypeVars)(unspecializedFilterType, typeVarContext, { unknownIfNotFound: true, useUnknownOverDefault: true });
+                        }
                       }
                     }
                   }
@@ -54726,7 +54738,7 @@ var require_typeGuards = __commonJS({
               }
             }
             if ((0, types_1.isClassInstance)(subtype)) {
-              return (0, types_1.combineTypes)(filterClassType((0, typeUtils_1.convertToInstance)(unexpandedSubtype), types_1.ClassType.cloneAsInstantiable(subtype), (0, typeUtils_1.getTypeCondition)(subtype), negativeFallback));
+              return (0, types_1.combineTypes)(filterClassType(unexpandedSubtype, types_1.ClassType.cloneAsInstantiable(subtype), (0, typeUtils_1.getTypeCondition)(subtype), negativeFallback));
             }
             if (((0, types_1.isFunction)(subtype) || (0, types_1.isOverloadedFunction)(subtype)) && isInstanceCheck) {
               return (0, types_1.combineTypes)(filterFunctionType(subtype, (0, typeUtils_1.convertToInstance)(unexpandedSubtype)));
@@ -54796,6 +54808,9 @@ var require_typeGuards = __commonJS({
             false
           );
         }
+        if ((0, types_1.isParamSpec)(subtype) && subtype.paramSpecAccess) {
+          return subtype;
+        }
         const maxTupleUnionExpansion = 32;
         if (elementsToAdd > maxTupleUnionExpansion) {
           return subtype;
@@ -55229,9 +55244,11 @@ var require_typeGuards = __commonJS({
         }
         const enumList = [];
         const fields = types_1.ClassType.getSymbolTable(type);
-        fields.forEach((symbol) => {
+        fields.forEach((symbol, name) => {
+          var _a;
           if (!symbol.isIgnoredForProtocolMatch()) {
-            const symbolType = evaluator.getEffectiveTypeOfSymbol(symbol);
+            let symbolType = evaluator.getEffectiveTypeOfSymbol(symbol);
+            symbolType = (_a = (0, enums_1.transformTypeForEnumMember)(evaluator, type, name)) !== null && _a !== void 0 ? _a : symbolType;
             if ((0, types_1.isClassInstance)(symbolType) && types_1.ClassType.isSameGenericClass(type, symbolType) && symbolType.literalValue !== void 0) {
               enumList.push(symbolType);
             }
@@ -55344,7 +55361,7 @@ var require_enums = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/analyzer/enums.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.getEnumAutoValueType = exports2.getTypeOfEnumMember = exports2.getEnumDeclaredValueType = exports2.isDeclInEnumClass = exports2.transformTypeForPossibleEnumClass = exports2.createEnumType = exports2.isEnumClassWithMembers = exports2.isEnumMetaclass = void 0;
+    exports2.getEnumAutoValueType = exports2.getTypeOfEnumMember = exports2.getEnumDeclaredValueType = exports2.isDeclInEnumClass = exports2.transformTypeForEnumMember = exports2.createEnumType = exports2.isEnumClassWithMembers = exports2.isEnumMetaclass = void 0;
     var debug_1 = require_debug();
     var analyzerNodeInfo_1 = require_analyzerNodeInfo();
     var parseTreeUtils_1 = require_parseTreeUtils();
@@ -55361,14 +55378,14 @@ var require_enums = __commonJS({
       if (!(0, types_1.isClass)(classType) || !types_1.ClassType.isEnumClass(classType)) {
         return false;
       }
-      let definesValue = false;
-      types_1.ClassType.getSymbolTable(classType).forEach((symbol) => {
-        const symbolType = evaluator.getEffectiveTypeOfSymbol(symbol);
-        if ((0, types_1.isClassInstance)(symbolType) && types_1.ClassType.isSameGenericClass(symbolType, classType)) {
-          definesValue = true;
+      let definesMember = false;
+      types_1.ClassType.getSymbolTable(classType).forEach((symbol, name) => {
+        const symbolType = transformTypeForEnumMember(evaluator, classType, name);
+        if (symbolType && (0, types_1.isClassInstance)(symbolType) && types_1.ClassType.isSameGenericClass(symbolType, classType)) {
+          definesMember = true;
         }
       });
-      return definesValue;
+      return definesMember;
     }
     exports2.isEnumClassWithMembers = isEnumClassWithMembers;
     function createEnumType(evaluator, errorNode, enumClass, argList) {
@@ -55490,33 +55507,46 @@ var require_enums = __commonJS({
       return classType;
     }
     exports2.createEnumType = createEnumType;
-    function transformTypeForPossibleEnumClass(evaluator, statementNode, nameNode, getValueType) {
-      var _a, _b, _c, _d;
-      const enclosingClassNode = (0, parseTreeUtils_1.getEnclosingClass)(
-        statementNode,
-        /* stopAtFunction */
-        true
-      );
-      if (!enclosingClassNode) {
+    function transformTypeForEnumMember(evaluator, classType, memberName, recursionCount = 0) {
+      var _a, _b, _c, _d, _e, _f, _g, _h;
+      if (recursionCount > types_1.maxTypeRecursionCount) {
         return void 0;
       }
-      const enumClassInfo = evaluator.getTypeOfClass(enclosingClassNode);
-      if (!enumClassInfo || !types_1.ClassType.isEnumClass(enumClassInfo.classType)) {
+      recursionCount++;
+      if (!types_1.ClassType.isEnumClass(classType)) {
         return void 0;
       }
+      const memberInfo = (0, typeUtils_1.lookUpClassMember)(classType, memberName);
+      if (!memberInfo || !(0, types_1.isClass)(memberInfo.classType) || !types_1.ClassType.isEnumClass(memberInfo.classType)) {
+        return void 0;
+      }
+      const decls = memberInfo.symbol.getDeclarations();
+      if (decls.length < 1) {
+        return void 0;
+      }
+      const primaryDecl = decls[0];
       let isMemberOfEnumeration = false;
       let isUnpackedTuple = false;
-      if (statementNode.nodeType === 3 && (0, parseTreeUtils_1.isNodeContainedWithin)(nameNode, statementNode.leftExpression)) {
+      let valueTypeExprNode;
+      let declaredTypeNode;
+      let nameNode;
+      if (primaryDecl.node.nodeType === 38) {
+        nameNode = primaryDecl.node;
+      } else if (primaryDecl.node.nodeType === 28) {
+        nameNode = primaryDecl.node.name;
+      } else {
+        return void 0;
+      }
+      if (((_a = nameNode.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 3 && nameNode.parent.leftExpression === nameNode) {
         isMemberOfEnumeration = true;
-        if ((0, parseTreeUtils_1.getParentNodeOfType)(
-          nameNode,
-          52
-          /* ParseNodeType.Tuple */
-        )) {
-          isUnpackedTuple = true;
-        }
-      } else if ((0, analyzerNodeInfo_1.getFileInfo)(nameNode).isStubFile && ((_a = nameNode.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 54 && nameNode.parent.valueExpression === nameNode) {
+        valueTypeExprNode = nameNode.parent.rightExpression;
+      } else if (((_b = nameNode.parent) === null || _b === void 0 ? void 0 : _b.nodeType) === 52 && ((_c = nameNode.parent.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 3) {
         isMemberOfEnumeration = true;
+        isUnpackedTuple = true;
+        valueTypeExprNode = nameNode.parent.parent.rightExpression;
+      } else if ((0, analyzerNodeInfo_1.getFileInfo)(nameNode).isStubFile && ((_d = nameNode.parent) === null || _d === void 0 ? void 0 : _d.nodeType) === 54 && nameNode.parent.valueExpression === nameNode) {
+        isMemberOfEnumeration = true;
+        declaredTypeNode = nameNode.parent.typeAnnotation;
       }
       if ((0, symbolNameUtils_1.isSingleDunderName)(nameNode.value)) {
         return void 0;
@@ -55524,19 +55554,34 @@ var require_enums = __commonJS({
       if (nameNode.value === "name" || nameNode.value === "value") {
         return void 0;
       }
-      const valueTypeInfo = getValueType();
-      const declaredType = valueTypeInfo.declaredType;
-      let assignedType = valueTypeInfo.assignedType;
-      let valueType = (_b = declaredType !== null && declaredType !== void 0 ? declaredType : assignedType) !== null && _b !== void 0 ? _b : types_1.UnknownType.create();
+      const declaredType = declaredTypeNode ? evaluator.getTypeOfAnnotation(declaredTypeNode) : void 0;
+      let assignedType;
+      if (valueTypeExprNode) {
+        const evalFlags = (0, analyzerNodeInfo_1.getFileInfo)(valueTypeExprNode).isStubFile ? 1 : void 0;
+        assignedType = evaluator.getTypeOfExpression(valueTypeExprNode, evalFlags).type;
+      }
+      if ((valueTypeExprNode === null || valueTypeExprNode === void 0 ? void 0 : valueTypeExprNode.nodeType) === 38 && valueTypeExprNode.value !== memberName) {
+        const aliasedEnumType = transformTypeForEnumMember(evaluator, classType, valueTypeExprNode.value, recursionCount);
+        if (aliasedEnumType && (0, types_1.isClassInstance)(aliasedEnumType) && types_1.ClassType.isSameGenericClass(aliasedEnumType, types_1.ClassType.cloneAsInstance(memberInfo.classType)) && aliasedEnumType.literalValue !== void 0) {
+          return aliasedEnumType;
+        }
+      }
+      if (primaryDecl.node.nodeType === 28) {
+        const functionType = evaluator.getTypeOfFunction(primaryDecl.node);
+        if (functionType) {
+          assignedType = functionType.decoratedType;
+        }
+      }
+      let valueType = (_e = declaredType !== null && declaredType !== void 0 ? declaredType : assignedType) !== null && _e !== void 0 ? _e : types_1.UnknownType.create();
       if (isUnpackedTuple) {
-        valueType = (_d = (_c = evaluator.getTypeOfIterator(
+        valueType = (_g = (_f = evaluator.getTypeOfIterator(
           { type: valueType },
           /* isAsync */
           false,
           nameNode,
           /* emitNotIterableError */
           false
-        )) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : types_1.UnknownType.create();
+        )) === null || _f === void 0 ? void 0 : _f.type) !== null && _g !== void 0 ? _g : types_1.UnknownType.create();
       }
       if ((0, types_1.isClassInstance)(valueType) && types_1.ClassType.getSymbolTable(valueType).get("__get__")) {
         return void 0;
@@ -55547,9 +55592,9 @@ var require_enums = __commonJS({
       if (!(0, types_1.findSubtype)(valueType, (subtype) => !(0, types_1.isFunction)(subtype) && !(0, types_1.isOverloadedFunction)(subtype))) {
         return void 0;
       }
-      if (!assignedType && statementNode.nodeType === 3) {
+      if (!assignedType && ((_h = nameNode.parent) === null || _h === void 0 ? void 0 : _h.nodeType) === 3 && nameNode.parent.leftExpression === nameNode) {
         assignedType = evaluator.getTypeOfExpression(
-          statementNode.rightExpression,
+          nameNode.parent.rightExpression,
           /* flags */
           void 0,
           (0, typeUtils_1.makeInferenceContext)(declaredType)
@@ -55568,16 +55613,13 @@ var require_enums = __commonJS({
           isMemberOfEnumeration = true;
         }
       }
-      if ((0, types_1.isClassInstance)(valueType) && types_1.ClassType.isSameGenericClass(valueType, types_1.ClassType.cloneAsInstance(enumClassInfo.classType)) && valueType.literalValue !== void 0) {
-        return void 0;
-      }
       if (!isMemberOfEnumeration) {
         return void 0;
       }
-      const enumLiteral = new types_1.EnumLiteral(enumClassInfo.classType.details.fullName, enumClassInfo.classType.details.name, nameNode.value, valueType);
-      return types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneWithLiteral(enumClassInfo.classType, enumLiteral));
+      const enumLiteral = new types_1.EnumLiteral(memberInfo.classType.details.fullName, memberInfo.classType.details.name, nameNode.value, valueType);
+      return types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneWithLiteral(memberInfo.classType, enumLiteral));
     }
-    exports2.transformTypeForPossibleEnumClass = transformTypeForPossibleEnumClass;
+    exports2.transformTypeForEnumMember = transformTypeForEnumMember;
     function isDeclInEnumClass(evaluator, decl) {
       const classNode = (0, parseTreeUtils_1.getEnclosingClass)(
         decl.node,
@@ -55609,11 +55651,22 @@ var require_enums = __commonJS({
     }
     exports2.getEnumDeclaredValueType = getEnumDeclaredValueType;
     function getTypeOfEnumMember(evaluator, errorNode, classType, memberName, isIncomplete) {
-      if (!(0, types_1.isClassInstance)(classType) || !types_1.ClassType.isEnumClass(classType)) {
+      if (!types_1.ClassType.isEnumClass(classType)) {
+        return void 0;
+      }
+      const type = transformTypeForEnumMember(evaluator, classType, memberName);
+      if (type) {
+        return { type, isIncomplete };
+      }
+      if (types_1.TypeBase.isInstantiable(classType)) {
         return void 0;
       }
       const literalValue = classType.literalValue;
       if (memberName === "name" || memberName === "_name_") {
+        const memberInfo = (0, typeUtils_1.lookUpClassMember)(classType, memberName);
+        if (memberInfo && (0, types_1.isClass)(memberInfo.classType) && !types_1.ClassType.isBuiltIn(memberInfo.classType, "Enum")) {
+          return void 0;
+        }
         const strClass = evaluator.getBuiltInType(errorNode, "str");
         if (!(0, types_1.isInstantiableClass)(strClass)) {
           return void 0;
@@ -55639,6 +55692,10 @@ var require_enums = __commonJS({
       }
       const valueType = getEnumDeclaredValueType(evaluator, classType);
       if (memberName === "value" || memberName === "_value_") {
+        const memberInfo = (0, typeUtils_1.lookUpClassMember)(classType, memberName);
+        if (memberInfo && (0, types_1.isClass)(memberInfo.classType) && !types_1.ClassType.isBuiltIn(memberInfo.classType)) {
+          return void 0;
+        }
         const metaclass = classType.details.effectiveMetaclass;
         if (metaclass && (0, types_1.isClass)(metaclass) && !types_1.ClassType.isBuiltIn(metaclass)) {
           return { type: valueType !== null && valueType !== void 0 ? valueType : types_1.AnyType.create(), isIncomplete };
@@ -56332,7 +56389,7 @@ var require_parentDirectoryCache = __commonJS({
         var _a, _b, _c, _d;
         const result = (_a = this._cachedResults.get(importName)) === null || _a === void 0 ? void 0 : _a.get(path12.key);
         if (result) {
-          return result !== null && result !== void 0 ? result : importResult;
+          return result;
         }
         const checked = (_b = this._importChecked.get(importName)) === null || _b === void 0 ? void 0 : _b.get(path12.key);
         if (checked) {
@@ -56637,7 +56694,7 @@ var require_importResolver = __commonJS({
       }
       isStdlibModule(module3, execEnv) {
         if (!this._stdlibModules) {
-          this._stdlibModules = this._buildStdlibCache(this.getTypeshedStdLibPath(execEnv));
+          this._stdlibModules = this._buildStdlibCache(this.getTypeshedStdLibPath(execEnv), execEnv);
         }
         return this._stdlibModules.has(module3.nameParts.join("."));
       }
@@ -56779,6 +56836,7 @@ var require_importResolver = __commonJS({
         if (!this.cachedParentImportResults.checkValidPath(this.fileSystem, sourceFileUri, root)) {
           return importResult;
         }
+        const localImportFailureInfo = [`Attempting to resolve using local imports: ${importName}`];
         const importPath = { importPath: void 0 };
         let current = origin;
         while (this._shouldWalkUp(current, root, execEnv) && current) {
@@ -56788,7 +56846,7 @@ var require_importResolver = __commonJS({
             execEnv,
             moduleDescriptor,
             importName,
-            [],
+            localImportFailureInfo,
             /* allowPartial */
             void 0,
             /* allowNativeLib */
@@ -56813,6 +56871,10 @@ var require_importResolver = __commonJS({
         if (current) {
           this.cachedParentImportResults.checked(current, importName, importPath);
         }
+        if (this._configOptions.verboseOutput) {
+          const console2 = this.serviceProvider.console();
+          localImportFailureInfo.forEach((diag) => console2.log(diag));
+        }
         return importResult;
       }
       fileExistsCached(uri) {
@@ -57672,7 +57734,7 @@ var require_importResolver = __commonJS({
         return void 0;
       }
       // Finds all of the stdlib modules and returns a Set containing all of their names.
-      _buildStdlibCache(stdlibRoot) {
+      _buildStdlibCache(stdlibRoot, executionEnvironment) {
         const cache = /* @__PURE__ */ new Set();
         if (stdlibRoot) {
           const readDir = (root, prefix) => {
@@ -57683,7 +57745,9 @@ var require_importResolver = __commonJS({
               } else if (entry.name.includes(".py")) {
                 const stripped = (0, pathUtils_1.stripFileExtension)(entry.name);
                 if (!stripped.startsWith("_")) {
-                  cache.add(prefix ? `${prefix}.${stripped}` : stripped);
+                  if (this._isStdlibTypeshedStubValidForVersion(createImportedModuleDescriptor(stripped), root, executionEnvironment.pythonVersion, executionEnvironment.pythonPlatform, [])) {
+                    cache.add(prefix ? `${prefix}.${stripped}` : stripped);
+                  }
                 }
               }
             });
@@ -58669,7 +58733,7 @@ var require_patternMatching = __commonJS({
       ).type;
       if ((0, types_1.isClass)(exprType) && !exprType.typeAliasInfo) {
         exprType = types_1.ClassType.cloneRemoveTypePromotions(exprType);
-        exprType = (0, typeUtils_1.specializeClassType)(exprType);
+        exprType = (0, typeUtils_1.specializeWithUnknownTypeArgs)(exprType);
       }
       let positionalArgNames = [];
       if (pattern.arguments.some((arg) => !arg.name) && (0, types_1.isInstantiableClass)(exprType)) {
@@ -59799,7 +59863,7 @@ var require_properties = __commonJS({
         type: types_1.AnyType.create(),
         hasDeclaredType: true
       });
-      const objType = fget.details.parameters.length > 0 ? fget.details.parameters[0].type : types_1.AnyType.create();
+      const objType = fget.details.parameters.length > 0 ? types_1.FunctionType.getEffectiveParameterType(fget, 0) : types_1.AnyType.create();
       types_1.FunctionType.addParameter(getFunction2, {
         category: 0,
         name: "obj",
@@ -59831,7 +59895,7 @@ var require_properties = __commonJS({
         type: types_1.AnyType.create(),
         hasDeclaredType: true
       });
-      let objType = fset.details.parameters.length > 0 ? fset.details.parameters[0].type : types_1.AnyType.create();
+      let objType = fset.details.parameters.length > 0 ? types_1.FunctionType.getEffectiveParameterType(fset, 0) : types_1.AnyType.create();
       if ((0, types_1.isTypeVar)(objType) && objType.details.isSynthesizedSelf) {
         objType = evaluator.makeTopLevelTypeVarsConcrete(objType);
       }
@@ -59868,7 +59932,7 @@ var require_properties = __commonJS({
       });
       delFunction.details.typeVarScopeId = (0, typeUtils_1.getTypeVarScopeId)(fdel);
       delFunction.details.deprecatedMessage = fdel.details.deprecatedMessage;
-      let objType = fdel.details.parameters.length > 0 ? fdel.details.parameters[0].type : types_1.AnyType.create();
+      let objType = fdel.details.parameters.length > 0 ? types_1.FunctionType.getEffectiveParameterType(fdel, 0) : types_1.AnyType.create();
       if ((0, types_1.isTypeVar)(objType) && objType.details.isSynthesizedSelf) {
         objType = evaluator.makeTopLevelTypeVarsConcrete(objType);
       }
@@ -60552,7 +60616,7 @@ var require_analyzerFileInfo = __commonJS({
       if (fileInfo.futureImports.has("annotations")) {
         return true;
       }
-      if (fileInfo.executionEnvironment.pythonVersion.isGreaterOrEqualTo(pythonVersion_1.pythonVersion3_13)) {
+      if (fileInfo.executionEnvironment.pythonVersion.isGreaterOrEqualTo(pythonVersion_1.pythonVersion3_14)) {
         return true;
       }
       return false;
@@ -60977,6 +61041,17 @@ var require_codeFlowEngine = __commonJS({
           }
           return flowNodeTypeCache;
         }
+        function isGetTypeFromCodeFlowPending(referenceKeyFilter) {
+          if (!referenceKeyFilter) {
+            return false;
+          }
+          for (const [key, value] of flowNodeTypeCacheSet.entries()) {
+            if (key !== referenceKeyFilter && value.pendingNodes.size > 0) {
+              return true;
+            }
+          }
+          return false;
+        }
         function getTypeFromCodeFlow(flowNode, reference, options) {
           var _a, _b;
           if (enablePrintControlFlowGraph) {
@@ -61558,7 +61633,7 @@ var require_codeFlowEngine = __commonJS({
               }
               if (!sawIncomplete || attemptCount >= maxAttemptCount) {
                 let reportIncomplete = sawIncomplete;
-                if (sawIncomplete && !sawPending && effectiveType && !(0, typeUtils_1.isIncompleteUnknown)(effectiveType) && !firstAntecedentTypeIsIncomplete) {
+                if (sawIncomplete && !sawPending && !isGetTypeFromCodeFlowPending(referenceKeyWithSymbolId) && effectiveType && !(0, typeUtils_1.isIncompleteUnknown)(effectiveType) && !firstAntecedentTypeIsIncomplete) {
                   reportIncomplete = false;
                 }
                 if (sawPending || sawIncomplete) {
@@ -61811,8 +61886,8 @@ var require_codeFlowEngine = __commonJS({
                   const arg1Expr = testExpression.arguments[1].valueExpression;
                   const arg1Type = evaluator.getTypeOfExpression(
                     arg1Expr,
-                    8 | 32 | 64
-                    /* EvaluatorFlags.DisallowTypeVarTuple */
+                    512 | 8 | 32 | 64 | 16 | 2
+                    /* EvaluatorFlags.DoNotSpecialize */
                   ).type;
                   if ((0, types_1.isInstantiableClass)(arg1Type)) {
                     return priorRemainingConstraints.filter((subtype) => {
@@ -61938,10 +62013,14 @@ var require_codeFlowEngine = __commonJS({
                     node,
                     node.arguments,
                     { type: callSubtype, isIncomplete: callTypeResult.isIncomplete },
+                    /* typeVarContext */
                     void 0,
+                    /* skipUnknownArgCheck */
                     false,
+                    /* inferenceContext */
+                    void 0,
+                    /* signatureTracker */
                     void 0
-                    /* expectedType */
                   );
                   if (callResult.returnType && (0, types_1.isNever)(callResult.returnType)) {
                     noReturnTypeCount++;
@@ -62649,7 +62728,9 @@ var require_dataClasses = __commonJS({
                   return ((_a3 = arg.name) === null || _a3 === void 0 ? void 0 : _a3.value) === "converter";
                 });
                 if (converterArg && converterArg.valueExpression) {
-                  converter = converterArg;
+                  if (AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.enableExperimentalFeatures) {
+                    converter = converterArg;
+                  }
                 }
               }
             }
@@ -62952,36 +63033,43 @@ var require_dataClasses = __commonJS({
         hasDeclaredType: true
       });
       types_1.FunctionType.addPositionOnlyParameterSeparator(targetFunction);
-      if ((0, types_1.isFunction)(converterType)) {
-        const typeVarContext = new typeVarContext_1.TypeVarContext(typeVar.scopeId);
-        const diagAddendum = new diagnostic_1.DiagnosticAddendum();
-        if (evaluator.assignType(targetFunction, converterType, diagAddendum, typeVarContext)) {
-          const solution = (0, typeUtils_1.applySolvedTypeVars)(typeVar, typeVarContext, { unknownIfNotFound: true });
-          return solution;
-        }
-        evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.dataClassConverterFunction().format({
-          argType: evaluator.printType(converterType),
-          fieldType: evaluator.printType(fieldType),
-          fieldName
-        }) + diagAddendum.getString(), converterNode, (_a = diagAddendum.getEffectiveTextRange()) !== null && _a !== void 0 ? _a : converterNode);
-      } else {
+      if ((0, types_1.isFunction)(converterType) || (0, types_1.isOverloadedFunction)(converterType)) {
         const acceptedTypes = [];
         const diagAddendum = new diagnostic_1.DiagnosticAddendum();
-        types_1.OverloadedFunctionType.getOverloads(converterType).forEach((overload) => {
-          const typeVarContext = new typeVarContext_1.TypeVarContext(typeVar.scopeId);
-          if (evaluator.assignType(targetFunction, overload, diagAddendum, typeVarContext)) {
-            const overloadSolution = (0, typeUtils_1.applySolvedTypeVars)(typeVar, typeVarContext, { unknownIfNotFound: true });
+        (0, typeUtils_1.doForEachSignature)(converterType, (signature) => {
+          var _a2;
+          const returnTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeIds)(signature));
+          if (evaluator.assignType(
+            (_a2 = types_1.FunctionType.getSpecializedReturnType(signature)) !== null && _a2 !== void 0 ? _a2 : types_1.UnknownType.create(),
+            fieldType,
+            /* diag */
+            void 0,
+            returnTypeVarContext
+          )) {
+            signature = (0, typeUtils_1.applySolvedTypeVars)(signature, returnTypeVarContext);
+          }
+          const inputTypeVarContext = new typeVarContext_1.TypeVarContext(typeVar.scopeId);
+          if (evaluator.assignType(targetFunction, signature, diagAddendum, inputTypeVarContext)) {
+            const overloadSolution = (0, typeUtils_1.applySolvedTypeVars)(typeVar, inputTypeVarContext, { unknownIfNotFound: true });
             acceptedTypes.push(overloadSolution);
           }
         });
         if (acceptedTypes.length > 0) {
           return (0, types_1.combineTypes)(acceptedTypes);
         }
-        evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.dataClassConverterOverloads().format({
-          funcName: converterType.overloads[0].details.name || "<anonymous function>",
-          fieldType: evaluator.printType(fieldType),
-          fieldName
-        }) + diagAddendum.getString(), converterNode);
+        if ((0, types_1.isFunction)(converterType)) {
+          evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.dataClassConverterFunction().format({
+            argType: evaluator.printType(converterType),
+            fieldType: evaluator.printType(fieldType),
+            fieldName
+          }) + diagAddendum.getString(), converterNode, (_a = diagAddendum.getEffectiveTextRange()) !== null && _a !== void 0 ? _a : converterNode);
+        } else {
+          evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.dataClassConverterOverloads().format({
+            funcName: converterType.overloads[0].details.name || "<anonymous function>",
+            fieldType: evaluator.printType(fieldType),
+            fieldName
+          }) + diagAddendum.getString(), converterNode);
+        }
       }
       return fieldType;
     }
@@ -64259,7 +64347,11 @@ var require_decorators = __commonJS({
         /* typeVarContext */
         void 0,
         /* skipUnknownArgCheck */
-        true
+        true,
+        /* inferenceContext */
+        void 0,
+        /* signatureTracker */
+        void 0
       );
       evaluator.setTypeResultForNode(node, {
         type: (_a = callTypeResult.returnType) !== null && _a !== void 0 ? _a : types_1.UnknownType.create(),
@@ -65202,7 +65294,22 @@ var require_operations = __commonJS({
             type = exprType;
           } else {
             const magicMethodName = unaryOperatorMap[node.operator];
-            type = evaluator.getTypeOfMagicMethodCall(exprType, magicMethodName, [], node, inferenceContext);
+            let isResultValid = true;
+            type = evaluator.mapSubtypesExpandTypeVars(
+              exprType,
+              /* options */
+              void 0,
+              (subtypeExpanded) => {
+                const result = evaluator.getTypeOfMagicMethodCall(subtypeExpanded, magicMethodName, [], node, inferenceContext);
+                if (!result) {
+                  isResultValid = false;
+                }
+                return result;
+              }
+            );
+            if (!isResultValid) {
+              type = void 0;
+            }
           }
           if (!type) {
             if (!isIncomplete) {
@@ -65639,6 +65746,7 @@ var require_typePrinter = __commonJS({
     }
     exports2.printLiteralValue = printLiteralValue;
     function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount) {
+      var _a;
       const originalPrintTypeFlags = printTypeFlags;
       const parenthesizeUnion = (printTypeFlags & 16) !== 0;
       printTypeFlags &= ~(16 | 128);
@@ -65707,8 +65815,8 @@ var require_typePrinter = __commonJS({
         }
       }
       if (recursionTypes.find((t) => {
-        var _a;
-        return t === type || t.typeAliasInfo !== void 0 && t.typeAliasInfo.fullName === ((_a = type.typeAliasInfo) === null || _a === void 0 ? void 0 : _a.fullName);
+        var _a2;
+        return t === type || t.typeAliasInfo !== void 0 && t.typeAliasInfo.fullName === ((_a2 = type.typeAliasInfo) === null || _a2 === void 0 ? void 0 : _a2.fullName);
       }) || recursionTypes.length > types_1.maxTypeRecursionCount) {
         if ((0, types_1.isTypeVar)(type) && type.details.isSynthesized && type.details.recursiveTypeAliasName) {
           return type.details.recursiveTypeAliasName;
@@ -65774,7 +65882,7 @@ var require_typePrinter = __commonJS({
                   typeToWrap = `Literal[${printLiteralValue(type)}]`;
                 }
               } else {
-                typeToWrap = printObjectTypeForClassInternal(type, printTypeFlags, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount);
+                typeToWrap = printObjectTypeForClassInternal((_a = type.specialForm) !== null && _a !== void 0 ? _a : type, printTypeFlags, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount);
               }
               return `${_printNestedInstantiable(type, typeToWrap)}${getConditionalIndicator(type)}`;
             }
@@ -65797,6 +65905,9 @@ var require_typePrinter = __commonJS({
             return `Overload[${overloads.join(", ")}]`;
           }
           case 8: {
+            if (types_1.TypeBase.isInstantiable(type) && type.specialForm && !type.typeAliasInfo) {
+              return printTypeInternal(type.specialForm, printTypeFlags, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount);
+            }
             const subtypeHandledSet = /* @__PURE__ */ new Set();
             const subtypeStrings = /* @__PURE__ */ new Set();
             const updatedPrintTypeFlags = printTypeFlags & 8 ? printTypeFlags | 128 : printTypeFlags;
@@ -66798,7 +66909,7 @@ var require_typeEvaluator = __commonJS({
           }
         }
       }
-      function getTypeOfExpression(node, flags = 0, inferenceContext) {
+      function getTypeOfExpression(node, flags = 0, inferenceContext, signatureTracker) {
         const cacheEntry = readTypeCacheEntry(node);
         if (cacheEntry && (!cacheEntry.typeResult.isIncomplete || cacheEntry.incompleteGenerationCount === incompleteGenerationCount)) {
           if (printExpressionTypes) {
@@ -66823,9 +66934,50 @@ var require_typeEvaluator = __commonJS({
           inferenceContext.expectedType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(inferenceContext.expectedType);
         }
         initializedBasicTypes(node);
+        let typeResult = getTypeOfExpressionCore(node, flags, inferenceContext, signatureTracker);
+        if ((0, types_1.isInstantiableClass)(typeResult.type) && typeResult.type.includePromotions && !typeResult.type.includeSubclasses && types_1.ClassType.isBuiltIn(typeResult.type, "bytes")) {
+          if (AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.disableBytesTypePromotions) {
+            typeResult = {
+              ...typeResult,
+              type: types_1.ClassType.cloneRemoveTypePromotions(typeResult.type)
+            };
+          }
+        }
+        const allowSpeculativeCaching = node.nodeType !== 4;
+        writeTypeCache(node, typeResult, flags, inferenceContext, allowSpeculativeCaching);
+        if (inferenceContext && !(0, types_1.isAnyOrUnknown)(inferenceContext.expectedType) && !(0, types_1.isNever)(inferenceContext.expectedType)) {
+          expectedTypeCache.set(node.id, inferenceContext.expectedType);
+          if (signatureTracker && (0, types_1.isFunction)(typeResult.type)) {
+            typeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(typeResult.type, signatureTracker, node.start);
+          }
+          if (!typeResult.isIncomplete && !typeResult.expectedTypeDiagAddendum) {
+            const diag = new diagnostic_1.DiagnosticAddendum();
+            if (!assignType(
+              inferenceContext.expectedType,
+              typeResult.type,
+              diag,
+              /* destTypeVarContext */
+              void 0,
+              /* srcTypeVarContext */
+              void 0,
+              1024
+              /* AssignTypeFlags.IgnoreTypeVarScope */
+            )) {
+              typeResult.typeErrors = true;
+              typeResult.expectedTypeDiagAddendum = diag;
+              diag.addTextRange(node);
+            }
+          }
+        }
+        if (printExpressionTypes) {
+          printExpressionSpaceCount--;
+          console.log(`${getPrintExpressionTypesSpaces()}${ParseTreeUtils.printExpression(node)} (${getLineNum(node)}): Post ${printType(typeResult.type)}${typeResult.isIncomplete ? " Incomplete" : ""}`);
+        }
+        return typeResult;
+      }
+      function getTypeOfExpressionCore(node, flags = 0, inferenceContext, signatureTracker) {
         let typeResult;
         let expectingInstantiable = (flags & 128) !== 0;
-        let allowSpeculativeCaching = true;
         switch (node.nodeType) {
           case 38: {
             typeResult = getTypeOfName(node, flags);
@@ -66840,11 +66992,11 @@ var require_typeEvaluator = __commonJS({
             break;
           }
           case 9: {
-            typeResult = getTypeOfCall(node, flags, inferenceContext);
+            typeResult = getTypeOfCall(node, flags, inferenceContext, signatureTracker);
             break;
           }
           case 52: {
-            typeResult = getTypeOfTuple(node, flags, inferenceContext);
+            typeResult = getTypeOfTuple(node, flags, inferenceContext, signatureTracker);
             break;
           }
           case 11: {
@@ -66901,7 +67053,7 @@ var require_typeEvaluator = __commonJS({
             break;
           }
           case 32: {
-            typeResult = getTypeOfListComprehension(node, inferenceContext);
+            typeResult = getTypeOfListComprehension(node, flags, inferenceContext);
             break;
           }
           case 15: {
@@ -66913,7 +67065,7 @@ var require_typeEvaluator = __commonJS({
             break;
           }
           case 3: {
-            typeResult = getTypeOfExpression(node.rightExpression, flags, inferenceContext);
+            typeResult = getTypeOfExpression(node.rightExpression, flags, inferenceContext, signatureTracker);
             assignTypeToExpression(
               node.leftExpression,
               typeResult.type,
@@ -66930,7 +67082,7 @@ var require_typeEvaluator = __commonJS({
             if ((flags & 256) !== 0) {
               addError(localize_1.LocMessage.walrusNotAllowed(), node);
             }
-            typeResult = getTypeOfExpression(node.rightExpression, flags, inferenceContext);
+            typeResult = getTypeOfExpression(node.rightExpression, flags, inferenceContext, signatureTracker);
             assignTypeToExpression(
               node.name,
               typeResult.type,
@@ -66939,7 +67091,6 @@ var require_typeEvaluator = __commonJS({
               /* ignoreEmptyContainers */
               true
             );
-            allowSpeculativeCaching = false;
             break;
           }
           case 60: {
@@ -66985,43 +67136,6 @@ var require_typeEvaluator = __commonJS({
         if (expectingInstantiable) {
           validateTypeIsInstantiable(typeResult, flags, node);
         }
-        if ((0, types_1.isInstantiableClass)(typeResult.type) && typeResult.type.includePromotions && !typeResult.type.includeSubclasses && types_1.ClassType.isBuiltIn(typeResult.type, "bytes")) {
-          if (AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.disableBytesTypePromotions) {
-            typeResult = {
-              ...typeResult,
-              type: types_1.ClassType.cloneRemoveTypePromotions(typeResult.type)
-            };
-          }
-        }
-        writeTypeCache(node, typeResult, flags, inferenceContext, allowSpeculativeCaching);
-        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,
-              /* destTypeVarContext */
-              void 0,
-              /* srcTypeVarContext */
-              void 0,
-              1024
-              /* AssignTypeFlags.IgnoreTypeVarScope */
-            )) {
-              typeResult.typeErrors = true;
-              typeResult.expectedTypeDiagAddendum = diag;
-              diag.addTextRange(node);
-            }
-          }
-        }
-        if (printExpressionTypes) {
-          printExpressionSpaceCount--;
-          console.log(`${getPrintExpressionTypesSpaces()}${ParseTreeUtils.printExpression(node)} (${getLineNum(node)}): Post ${printType(typeResult.type)}${typeResult.isIncomplete ? " Incomplete" : ""}`);
-        }
         return typeResult;
       }
       function reportUseOfTypeCheckOnly(type, node) {
@@ -67716,7 +67830,11 @@ var require_typeEvaluator = __commonJS({
               { type },
               new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(type)),
               /* skipUnknownArgCheck */
-              true
+              true,
+              /* inferenceContext */
+              void 0,
+              /* signatureTracker */
+              void 0
             );
           });
           signatures.push({
@@ -69060,6 +69178,8 @@ var require_typeEvaluator = __commonJS({
                         /* skipUnknownArgCheck */
                         false,
                         /* inferenceContext */
+                        void 0,
+                        /* signatureTracker */
                         void 0
                       );
                     });
@@ -69324,6 +69444,9 @@ var require_typeEvaluator = __commonJS({
         return types_1.ClassType.cloneAsInstance(type.specialForm);
       }
       function getCodeFlowTypeForCapturedVariable(node, symbolWithScope, effectiveType) {
+        if (symbolWithScope.usesGlobalBinding || symbolWithScope.usesNonlocalBinding) {
+          return void 0;
+        }
         const decls = symbolWithScope.symbol.getDeclarations();
         if (!decls.every(
           (decl) => decl.type === 1 || decl.type === 2 || decl.type === 8
@@ -69400,13 +69523,7 @@ var require_typeEvaluator = __commonJS({
                   if (memberName === "args" || memberName === "kwargs") {
                     const outerFunctionScope = ParseTreeUtils.getEnclosingClassOrFunction(enclosingScope);
                     if ((outerFunctionScope === null || outerFunctionScope === void 0 ? void 0 : outerFunctionScope.nodeType) === 28) {
-                      if (scopedTypeVarInfo.isRescoped) {
-                        addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.paramSpecScopedToReturnType().format({
-                          name: type.details.name
-                        }), node);
-                      } else {
-                        enclosingScope = outerFunctionScope;
-                      }
+                      enclosingScope = outerFunctionScope;
                     } else if (!scopedTypeVarInfo.type.scopeId) {
                       addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.paramSpecNotUsedByOuterScope().format({
                         name: type.details.name
@@ -69437,12 +69554,7 @@ var require_typeEvaluator = __commonJS({
             }
           } else if ((flags & 4096) === 0) {
             if ((type.scopeId === void 0 || scopedTypeVarInfo.foundInterveningClass) && !type.details.isSynthesized) {
-              let message;
-              if (scopedTypeVarInfo.isRescoped) {
-                message = (0, types_1.isParamSpec)(type) ? localize_1.LocMessage.paramSpecScopedToReturnType() : localize_1.LocMessage.typeVarScopedToReturnType();
-              } else {
-                message = (0, types_1.isParamSpec)(type) ? localize_1.LocMessage.paramSpecNotUsedByOuterScope() : localize_1.LocMessage.typeVarNotUsedByOuterScope();
-              }
+              const message = (0, types_1.isParamSpec)(type) ? localize_1.LocMessage.paramSpecNotUsedByOuterScope() : localize_1.LocMessage.typeVarNotUsedByOuterScope();
               addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, message.format({ name: type.details.name }), node);
             }
           }
@@ -69510,7 +69622,6 @@ var require_typeEvaluator = __commonJS({
         return type;
       }
       function findScopedTypeVar(node, type) {
-        var _a;
         let curNode = node;
         let nestedClassCount = 0;
         (0, debug_1.assert)(types_1.TypeBase.isInstantiable(type));
@@ -69533,9 +69644,6 @@ var require_typeEvaluator = __commonJS({
             if (functionType) {
               const functionDetails = functionType.details;
               typeParametersForScope = functionDetails.typeParameters;
-              if ((_a = functionDetails.rescopedTypeParameters) === null || _a === void 0 ? void 0 : _a.some((tp) => tp.details.name === type.details.name)) {
-                return { type, isRescoped: true, foundInterveningClass: false };
-              }
             }
             scopeUsesTypeParameterSyntax = !!curNode.typeParameters;
           } else if (curNode.nodeType === 77) {
@@ -69547,7 +69655,6 @@ var require_typeEvaluator = __commonJS({
               type = types_1.TypeVarType.cloneForScopeId(type, match.scopeId, match.scopeName, match.scopeType);
               return {
                 type,
-                isRescoped: false,
                 foundInterveningClass: nestedClassCount > 1 && !scopeUsesTypeParameterSyntax
               };
             }
@@ -69583,7 +69690,7 @@ var require_typeEvaluator = __commonJS({
                 const allowedTypeParams = leftType.details.recursiveTypeParameters;
                 if (allowedTypeParams) {
                   if (!allowedTypeParams.some((param) => param.details.name === type.details.name)) {
-                    return { type, isRescoped: false, foundInterveningClass: false };
+                    return { type, foundInterveningClass: false };
                   }
                 }
               }
@@ -69595,14 +69702,13 @@ var require_typeEvaluator = __commonJS({
                   2
                   /* TypeVarScopeType.TypeAlias */
                 ),
-                isRescoped: false,
                 foundInterveningClass: false
               };
             }
           }
           curNode = curNode.parent;
         }
-        return { type, isRescoped: false, foundInterveningClass: false };
+        return { type, foundInterveningClass: false };
       }
       function getTypeOfMemberAccess(node, flags) {
         var _a;
@@ -69706,7 +69812,7 @@ var require_typeEvaluator = __commonJS({
         return typeResult;
       }
       function getTypeOfMemberAccessWithBaseType(node, baseTypeResult, usage, flags) {
-        var _a;
+        var _a, _b;
         let baseType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(baseTypeResult.type);
         const memberName = node.memberName.value;
         let diag = new diagnostic_1.DiagnosticAddendum();
@@ -69797,8 +69903,16 @@ var require_typeEvaluator = __commonJS({
           }
           case 6: {
             let typeResult;
-            if (usage.method === "get") {
-              typeResult = (0, enums_1.getTypeOfEnumMember)(evaluatorInterface, node, baseType, memberName, isIncomplete);
+            const enumMemberResult = (0, enums_1.getTypeOfEnumMember)(evaluatorInterface, node, baseType, memberName, isIncomplete);
+            if (enumMemberResult) {
+              if (usage.method === "get") {
+                typeResult = enumMemberResult;
+              } else {
+                if ((0, types_1.isClassInstance)(enumMemberResult.type) && types_1.ClassType.isSameGenericClass(enumMemberResult.type, baseType) && enumMemberResult.type.literalValue !== void 0) {
+                  const diagMessage = usage.method === "set" ? localize_1.LocMessage.enumMemberSet() : localize_1.LocMessage.enumMemberDelete();
+                  addDiagnostic(diagnosticRules_1.DiagnosticRule.reportAttributeAccessIssue, diagMessage.format({ name: memberName }) + diag.getString(), node.memberName, (_a = diag.getEffectiveTextRange()) !== null && _a !== void 0 ? _a : node.memberName);
+                }
+              }
             }
             if (!typeResult) {
               typeResult = getTypeOfBoundMember(
@@ -69985,7 +70099,7 @@ var require_typeEvaluator = __commonJS({
               }
             }
             const rule = isFunctionRule ? diagnosticRules_1.DiagnosticRule.reportFunctionMemberAccess : diagnosticRules_1.DiagnosticRule.reportAttributeAccessIssue;
-            addDiagnostic(rule, diagMessage.format({ name: memberName, type: printType(baseType) }) + diag.getString(), node.memberName, (_a = diag.getEffectiveTextRange()) !== null && _a !== void 0 ? _a : node.memberName);
+            addDiagnostic(rule, diagMessage.format({ name: memberName, type: printType(baseType) }) + diag.getString(), node.memberName, (_b = diag.getEffectiveTextRange()) !== null && _b !== void 0 ? _b : node.memberName);
           }
           type = isFunctionRule ? types_1.AnyType.create() : types_1.UnknownType.create();
         }
@@ -70325,7 +70439,11 @@ var require_typeEvaluator = __commonJS({
             /* typeVarContext */
             void 0,
             /* skipUnknownArgCheck */
-            true
+            true,
+            /* inferenceContext */
+            void 0,
+            /* signatureTracker */
+            void 0
           );
         });
         let deprecationInfo;
@@ -70520,7 +70638,11 @@ var require_typeEvaluator = __commonJS({
           { type: accessMemberType },
           typeVarContext,
           /* skipUnknownArgCheck */
-          true
+          true,
+          /* inferenceContext */
+          void 0,
+          /* signatureTracker */
+          void 0
         );
         let isAsymmetricAccessor = false;
         if (usage.method === "set") {
@@ -71300,7 +71422,11 @@ var require_typeEvaluator = __commonJS({
               /* typeVarContext */
               void 0,
               /* skipUnknownArgCheck */
-              true
+              true,
+              /* inferenceContext */
+              void 0,
+              /* signatureTracker */
+              void 0
             );
             if (callResult.argumentErrors) {
               if ((0, types_1.isClassInstance)(positionalIndexType)) {
@@ -71313,7 +71439,19 @@ var require_typeEvaluator = __commonJS({
                     altArgList[0].typeResult = { type: intType };
                   }
                 }
-                callResult = validateCallArguments(node, altArgList, { type: itemMethodType });
+                callResult = validateCallArguments(
+                  node,
+                  altArgList,
+                  { type: itemMethodType },
+                  /* typeVarContext */
+                  void 0,
+                  /* skipUnknownArgCheck */
+                  true,
+                  /* inferenceContext */
+                  void 0,
+                  /* signatureTracker */
+                  void 0
+                );
                 if (!callResult.argumentErrors) {
                   argList = altArgList;
                 }
@@ -71328,7 +71466,11 @@ var require_typeEvaluator = __commonJS({
           /* typeVarContext */
           void 0,
           /* skipUnknownArgCheck */
-          true
+          true,
+          /* inferenceContext */
+          void 0,
+          /* signatureTracker */
+          void 0
         );
         return {
           type: (_d = callResult.returnType) !== null && _d !== void 0 ? _d : types_1.UnknownType.create(),
@@ -71359,16 +71501,16 @@ var require_typeEvaluator = __commonJS({
           const unboundedIndex = tupleTypeArgs.findIndex((typeArg) => typeArg.isUnbounded || (0, types_1.isVariadicTypeVar)(typeArg.type));
           if (value < 0) {
             value = tupleTypeArgs.length + value;
-            if (value < 0) {
-              return void 0;
-            } else if (unboundedIndex >= 0 && value <= unboundedIndex) {
+            if (unboundedIndex >= 0 && value <= unboundedIndex) {
               return void 0;
+            } else if (value < 0) {
+              return 0;
             }
           } else {
-            if (value > tupleTypeArgs.length) {
-              return void 0;
-            } else if (unboundedIndex >= 0 && value > unboundedIndex) {
+            if (unboundedIndex >= 0 && value > unboundedIndex) {
               return void 0;
+            } else if (value > tupleTypeArgs.length) {
+              return tupleTypeArgs.length;
             }
           }
         }
@@ -71377,8 +71519,25 @@ var require_typeEvaluator = __commonJS({
       function getTypeArgs(node, flags, options) {
         const typeArgs = [];
         let adjFlags = flags;
-        if ((options === null || options === void 0 ? void 0 : options.isFinalAnnotation) || (options === null || options === void 0 ? void 0 : options.isClassVarAnnotation)) {
+        if (options === null || options === void 0 ? void 0 : options.isFinalAnnotation) {
           adjFlags |= 131072 | 16;
+        } else if (options === null || options === void 0 ? void 0 : options.isClassVarAnnotation) {
+          adjFlags |= 131072;
+          let disallowFinal = true;
+          const enclosingClassNode = ParseTreeUtils.getEnclosingClass(
+            node,
+            /* stopeAtFunction */
+            true
+          );
+          if (enclosingClassNode) {
+            const classTypeInfo = getTypeOfClass(enclosingClassNode);
+            if (classTypeInfo && types_1.ClassType.isDataClass(classTypeInfo.classType)) {
+              disallowFinal = false;
+            }
+          }
+          if (disallowFinal) {
+            adjFlags |= 16;
+          }
         } else {
           adjFlags &= ~(2 | 32 | 64 | 1048576 | 16384);
           if (!(options === null || options === void 0 ? void 0 : options.isAnnotatedClass)) {
@@ -71474,7 +71633,7 @@ var require_typeEvaluator = __commonJS({
         }
         return typeResult;
       }
-      function getTypeOfTuple(node, flags, inferenceContext) {
+      function getTypeOfTuple(node, flags, inferenceContext, signatureTracker) {
         var _a;
         if ((flags & 256) !== 0 && ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) !== 1) {
           const diag = new diagnostic_1.DiagnosticAddendum();
@@ -71485,6 +71644,7 @@ var require_typeEvaluator = __commonJS({
         if ((flags & 128) !== 0 && node.expressions.length === 0 && !inferenceContext) {
           return { type: makeTupleObject([]), isEmptyTupleShorthand: true };
         }
+        flags &= ~(256 | 8 | 128);
         let effectiveExpectedType = inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.expectedType;
         let expectedTypeContainsAny = inferenceContext && (0, types_1.isAny)(inferenceContext.expectedType);
         if (inferenceContext && (0, types_1.isUnion)(inferenceContext.expectedType)) {
@@ -71497,7 +71657,13 @@ var require_typeEvaluator = __commonJS({
               }
               if (!matchingSubtype) {
                 const subtypeResult = useSpeculativeMode(node, () => {
-                  return getTypeOfTupleWithContext(node, (0, typeUtils_1.makeInferenceContext)(subtype));
+                  return getTypeOfTupleWithContext(
+                    node,
+                    flags,
+                    (0, typeUtils_1.makeInferenceContext)(subtype),
+                    /* signatureTracker */
+                    void 0
+                  );
                 });
                 if (subtypeResult && assignType(subtype, subtypeResult.type)) {
                   matchingSubtype = subtype;
@@ -71511,24 +71677,19 @@ var require_typeEvaluator = __commonJS({
         }
         let expectedTypeDiagAddendum;
         if (effectiveExpectedType) {
-          const result = getTypeOfTupleWithContext(node, (0, typeUtils_1.makeInferenceContext)(
-            effectiveExpectedType,
-            /* isTypeIncomplete */
-            false,
-            inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.signatureTracker
-          ));
+          const result = getTypeOfTupleWithContext(node, flags, (0, typeUtils_1.makeInferenceContext)(effectiveExpectedType), signatureTracker);
           if (result && !result.typeErrors) {
             return result;
           }
           expectedTypeDiagAddendum = result === null || result === void 0 ? void 0 : result.expectedTypeDiagAddendum;
         }
-        const typeResult = getTypeOfTupleInferred(node);
+        const typeResult = getTypeOfTupleInferred(node, flags);
         if (expectedTypeContainsAny) {
           typeResult.type = types_1.AnyType.create();
         }
         return { ...typeResult, expectedTypeDiagAddendum };
       }
-      function getTypeOfTupleWithContext(node, inferenceContext) {
+      function getTypeOfTupleWithContext(node, flags, inferenceContext, signatureTracker) {
         inferenceContext.expectedType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(inferenceContext.expectedType);
         if (!(0, types_1.isClassInstance)(inferenceContext.expectedType)) {
           return void 0;
@@ -71563,14 +71724,13 @@ var require_typeEvaluator = __commonJS({
             expectedTypes.push(homogenousType);
           }
         }
-        const entryTypeResults = node.expressions.map((expr, index) => getTypeOfExpression(
-          expr,
-          /* flags */
-          void 0,
-          (0, typeUtils_1.makeInferenceContext)(index < expectedTypes.length ? expectedTypes[index] : void 0, inferenceContext.isTypeIncomplete, inferenceContext.signatureTracker)
-        ));
+        const entryTypeResults = node.expressions.map((expr, index) => getTypeOfExpression(expr, flags | 268435456, (0, typeUtils_1.makeInferenceContext)(index < expectedTypes.length ? expectedTypes[index] : void 0, inferenceContext.isTypeIncomplete), signatureTracker));
         const isIncomplete = entryTypeResults.some((result) => result.isIncomplete);
-        const type = makeTupleObject(buildTupleTypesList(entryTypeResults));
+        const type = makeTupleObject(buildTupleTypesList(
+          entryTypeResults,
+          /* stripLiterals */
+          false
+        ));
         let expectedTypeDiagAddendum;
         if (entryTypeResults.some((result) => result.expectedTypeDiagAddendum)) {
           expectedTypeDiagAddendum = new diagnostic_1.DiagnosticAddendum();
@@ -71582,10 +71742,14 @@ var require_typeEvaluator = __commonJS({
         }
         return { type, expectedTypeDiagAddendum, isIncomplete };
       }
-      function getTypeOfTupleInferred(node) {
-        const entryTypeResults = node.expressions.map((expr) => getTypeOfExpression(expr));
+      function getTypeOfTupleInferred(node, flags) {
+        const entryTypeResults = node.expressions.map((expr) => getTypeOfExpression(
+          expr,
+          flags | 268435456
+          /* EvaluatorFlags.StripLiteralTypeForTuple */
+        ));
         const isIncomplete = entryTypeResults.some((result) => result.isIncomplete);
-        const type = makeTupleObject(buildTupleTypesList(entryTypeResults));
+        const type = makeTupleObject(buildTupleTypesList(entryTypeResults, (flags & 268435456) !== 0));
         if (isIncomplete) {
           if ((0, typeUtils_1.getContainerDepth)(type) > maxInferredContainerDepth) {
             return { type: types_1.UnknownType.create() };
@@ -71593,7 +71757,7 @@ var require_typeEvaluator = __commonJS({
         }
         return { type, isIncomplete };
       }
-      function buildTupleTypesList(entryTypeResults) {
+      function buildTupleTypesList(entryTypeResults, stripLiterals) {
         const entryTypes = [];
         for (const typeResult of entryTypeResults) {
           let possibleUnpackedTuple;
@@ -71615,7 +71779,8 @@ var require_typeEvaluator = __commonJS({
               true
             ), isUnbounded: false });
           } else {
-            entryTypes.push({ type: typeResult.type, isUnbounded: !!typeResult.unpackedType });
+            const entryType = stripLiterals ? stripLiteralValue(typeResult.type) : typeResult.type;
+            entryTypes.push({ type: entryType, isUnbounded: !!typeResult.unpackedType });
           }
         }
         if (entryTypes.filter((t) => t.isUnbounded).length > 1) {
@@ -71625,7 +71790,7 @@ var require_typeEvaluator = __commonJS({
         }
         return entryTypes;
       }
-      function getTypeOfCall(node, flags, inferenceContext) {
+      function getTypeOfCall(node, flags, inferenceContext, signatureTracker) {
         var _a;
         let baseTypeResult;
         if ((flags & 256) !== 0 && node.leftExpression.nodeType === 38 && node.leftExpression.value === "type") {
@@ -71648,18 +71813,18 @@ 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 (signatureTracker) {
+          baseTypeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(baseTypeResult.type, signatureTracker, node.leftExpression.start);
         }
         if (!(0, typeUtils_1.isTypeAliasPlaceholder)(baseTypeResult.type)) {
           if (node.leftExpression.nodeType === 38 && node.leftExpression.value === "super") {
             typeResult = getTypeOfSuperCall(node);
           } else if ((0, types_1.isAnyOrUnknown)(baseTypeResult.type) && node.leftExpression.nodeType === 38 && node.leftExpression.value === "reveal_type") {
-            typeResult = getTypeOfRevealType(node, inferenceContext);
+            typeResult = getTypeOfRevealType(node, inferenceContext, signatureTracker);
           } else if ((0, types_1.isFunction)(baseTypeResult.type) && baseTypeResult.type.details.builtInName === "reveal_type") {
-            typeResult = getTypeOfRevealType(node, inferenceContext);
+            typeResult = getTypeOfRevealType(node, inferenceContext, signatureTracker);
           } else if ((0, types_1.isFunction)(baseTypeResult.type) && baseTypeResult.type.details.builtInName === "assert_type") {
-            typeResult = getTypeOfAssertType(node, inferenceContext);
+            typeResult = getTypeOfAssertType(node, inferenceContext, signatureTracker);
           } else if ((0, types_1.isAnyOrUnknown)(baseTypeResult.type) && node.leftExpression.nodeType === 38 && node.leftExpression.value === "reveal_locals") {
             if (node.arguments.length === 0) {
               typeResult.type = getTypeOfRevealLocals(node);
@@ -71675,7 +71840,8 @@ var require_typeEvaluator = __commonJS({
               void 0,
               /* skipUnknownArgCheck */
               false,
-              inferenceContext
+              inferenceContext,
+              signatureTracker
             );
             typeResult.type = (_a = callResult.returnType) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
             if (callResult.argumentErrors) {
@@ -71749,7 +71915,7 @@ var require_typeEvaluator = __commonJS({
         }
         return typeResult;
       }
-      function getTypeOfAssertType(node, inferenceContext) {
+      function getTypeOfAssertType(node, inferenceContext, signatureTracker) {
         if (node.arguments.length !== 2 || node.arguments[0].argumentCategory !== 0 || node.arguments[0].name !== void 0 || node.arguments[0].argumentCategory !== 0 || node.arguments[1].name !== void 0) {
           addError(localize_1.LocMessage.assertTypeArgs(), node);
           return { type: types_1.UnknownType.create() };
@@ -71758,7 +71924,8 @@ var require_typeEvaluator = __commonJS({
           node.arguments[0].valueExpression,
           /* flags */
           void 0,
-          inferenceContext
+          inferenceContext,
+          signatureTracker
         );
         if (arg0TypeResult.isIncomplete) {
           return { type: types_1.UnknownType.create(
@@ -71776,7 +71943,7 @@ var require_typeEvaluator = __commonJS({
         }
         return { type: arg0TypeResult.type };
       }
-      function getTypeOfRevealType(node, inferenceContext) {
+      function getTypeOfRevealType(node, inferenceContext, signatureTracker) {
         let arg0Value;
         let expectedRevealTypeNode;
         let expectedRevealType;
@@ -71810,7 +71977,8 @@ var require_typeEvaluator = __commonJS({
           arg0Value,
           /* flags */
           void 0,
-          inferenceContext
+          inferenceContext,
+          signatureTracker
         );
         const type = typeResult.type;
         const exprString = ParseTreeUtils.printExpression(arg0Value);
@@ -71876,7 +72044,7 @@ var require_typeEvaluator = __commonJS({
         if (node.arguments.length > 0) {
           targetClassType = getTypeOfExpression(node.arguments[0].valueExpression).type;
           const concreteTargetClassType = makeTopLevelTypeVarsConcrete(targetClassType);
-          if (!(0, types_1.isAnyOrUnknown)(concreteTargetClassType) && !(0, types_1.isInstantiableClass)(concreteTargetClassType)) {
+          if (!(0, types_1.isAnyOrUnknown)(concreteTargetClassType) && !(0, types_1.isInstantiableClass)(concreteTargetClassType) && !(0, typeUtils_1.isMetaclassInstance)(concreteTargetClassType)) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportArgumentType, localize_1.LocMessage.superCallFirstArg().format({ type: printType(targetClassType) }), node.arguments[0].valueExpression);
           }
         } else {
@@ -72050,7 +72218,7 @@ var require_typeEvaluator = __commonJS({
         }
         return { type: types_1.UnknownType.create() };
       }
-      function validateOverloadsWithExpandedTypes(errorNode, expandedArgTypes, argParamMatches, typeVarContext, skipUnknownArgCheck, inferenceContext) {
+      function validateOverloadsWithExpandedTypes(errorNode, expandedArgTypes, argParamMatches, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker) {
         var _a, _b;
         const returnTypes = [];
         const matchedOverloads = [];
@@ -72088,7 +72256,8 @@ var require_typeEvaluator = __commonJS({
                 effectiveTypeVarContext,
                 /* skipUnknownArgCheck */
                 true,
-                inferenceContext
+                inferenceContext,
+                signatureTracker
               );
             });
             if (callResult.isTypeIncomplete) {
@@ -72181,7 +72350,7 @@ var require_typeEvaluator = __commonJS({
         const finalTypeVarContext = typeVarContext !== null && typeVarContext !== void 0 ? typeVarContext : matchedOverloads[0].typeVarContext;
         finalTypeVarContext.unlock();
         finalTypeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeId)(matchedOverloads[0].overload));
-        const finalCallResult = validateFunctionArgumentTypesWithContext(errorNode, matchedOverloads[0].matchResults, finalTypeVarContext, skipUnknownArgCheck, inferenceContext);
+        const finalCallResult = validateFunctionArgumentTypesWithContext(errorNode, matchedOverloads[0].matchResults, finalTypeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
         if (finalCallResult.isTypeIncomplete) {
           isTypeIncomplete = true;
         }
@@ -72231,7 +72400,14 @@ var require_typeEvaluator = __commonJS({
         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);
+            const matchResults = matchFunctionArgumentsToParameters(
+              errorNode,
+              argList,
+              { type: overload, isIncomplete: typeResult.isIncomplete },
+              overloadIndex,
+              /* signatureTracker */
+              void 0
+            );
             if (!matchResults.argumentErrors) {
               matches.push(matchResults);
             }
@@ -72267,14 +72443,14 @@ var require_typeEvaluator = __commonJS({
           return a.overloadIndex - b.overloadIndex;
         });
       }
-      function validateOverloadedFunctionArguments(errorNode, argList, typeResult, typeVarContext, skipUnknownArgCheck, inferenceContext) {
+      function validateOverloadedFunctionArguments(errorNode, argList, typeResult, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker) {
         let filteredMatchResults = [];
         let contextFreeArgTypes;
         let isTypeIncomplete = !!typeResult.isIncomplete;
         useSpeculativeMode(errorNode, () => {
           let overloadIndex = 0;
           types_1.OverloadedFunctionType.getOverloads(typeResult.type).forEach((overload) => {
-            const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, { type: overload, isIncomplete: typeResult.isIncomplete }, overloadIndex);
+            const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, { type: overload, isIncomplete: typeResult.isIncomplete }, overloadIndex, signatureTracker);
             if (!matchResults.argumentErrors) {
               filteredMatchResults.push(matchResults);
             }
@@ -72287,7 +72463,12 @@ var require_typeEvaluator = __commonJS({
             const functionName = typeResult.type.overloads[0].details.name || "<anonymous function>";
             const diagAddendum = new diagnostic_1.DiagnosticAddendum();
             const argTypes = argList.map((t) => {
-              const typeString = printType(getTypeOfArgument(t).type);
+              const typeString = printType(getTypeOfArgument(
+                t,
+                /* inferenceContext */
+                void 0,
+                signatureTracker
+              ).type);
               if (t.argumentCategory === 1) {
                 return `*${typeString}`;
               }
@@ -72319,7 +72500,7 @@ var require_typeEvaluator = __commonJS({
           const effectiveTypeVarContext = typeVarContext !== null && typeVarContext !== void 0 ? typeVarContext : new typeVarContext_1.TypeVarContext();
           effectiveTypeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeIds)(bestMatch.overload));
           effectiveTypeVarContext.unlock();
-          return validateFunctionArgumentTypesWithContext(errorNode, bestMatch, effectiveTypeVarContext, skipUnknownArgCheck2, inferenceContext);
+          return validateFunctionArgumentTypesWithContext(errorNode, bestMatch, effectiveTypeVarContext, skipUnknownArgCheck2, inferenceContext, signatureTracker);
         }
         if (filteredMatchResults.length === 1) {
           return evaluateUsingBestMatchingOverload(
@@ -72331,7 +72512,7 @@ var require_typeEvaluator = __commonJS({
         }
         let expandedArgTypes = [argList.map((arg) => void 0)];
         while (true) {
-          const callResult = validateOverloadsWithExpandedTypes(errorNode, expandedArgTypes, filteredMatchResults, typeVarContext, skipUnknownArgCheck, inferenceContext);
+          const callResult = validateOverloadsWithExpandedTypes(errorNode, expandedArgTypes, filteredMatchResults, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
           if (callResult.isTypeIncomplete) {
             isTypeIncomplete = true;
           }
@@ -72405,7 +72586,7 @@ var require_typeEvaluator = __commonJS({
         });
         return newExpandedArgTypes;
       }
-      function validateCallArguments(errorNode, argList, callTypeResult, typeVarContext, skipUnknownArgCheck = false, inferenceContext, recursionCount = 0) {
+      function validateCallArguments(errorNode, argList, callTypeResult, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount = 0) {
         let argumentErrors = false;
         let isTypeIncomplete = false;
         let specializedInitSelfType;
@@ -72423,7 +72604,7 @@ var require_typeEvaluator = __commonJS({
         }
         let returnType = mapSubtypesExpandTypeVars(callTypeResult.type, { sortSubtypes: true }, (expandedSubtype, unexpandedSubtype, isLastIteration) => {
           return useSpeculativeMode(isLastIteration ? void 0 : errorNode, () => {
-            const callResult = validateCallArgumentsForSubtype(errorNode, argList, expandedSubtype, unexpandedSubtype, !!callTypeResult.isIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, recursionCount);
+            const callResult = validateCallArgumentsForSubtype(errorNode, argList, expandedSubtype, unexpandedSubtype, !!callTypeResult.isIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount);
             if (callResult.argumentErrors) {
               argumentErrors = true;
             }
@@ -72450,7 +72631,7 @@ var require_typeEvaluator = __commonJS({
           overloadsUsedForCall
         };
       }
-      function validateCallArgumentsForSubtype(errorNode, argList, expandedCallType, unexpandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, recursionCount) {
+      function validateCallArgumentsForSubtype(errorNode, argList, expandedCallType, unexpandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount) {
         switch (expandedCallType.category) {
           case 3:
           case 1:
@@ -72458,17 +72639,22 @@ var require_typeEvaluator = __commonJS({
             if (!isCallTypeIncomplete) {
               argList.forEach((arg) => {
                 if (arg.valueExpression && !isSpeculativeModeInUse(arg.valueExpression)) {
-                  getTypeOfArgument(arg);
+                  getTypeOfArgument(
+                    arg,
+                    /* inferenceContext */
+                    void 0,
+                    signatureTracker
+                  );
                 }
               });
             }
             return { returnType: expandedCallType };
           }
           case 4: {
-            return validateCallForFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext);
+            return validateCallForFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
           }
           case 5: {
-            return validateCallForOverloadedFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext);
+            return validateCallForOverloadedFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
           }
           case 6: {
             if ((0, typeUtils_1.isNoneInstance)(expandedCallType)) {
@@ -72476,12 +72662,12 @@ var require_typeEvaluator = __commonJS({
               return { argumentErrors: true };
             }
             if (types_1.TypeBase.isInstantiable(expandedCallType)) {
-              return validateCallForInstantiableClass(errorNode, argList, expandedCallType, unexpandedCallType, skipUnknownArgCheck, inferenceContext);
+              return validateCallForInstantiableClass(errorNode, argList, expandedCallType, unexpandedCallType, skipUnknownArgCheck, inferenceContext, signatureTracker);
             }
-            return validateCallForClassInstance(errorNode, argList, expandedCallType, unexpandedCallType, typeVarContext, skipUnknownArgCheck, inferenceContext, recursionCount);
+            return validateCallForClassInstance(errorNode, argList, expandedCallType, unexpandedCallType, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount);
           }
           case 9: {
-            return validateCallArguments(errorNode, argList, { type: (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(expandedCallType), isIncomplete: isCallTypeIncomplete }, typeVarContext, skipUnknownArgCheck, inferenceContext, recursionCount);
+            return validateCallArguments(errorNode, argList, { type: (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(expandedCallType), isIncomplete: isCallTypeIncomplete }, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount);
           }
           case 7: {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportCallIssue, localize_1.LocMessage.moduleNotCallable(), errorNode);
@@ -72490,7 +72676,7 @@ var require_typeEvaluator = __commonJS({
         }
         return { argumentErrors: true };
       }
-      function validateCallForFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext) {
+      function validateCallForFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker) {
         var _a;
         if (types_1.TypeBase.isInstantiable(expandedCallType)) {
           addDiagnostic(diagnosticRules_1.DiagnosticRule.reportCallIssue, localize_1.LocMessage.callableNotInstantiable().format({
@@ -72513,13 +72699,13 @@ var require_typeEvaluator = __commonJS({
               false
             )
           };
-          validateFunctionArguments(errorNode, argList, { type: expandedCallType }, effectiveTypeVarContext, skipUnknownArgCheck);
+          validateFunctionArguments(errorNode, argList, { type: expandedCallType }, effectiveTypeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
           return result;
         }
         if (expandedCallType.details.builtInName === "NewType") {
           return { returnType: createNewType(errorNode, argList) };
         }
-        const functionResult = validateFunctionArguments(errorNode, argList, { type: expandedCallType, isIncomplete: isCallTypeIncomplete }, effectiveTypeVarContext, skipUnknownArgCheck, inferenceContext);
+        const functionResult = validateFunctionArguments(errorNode, argList, { type: expandedCallType, isIncomplete: isCallTypeIncomplete }, effectiveTypeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
         let isTypeIncomplete = !!functionResult.isTypeIncomplete;
         let returnType = functionResult.returnType;
         let argumentErrors = !!functionResult.argumentErrors;
@@ -72611,12 +72797,12 @@ var require_typeEvaluator = __commonJS({
         }
         return { symbol, symbolName, classType, hasImplementation };
       }
-      function validateCallForOverloadedFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext) {
+      function validateCallForOverloadedFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker) {
         var _a, _b;
         if (expandedCallType.overloads[0].details.builtInName === "cast" && argList.length === 2) {
           return { returnType: evaluateCastCall(argList, errorNode) };
         }
-        const callResult = validateOverloadedFunctionArguments(errorNode, argList, { type: expandedCallType, isIncomplete: isCallTypeIncomplete }, typeVarContext, skipUnknownArgCheck, inferenceContext);
+        const callResult = validateOverloadedFunctionArguments(errorNode, argList, { type: expandedCallType, isIncomplete: isCallTypeIncomplete }, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
         let returnType = (_a = callResult.returnType) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
         let isTypeIncomplete = !!callResult.isTypeIncomplete;
         let argumentErrors = !!callResult.argumentErrors;
@@ -72642,7 +72828,7 @@ var require_typeEvaluator = __commonJS({
           specializedInitSelfType: callResult.specializedInitSelfType
         };
       }
-      function validateCallForInstantiableClass(errorNode, argList, expandedCallType, unexpandedCallType, skipUnknownArgCheck, inferenceContext) {
+      function validateCallForInstantiableClass(errorNode, argList, expandedCallType, unexpandedCallType, skipUnknownArgCheck, inferenceContext, signatureTracker) {
         var _a, _b;
         if (expandedCallType.literalValue !== void 0) {
           addDiagnostic(diagnosticRules_1.DiagnosticRule.reportCallIssue, localize_1.LocMessage.literalNotCallable(), errorNode);
@@ -72657,21 +72843,35 @@ var require_typeEvaluator = __commonJS({
               }), errorNode);
               return { returnType: types_1.UnknownType.create(), argumentErrors: true };
             }
-            (0, constructors_1.validateConstructorArguments)(evaluatorInterface, errorNode, argList, expandedCallType, skipUnknownArgCheck, inferenceContext);
+            (0, constructors_1.validateConstructorArguments)(evaluatorInterface, errorNode, argList, expandedCallType, skipUnknownArgCheck, inferenceContext, signatureTracker);
             if (expandedCallType.details.name === "type" && argList.length === 1) {
-              const argType = getTypeOfArgument(argList[0]).type;
+              const argType = getTypeOfArgument(
+                argList[0],
+                /* inferenceContext */
+                void 0,
+                signatureTracker
+              ).type;
               const returnType2 = (0, typeUtils_1.mapSubtypes)(argType, (subtype) => {
-                var _a2;
-                if ((0, types_1.isInstantiableClass)(subtype)) {
-                  return (_a2 = subtype.details.effectiveMetaclass) !== null && _a2 !== void 0 ? _a2 : types_1.AnyType.create();
+                if ((0, types_1.isInstantiableClass)(subtype) && subtype.details.effectiveMetaclass) {
+                  return subtype.details.effectiveMetaclass;
                 }
-                if ((0, types_1.isClassInstance)(subtype) || (0, types_1.isTypeVar)(subtype) && types_1.TypeBase.isInstance(subtype) || (0, typeUtils_1.isNoneInstance)(subtype)) {
-                  return (0, typeUtils_1.convertToInstantiable)(stripLiteralValue(subtype));
+                if ((0, types_1.isNever)(subtype)) {
+                  return subtype;
                 }
-                if ((0, types_1.isFunction)(subtype) && types_1.TypeBase.isInstance(subtype)) {
-                  return types_1.FunctionType.cloneAsInstantiable(subtype);
+                if (types_1.TypeBase.isInstance(subtype)) {
+                  if ((0, types_1.isClass)(subtype) || (0, types_1.isTypeVar)(subtype)) {
+                    return (0, typeUtils_1.convertToInstantiable)(stripLiteralValue(subtype));
+                  }
+                  if ((0, types_1.isFunction)(subtype)) {
+                    return types_1.FunctionType.cloneAsInstantiable(subtype);
+                  }
                 }
-                return types_1.AnyType.create();
+                return types_1.ClassType.cloneForSpecialization(
+                  types_1.ClassType.cloneAsInstance(expandedCallType),
+                  [types_1.UnknownType.create()],
+                  /* isTypeArgumentExplicit */
+                  true
+                );
               });
               return { returnType: returnType2 };
             }
@@ -72731,7 +72931,8 @@ var require_typeEvaluator = __commonJS({
                 void 0,
                 skipUnknownArgCheck,
                 /* inferenceContext */
-                void 0
+                void 0,
+                signatureTracker
               );
             }
             return result;
@@ -72785,7 +72986,7 @@ var require_typeEvaluator = __commonJS({
             type: expandedCallType.details.name
           }), errorNode);
         }
-        const constructorResult = (0, constructors_1.validateConstructorArguments)(evaluatorInterface, errorNode, argList, expandedCallType, skipUnknownArgCheck, inferenceContext);
+        const constructorResult = (0, constructors_1.validateConstructorArguments)(evaluatorInterface, errorNode, argList, expandedCallType, skipUnknownArgCheck, inferenceContext, signatureTracker);
         const overloadsUsedForCall = constructorResult.overloadsUsedForCall;
         const argumentErrors = constructorResult.argumentErrors;
         const isTypeIncomplete = constructorResult.isTypeIncomplete;
@@ -72796,7 +72997,12 @@ var require_typeEvaluator = __commonJS({
         if (returnType && (0, types_1.isClassInstance)(returnType) && returnType.details.mro.some((baseClass) => (0, types_1.isInstantiableClass)(baseClass) && types_1.ClassType.isBuiltIn(baseClass, "type"))) {
           let newClassName = "__class_" + returnType.details.name;
           if (argList.length === 3) {
-            const firstArgType = getTypeOfArgument(argList[0]).type;
+            const firstArgType = getTypeOfArgument(
+              argList[0],
+              /* inferenceContext */
+              void 0,
+              signatureTracker
+            ).type;
             if ((0, types_1.isClassInstance)(firstArgType) && types_1.ClassType.isBuiltIn(firstArgType, "str") && typeof firstArgType.literalValue === "string") {
               newClassName = firstArgType.literalValue;
             }
@@ -72810,7 +73016,7 @@ var require_typeEvaluator = __commonJS({
         }
         return { returnType, overloadsUsedForCall, argumentErrors, isTypeIncomplete };
       }
-      function validateCallForClassInstance(errorNode, argList, expandedCallType, unexpandedCallType, typeVarContext, skipUnknownArgCheck, inferenceContext, recursionCount) {
+      function validateCallForClassInstance(errorNode, argList, expandedCallType, unexpandedCallType, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount) {
         var _a;
         const callDiag = new diagnostic_1.DiagnosticAddendum();
         const callMethodResult = getTypeOfBoundMember(
@@ -72832,7 +73038,7 @@ var require_typeEvaluator = __commonJS({
           }) + callDiag.getString(), errorNode);
           return { returnType: types_1.UnknownType.create(), argumentErrors: true };
         }
-        const callResult = validateCallArguments(errorNode, argList, { type: callMethodType }, typeVarContext, skipUnknownArgCheck, inferenceContext, recursionCount);
+        const callResult = validateCallArguments(errorNode, argList, { type: callMethodType }, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount);
         let returnType = (_a = callResult.returnType) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
         if ((0, types_1.isTypeVar)(unexpandedCallType) && types_1.TypeBase.isInstantiable(unexpandedCallType) && (0, types_1.isClass)(expandedCallType) && types_1.ClassType.isBuiltIn(expandedCallType, "type")) {
           returnType = (0, typeUtils_1.convertToInstance)(unexpandedCallType);
@@ -72845,7 +73051,13 @@ var require_typeEvaluator = __commonJS({
       }
       function evaluateCastCall(argList, errorNode) {
         const castToType = getTypeOfArgumentExpectingType(argList[0], { enforceTypeAnnotationRules: true }).type;
-        let castFromType = getTypeOfArgument(argList[1]).type;
+        let castFromType = getTypeOfArgument(
+          argList[1],
+          /* inferenceContext */
+          void 0,
+          /* signatureTracker */
+          void 0
+        ).type;
         if (castFromType.specialForm) {
           castFromType = castFromType.specialForm;
         }
@@ -72860,12 +73072,17 @@ var require_typeEvaluator = __commonJS({
         }
         return (0, typeUtils_1.convertToInstance)(castToType);
       }
-      function expandArgList(argList) {
+      function expandArgList(argList, signatureTracker) {
         var _a;
         const expandedArgList = [];
         for (const arg of argList) {
           if (arg.argumentCategory === 1) {
-            const argType = getTypeOfArgument(arg).type;
+            const argType = getTypeOfArgument(
+              arg,
+              /* inferenceContext */
+              void 0,
+              signatureTracker
+            ).type;
             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 : [];
@@ -72899,7 +73116,7 @@ var require_typeEvaluator = __commonJS({
         }
         return expandedArgList;
       }
-      function matchFunctionArgumentsToParameters(errorNode, argList, typeResult, overloadIndex) {
+      function matchFunctionArgumentsToParameters(errorNode, argList, typeResult, overloadIndex, signatureTracker) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const paramDetails = (0, parameterUtils_1.getParameterListDetails)(typeResult.type);
         let argIndex = 0;
@@ -72907,7 +73124,7 @@ var require_typeEvaluator = __commonJS({
         let reportedArgError = false;
         let isTypeIncomplete = !!typeResult.isIncomplete;
         let isVariadicTypeVarFullyMatched = false;
-        argList = expandArgList(argList);
+        argList = expandArgList(argList, signatureTracker);
         const paramMap = /* @__PURE__ */ new Map();
         paramDetails.params.forEach((paramInfo) => {
           (0, debug_1.assert)(paramInfo !== void 0, "paramInfo is undefined for param name map");
@@ -72916,7 +73133,7 @@ var require_typeEvaluator = __commonJS({
             paramMap.set(param.name, {
               argsNeeded: param.category === 0 && !param.hasDefault ? 1 : 0,
               argsReceived: 0,
-              isPositionalOnly: paramInfo.source === parameterUtils_1.ParameterSource.PositionOnly
+              isPositionalOnly: paramInfo.kind === parameterUtils_1.ParameterKind.Positional
             });
           }
         });
@@ -73014,7 +73231,12 @@ var require_typeEvaluator = __commonJS({
             } else {
               let tooManyPositionals = false;
               if (foundUnpackedListArg && argList[argIndex].argumentCategory === 1) {
-                const argType = getTypeOfArgument(argList[argIndex]).type;
+                const argType = getTypeOfArgument(
+                  argList[argIndex],
+                  /* inferenceContext */
+                  void 0,
+                  signatureTracker
+                ).type;
                 if ((0, types_1.isClassInstance)(argType) && (0, typeUtils_1.isTupleClass)(argType) && !(0, typeUtils_1.isUnboundedTupleClass)(argType) && argType.tupleTypeArguments !== void 0 && argType.tupleTypeArguments.length > 0) {
                   tooManyPositionals = true;
                 }
@@ -73041,7 +73263,12 @@ var require_typeEvaluator = __commonJS({
           const isParamVariadic = paramDetails.params[paramIndex].param.category === 1 && (0, types_1.isVariadicTypeVar)(paramType);
           if (argList[argIndex].argumentCategory === 1) {
             let isArgCompatibleWithVariadic = false;
-            const argTypeResult = getTypeOfArgument(argList[argIndex]);
+            const argTypeResult = getTypeOfArgument(
+              argList[argIndex],
+              /* inferenceContext */
+              void 0,
+              signatureTracker
+            );
             let listElementType;
             let advanceToNextArg = false;
             if (paramIndex < positionParamLimitIndex) {
@@ -73211,7 +73438,7 @@ var require_typeEvaluator = __commonJS({
           let unpackedDictionaryArgType;
           while (argIndex < argList.length) {
             if (argList[argIndex].argumentCategory === 2) {
-              const argType = getTypeOfArgument(argList[argIndex], (0, typeUtils_1.makeInferenceContext)(paramDetails.unpackedKwargsTypedDictType)).type;
+              const argType = getTypeOfArgument(argList[argIndex], (0, typeUtils_1.makeInferenceContext)(paramDetails.unpackedKwargsTypedDictType), signatureTracker).type;
               if ((0, types_1.isAnyOrUnknown)(argType)) {
                 unpackedDictionaryArgType = argType;
               } else if ((0, types_1.isClassInstance)(argType) && types_1.ClassType.isTypedDictClass(argType)) {
@@ -73394,7 +73621,12 @@ var require_typeEvaluator = __commonJS({
                 }
               } else if (argList[argIndex].argumentCategory === 1) {
                 if (typeResult.type.details.paramSpec) {
-                  const argTypeResult = getTypeOfArgument(argList[argIndex]);
+                  const argTypeResult = getTypeOfArgument(
+                    argList[argIndex],
+                    /* inferenceContext */
+                    void 0,
+                    signatureTracker
+                  );
                   const argType = argTypeResult.type;
                   if (argTypeResult.isIncomplete) {
                     isTypeIncomplete = true;
@@ -73488,7 +73720,12 @@ var require_typeEvaluator = __commonJS({
             if ((0, types_1.isVariadicTypeVar)(paramType) && !paramType.isVariadicInUnion) {
               const tupleTypeArgs = variadicArgs.map((argParam) => {
                 var _a2;
-                const argType = getTypeOfArgument(argParam.argument).type;
+                const argType = getTypeOfArgument(
+                  argParam.argument,
+                  /* inferenceContext */
+                  void 0,
+                  signatureTracker
+                ).type;
                 const containsVariadicTypeVar = (0, types_1.isUnpackedVariadicTypeVar)(argType) || (0, types_1.isClassInstance)(argType) && (0, typeUtils_1.isTupleClass)(argType) && argType.tupleTypeArguments && argType.tupleTypeArguments.length === 1 && (0, types_1.isUnpackedVariadicTypeVar)(argType.tupleTypeArguments[0].type);
                 if (containsVariadicTypeVar && argParam.argument.argumentCategory !== 1 && !argParam.mapsToVarArgList) {
                   if (!isDiagnosticSuppressedForNode(errorNode) && !isTypeIncomplete) {
@@ -73551,12 +73788,14 @@ var require_typeEvaluator = __commonJS({
           argumentMatchScore: 0
         };
       }
-      function validateFunctionArgumentTypesWithContext(errorNode, matchResults, typeVarContext, skipUnknownArgCheck = false, inferenceContext) {
-        var _a, _b;
+      function validateFunctionArgumentTypesWithContext(errorNode, matchResults, typeVarContext, skipUnknownArgCheck = false, inferenceContext, signatureTracker) {
+        var _a;
         const type = matchResults.overload;
-        const signatureTracker = (_a = inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.signatureTracker) !== null && _a !== void 0 ? _a : new typeUtils_1.UniqueSignatureTracker();
+        if (!signatureTracker) {
+          signatureTracker = 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())) {
+        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, signatureTracker, skipUnknownArgCheck);
         }
         const effectiveReturnType = getFunctionEffectiveReturnType(type);
@@ -73649,7 +73888,7 @@ var require_typeEvaluator = __commonJS({
         }
         return validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, signatureTracker, skipUnknownArgCheck);
       }
-      function validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, signatureTracker, skipUnknownArgCheck = false) {
+      function validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, signatureTracker, skipUnknownArgCheck) {
         const type = matchResults.overload;
         let isTypeIncomplete = matchResults.isTypeIncomplete;
         let argumentErrors = false;
@@ -73788,7 +74027,7 @@ var require_typeEvaluator = __commonJS({
         if ((0, types_1.isFunction)(returnType) || (0, types_1.isOverloadedFunction)(returnType)) {
           eliminateUnsolvedInUnions = false;
         }
-        const unknownIfNotFound = !ParseTreeUtils.getTypeVarScopesForNode(errorNode).some((typeVarScope) => typeVarContext.hasSolveForScope(typeVarScope)) && !type.details.rescopedTypeParameters;
+        const unknownIfNotFound = !ParseTreeUtils.getTypeVarScopesForNode(errorNode).some((typeVarScope) => typeVarContext.hasSolveForScope(typeVarScope));
         let specializedReturnType = (0, typeUtils_1.applySolvedTypeVars)(returnType, typeVarContext, {
           unknownIfNotFound,
           unknownExemptTypeVars: getUnknownExemptTypeVarsForReturnType(type, returnType),
@@ -73867,11 +74106,12 @@ var require_typeEvaluator = __commonJS({
         }
         return returnType;
       }
-      function validateFunctionArguments(errorNode, argList, typeResult, typeVarContext, skipUnknownArgCheck = false, inferenceContext) {
-        var _a;
-        const signatureTracker = (_a = inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.signatureTracker) !== null && _a !== void 0 ? _a : new typeUtils_1.UniqueSignatureTracker();
+      function validateFunctionArguments(errorNode, argList, typeResult, typeVarContext, skipUnknownArgCheck = false, inferenceContext, signatureTracker) {
+        if (!signatureTracker) {
+          signatureTracker = new typeUtils_1.UniqueSignatureTracker();
+        }
         typeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(typeResult.type, signatureTracker, errorNode.start);
-        const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, typeResult, 0);
+        const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, typeResult, 0, signatureTracker);
         if (matchResults.argumentErrors) {
           argList.forEach((arg) => {
             if (arg.valueExpression && !isSpeculativeModeInUse(arg.valueExpression)) {
@@ -73884,7 +74124,7 @@ var require_typeEvaluator = __commonJS({
             overloadsUsedForCall: []
           };
         }
-        return validateFunctionArgumentTypesWithContext(errorNode, matchResults, typeVarContext, skipUnknownArgCheck, (0, typeUtils_1.makeInferenceContext)(inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.expectedType, inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.isTypeIncomplete, signatureTracker));
+        return validateFunctionArgumentTypesWithContext(errorNode, matchResults, typeVarContext, skipUnknownArgCheck, (0, typeUtils_1.makeInferenceContext)(inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.expectedType, inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.isTypeIncomplete), signatureTracker);
       }
       function validateFunctionArgumentsForParamSpec(errorNode, argList, paramSpec, destTypeVarContext, signatureTracker) {
         const signatureContexts = destTypeVarContext.getSignatureContexts();
@@ -73914,7 +74154,7 @@ var require_typeEvaluator = __commonJS({
         if (!paramSpecType) {
           paramSpecType = (0, typeUtils_1.convertTypeToParamSpecValue)(paramSpec);
         }
-        const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, { type: paramSpecType }, 0);
+        const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, { type: paramSpecType }, 0, signatureTracker);
         const functionType = matchResults.overload;
         const srcTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeIds)(paramSpecType));
         if (matchResults.argumentErrors) {
@@ -73931,7 +74171,12 @@ var require_typeEvaluator = __commonJS({
           let argumentErrors = false;
           let argErrorNode;
           for (const arg of argList) {
-            const argType = (_a = getTypeOfArgument(arg)) === null || _a === void 0 ? void 0 : _a.type;
+            const argType = (_a = getTypeOfArgument(
+              arg,
+              /* inferenceContext */
+              void 0,
+              signatureTracker
+            )) === null || _a === void 0 ? void 0 : _a.type;
             const isArgTypeCompatible = argType && ((0, types_1.isTypeSame)(argType, paramSpec, { ignoreTypeFlags: true }) || (0, types_1.isAnyOrUnknown)(argType));
             if (arg.argumentCategory === 1 && !sawArgs && isArgTypeCompatible) {
               sawArgs = true;
@@ -73952,7 +74197,14 @@ var require_typeEvaluator = __commonJS({
           }
           return { argumentErrors, typeVarContexts: [srcTypeVarContext] };
         }
-        const result = validateFunctionArgumentTypes(errorNode, matchResults, srcTypeVarContext, signatureTracker);
+        const result = validateFunctionArgumentTypes(
+          errorNode,
+          matchResults,
+          srcTypeVarContext,
+          signatureTracker,
+          /* skipUnknownArgCheck */
+          void 0
+        );
         return { argumentErrors: !!result.argumentErrors, typeVarContexts: [srcTypeVarContext] };
       }
       function validateArgType(argParam, typeVarContext, signatureTracker, typeResult, options) {
@@ -73992,8 +74244,8 @@ var require_typeEvaluator = __commonJS({
           if (argParam.argType) {
             argType = argParam.argType;
           } else {
-            const flags = argParam.isinstanceParam ? 512 | 8 | 32 | 64 | 16 : 2 | 16;
-            const exprTypeResult = getTypeOfExpression(argParam.argument.valueExpression, flags, (0, typeUtils_1.makeInferenceContext)(expectedType, !!(typeResult === null || typeResult === void 0 ? void 0 : typeResult.isIncomplete), signatureTracker));
+            const flags = argParam.isinstanceParam ? 512 | 8 | 32 | 64 | 16 | 2 : 2 | 16;
+            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, argParam.argument.valueExpression.start);
             if (exprTypeResult.isIncomplete) {
@@ -74029,7 +74281,12 @@ var require_typeEvaluator = __commonJS({
           if (argParam.argType) {
             argType = argParam.argType;
           } else {
-            const argTypeResult = getTypeOfArgument(argParam.argument);
+            const argTypeResult = getTypeOfArgument(
+              argParam.argument,
+              /* inferenceContext */
+              void 0,
+              signatureTracker
+            );
             argType = argTypeResult.type;
             if (argTypeResult.isIncomplete) {
               isTypeIncomplete = true;
@@ -74434,11 +74691,12 @@ var require_typeEvaluator = __commonJS({
       function getParamSpecDefaultType(node, isPep695Syntax) {
         const functionType = types_1.FunctionType.createSynthesizedInstance(
           "",
-          32768 | 65536
+          65536
           /* FunctionTypeFlags.ParamSpecValue */
         );
         if (node.nodeType === 18) {
           types_1.FunctionType.addDefaultParameters(functionType);
+          functionType.details.flags |= 32768;
           return functionType;
         }
         if (node.nodeType === 31) {
@@ -74689,12 +74947,24 @@ var require_typeEvaluator = __commonJS({
       }
       function createClassFromMetaclass(errorNode, argList, metaclass) {
         const fileInfo = AnalyzerNodeInfo.getFileInfo(errorNode);
-        const arg0Type = getTypeOfArgument(argList[0]).type;
+        const arg0Type = getTypeOfArgument(
+          argList[0],
+          /* inferenceContext */
+          void 0,
+          /* signatureTracker */
+          void 0
+        ).type;
         if (!(0, types_1.isClassInstance)(arg0Type) || !types_1.ClassType.isBuiltIn(arg0Type, "str")) {
           return void 0;
         }
         const className = arg0Type.literalValue || "_";
-        const arg1Type = getTypeOfArgument(argList[1]).type;
+        const arg1Type = getTypeOfArgument(
+          argList[1],
+          /* inferenceContext */
+          void 0,
+          /* signatureTracker */
+          void 0
+        ).type;
         if (!(0, types_1.isClassInstance)(arg1Type) || !(0, typeUtils_1.isTupleClass)(arg1Type) || arg1Type.tupleTypeArguments === void 0) {
           return void 0;
         }
@@ -74762,7 +75032,9 @@ var require_typeEvaluator = __commonJS({
                 void 0,
                 /* skipUnknownArgCheck */
                 true,
-                inferenceContext
+                inferenceContext,
+                /* signatureTracker */
+                void 0
               );
             });
             if (callResult.argumentErrors && inferenceContext) {
@@ -74775,7 +75047,11 @@ var require_typeEvaluator = __commonJS({
                   /* typeVarContext */
                   void 0,
                   /* skipUnknownArgCheck */
-                  true
+                  true,
+                  /* inferenceContext */
+                  void 0,
+                  /* signatureTracker */
+                  void 0
                 );
               });
             }
@@ -74830,7 +75106,7 @@ var require_typeEvaluator = __commonJS({
                 return;
               }
               const subtypeResult = useSpeculativeMode(node, () => {
-                return getTypeOfDictionaryWithContext(node, (0, typeUtils_1.makeInferenceContext)(subtype));
+                return getTypeOfDictionaryWithContext(node, flags, (0, typeUtils_1.makeInferenceContext)(subtype));
               });
               if (subtypeResult && assignType(subtype, subtypeResult.type)) {
                 if (!matchingSubtypeResult || matchingSubtypeResult.typeErrors && !subtypeResult.typeErrors) {
@@ -74847,19 +75123,20 @@ var require_typeEvaluator = __commonJS({
         let expectedTypeDiagAddendum = void 0;
         if (effectiveExpectedType) {
           expectedTypeDiagAddendum = new diagnostic_1.DiagnosticAddendum();
-          const result2 = getTypeOfDictionaryWithContext(node, (0, typeUtils_1.makeInferenceContext)(effectiveExpectedType), expectedTypeDiagAddendum);
+          const result2 = getTypeOfDictionaryWithContext(node, flags, (0, typeUtils_1.makeInferenceContext)(effectiveExpectedType), expectedTypeDiagAddendum);
           if (result2) {
             return result2;
           }
         }
         const result = getTypeOfDictionaryInferred(
           node,
+          flags,
           /* hasExpectedType */
           !!inferenceContext
         );
         return { ...result, expectedTypeDiagAddendum };
       }
-      function getTypeOfDictionaryWithContext(node, inferenceContext, expectedDiagAddendum) {
+      function getTypeOfDictionaryWithContext(node, flags, inferenceContext, expectedDiagAddendum) {
         inferenceContext.expectedType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(inferenceContext.expectedType);
         let concreteExpectedType = makeTopLevelTypeVarsConcrete(inferenceContext.expectedType);
         if (!(0, types_1.isClassInstance)(concreteExpectedType)) {
@@ -74874,6 +75151,7 @@ var require_typeEvaluator = __commonJS({
           const expectedTypedDictEntries = (0, typedDicts_1.getTypedDictMembersForClass)(evaluatorInterface, concreteExpectedType);
           const keyValueTypeResult = getKeyAndValueTypesFromDictionary(
             node,
+            flags,
             keyTypes,
             valueTypes,
             /* forceStrictInference */
@@ -74942,6 +75220,7 @@ var require_typeEvaluator = __commonJS({
         }
         const keyValueResult = getKeyAndValueTypesFromDictionary(
           node,
+          flags,
           keyTypes,
           valueTypes,
           /* forceStrictInference */
@@ -74971,7 +75250,7 @@ var require_typeEvaluator = __commonJS({
         const type = getBuiltInObject(node, "dict", [specializedKeyType, specializedValueType]);
         return { type, isIncomplete, typeErrors };
       }
-      function getTypeOfDictionaryInferred(node, hasExpectedType) {
+      function getTypeOfDictionaryInferred(node, flags, hasExpectedType) {
         const fallbackType = hasExpectedType ? types_1.AnyType.create() : types_1.UnknownType.create();
         let keyType = fallbackType;
         let valueType = fallbackType;
@@ -74982,6 +75261,7 @@ var require_typeEvaluator = __commonJS({
         let typeErrors = false;
         const keyValueResult = getKeyAndValueTypesFromDictionary(
           node,
+          flags,
           keyTypeResults,
           valueTypeResults,
           /* forceStrictInference */
@@ -75027,19 +75307,15 @@ var require_typeEvaluator = __commonJS({
         }
         return { type, isIncomplete, typeErrors };
       }
-      function getKeyAndValueTypesFromDictionary(node, keyTypes, valueTypes, forceStrictInference, isValueTypeInvariant, expectedKeyType, expectedValueType, expectedTypedDictEntries, expectedDiagAddendum) {
+      function getKeyAndValueTypesFromDictionary(node, flags, keyTypes, valueTypes, forceStrictInference, isValueTypeInvariant, expectedKeyType, expectedValueType, expectedTypedDictEntries, expectedDiagAddendum) {
         let isIncomplete = false;
         let typeErrors = false;
+        const keyFlags = flags & ~(256 | 8 | 128);
         node.entries.forEach((entryNode, index) => {
           var _a, _b, _c, _d;
           let addUnknown = true;
           if (entryNode.nodeType === 17) {
-            const keyTypeResult = getTypeOfExpression(
-              entryNode.keyExpression,
-              /* flags */
-              void 0,
-              (0, typeUtils_1.makeInferenceContext)(expectedKeyType !== null && expectedKeyType !== void 0 ? expectedKeyType : forceStrictInference ? types_1.NeverType.createNever() : void 0)
-            );
+            const keyTypeResult = getTypeOfExpression(entryNode.keyExpression, keyFlags | 268435456, (0, typeUtils_1.makeInferenceContext)(expectedKeyType !== null && expectedKeyType !== void 0 ? expectedKeyType : forceStrictInference ? types_1.NeverType.createNever() : void 0));
             if (keyTypeResult.isIncomplete) {
               isIncomplete = true;
             }
@@ -75063,21 +75339,11 @@ var require_typeEvaluator = __commonJS({
             if (expectedTypedDictEntries && (0, types_1.isClassInstance)(keyType) && types_1.ClassType.isBuiltIn(keyType, "str") && (0, typeUtils_1.isLiteralType)(keyType) && expectedTypedDictEntries.knownItems.has(keyType.literalValue)) {
               const effectiveValueType = expectedTypedDictEntries.knownItems.get(keyType.literalValue).valueType;
               entryInferenceContext = (0, typeUtils_1.makeInferenceContext)(effectiveValueType);
-              valueTypeResult = getTypeOfExpression(
-                entryNode.valueExpression,
-                /* flags */
-                void 0,
-                entryInferenceContext
-              );
+              valueTypeResult = getTypeOfExpression(entryNode.valueExpression, flags | 268435456, 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,
-                entryInferenceContext
-              );
+              valueTypeResult = getTypeOfExpression(entryNode.valueExpression, flags | 268435456, entryInferenceContext);
             }
             if (entryInferenceContext && !valueTypeResult.typeErrors) {
               const fromExpectedType = inferTypeArgFromExpectedEntryType(entryInferenceContext, [valueTypeResult.type], !isValueTypeInvariant);
@@ -75120,12 +75386,7 @@ var require_typeEvaluator = __commonJS({
               }
             }
             const entryInferenceContext = (0, typeUtils_1.makeInferenceContext)(expectedType);
-            let unexpandedTypeResult = getTypeOfExpression(
-              entryNode.expandExpression,
-              /* flags */
-              void 0,
-              entryInferenceContext
-            );
+            let unexpandedTypeResult = getTypeOfExpression(entryNode.expandExpression, flags | 268435456, entryInferenceContext);
             if (entryInferenceContext && !unexpandedTypeResult.typeErrors) {
               const fromExpectedType = inferTypeArgFromExpectedEntryType(entryInferenceContext, [unexpandedTypeResult.type], !isValueTypeInvariant);
               if (fromExpectedType) {
@@ -75196,7 +75457,7 @@ var require_typeEvaluator = __commonJS({
               }
             }
           } else if (entryNode.nodeType === 32) {
-            const dictEntryTypeResult = getElementTypeFromListComprehension(entryNode, expectedValueType, expectedKeyType);
+            const dictEntryTypeResult = getElementTypeFromListComprehension(entryNode, flags, expectedValueType, expectedKeyType);
             const dictEntryType = dictEntryTypeResult.type;
             if (dictEntryTypeResult.isIncomplete) {
               isIncomplete = true;
@@ -75231,6 +75492,7 @@ var require_typeEvaluator = __commonJS({
           diag.addMessage(localize_1.LocAddendum.useListInstead());
           addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.listInAnnotation() + diag.getString(), node);
         }
+        flags &= ~(256 | 8 | 128);
         let effectiveExpectedType = inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.expectedType;
         if (inferenceContext && (0, types_1.isUnion)(inferenceContext.expectedType)) {
           let matchingSubtype;
@@ -75242,7 +75504,7 @@ var require_typeEvaluator = __commonJS({
                 return;
               }
               const subtypeResult = useSpeculativeMode(node, () => {
-                return getTypeOfListOrSetWithContext(node, (0, typeUtils_1.makeInferenceContext)(subtype));
+                return getTypeOfListOrSetWithContext(node, flags, (0, typeUtils_1.makeInferenceContext)(subtype));
               });
               if (subtypeResult && assignType(subtype, subtypeResult.type)) {
                 if (!matchingSubtypeResult || matchingSubtypeResult.typeErrors && !subtypeResult.typeErrors) {
@@ -75258,7 +75520,7 @@ var require_typeEvaluator = __commonJS({
         }
         let expectedTypeDiagAddendum;
         if (effectiveExpectedType) {
-          const result = getTypeOfListOrSetWithContext(node, (0, typeUtils_1.makeInferenceContext)(effectiveExpectedType));
+          const result = getTypeOfListOrSetWithContext(node, flags, (0, typeUtils_1.makeInferenceContext)(effectiveExpectedType));
           if (result && !result.typeErrors) {
             return result;
           }
@@ -75266,12 +75528,13 @@ var require_typeEvaluator = __commonJS({
         }
         const typeResult = getTypeOfListOrSetInferred(
           node,
+          flags,
           /* hasExpectedType */
           inferenceContext !== void 0
         );
         return { ...typeResult, expectedTypeDiagAddendum };
       }
-      function getTypeOfListOrSetWithContext(node, inferenceContext) {
+      function getTypeOfListOrSetWithContext(node, flags, inferenceContext) {
         const builtInClassName = node.nodeType === 31 ? "list" : "set";
         inferenceContext.expectedType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(inferenceContext.expectedType);
         let isIncomplete = false;
@@ -75286,14 +75549,9 @@ var require_typeEvaluator = __commonJS({
         node.entries.forEach((entry) => {
           let entryTypeResult;
           if (entry.nodeType === 32) {
-            entryTypeResult = getElementTypeFromListComprehension(entry, expectedEntryType);
+            entryTypeResult = getElementTypeFromListComprehension(entry, flags, expectedEntryType);
           } else {
-            entryTypeResult = getTypeOfExpression(
-              entry,
-              /* flags */
-              void 0,
-              (0, typeUtils_1.makeInferenceContext)(expectedEntryType)
-            );
+            entryTypeResult = getTypeOfExpression(entry, flags | 268435456, (0, typeUtils_1.makeInferenceContext)(expectedEntryType));
           }
           entryTypes.push(entryTypeResult.type);
           if (entryTypeResult.isIncomplete) {
@@ -75354,7 +75612,7 @@ var require_typeEvaluator = __commonJS({
         }
         return specializedListOrSet.typeArguments[0];
       }
-      function getTypeOfListOrSetInferred(node, hasExpectedType) {
+      function getTypeOfListOrSetInferred(node, flags, hasExpectedType) {
         const builtInClassName = node.nodeType === 31 ? "list" : "set";
         const verifyHashable = node.nodeType === 45;
         let isEmptyContainer = false;
@@ -75364,9 +75622,13 @@ var require_typeEvaluator = __commonJS({
         node.entries.forEach((entry, index) => {
           let entryTypeResult;
           if (entry.nodeType === 32 && !entry.isGenerator) {
-            entryTypeResult = getElementTypeFromListComprehension(entry);
+            entryTypeResult = getElementTypeFromListComprehension(entry, flags);
           } else {
-            entryTypeResult = getTypeOfExpression(entry);
+            entryTypeResult = getTypeOfExpression(
+              entry,
+              flags | 268435456
+              /* EvaluatorFlags.StripLiteralTypeForTuple */
+            );
           }
           if (entryTypeResult.isIncomplete) {
             isIncomplete = true;
@@ -75685,7 +75947,7 @@ var require_typeEvaluator = __commonJS({
         }
         return { type: functionType, isIncomplete, typeErrors };
       }
-      function getTypeOfListComprehension(node, inferenceContext) {
+      function getTypeOfListComprehension(node, flags, inferenceContext) {
         let isIncomplete = false;
         let typeErrors = false;
         let isAsync = node.forIfNodes.some((comp, index) => {
@@ -75700,7 +75962,7 @@ var require_typeEvaluator = __commonJS({
         }
         const builtInIteratorType = getTypingType(node, isAsync ? "AsyncGenerator" : "Generator");
         const expectedEntryType = getExpectedEntryTypeForIterable(node, builtInIteratorType, inferenceContext);
-        const elementTypeResult = getElementTypeFromListComprehension(node, expectedEntryType);
+        const elementTypeResult = getElementTypeFromListComprehension(node, flags, expectedEntryType);
         if (elementTypeResult.isIncomplete) {
           isIncomplete = true;
         }
@@ -75763,7 +76025,7 @@ var require_typeEvaluator = __commonJS({
         }
         return isIncomplete;
       }
-      function getElementTypeFromListComprehension(node, expectedValueOrElementType, expectedKeyType) {
+      function getElementTypeFromListComprehension(node, flags, expectedValueOrElementType, expectedKeyType) {
         let isIncomplete = false;
         let typeErrors = false;
         for (const forIfNode of node.forIfNodes) {
@@ -75773,12 +76035,7 @@ var require_typeEvaluator = __commonJS({
         }
         let type = types_1.UnknownType.create();
         if (node.expression.nodeType === 17) {
-          const keyTypeResult = getTypeOfExpression(
-            node.expression.keyExpression,
-            /* flags */
-            void 0,
-            (0, typeUtils_1.makeInferenceContext)(expectedKeyType)
-          );
+          const keyTypeResult = getTypeOfExpression(node.expression.keyExpression, flags | 268435456, (0, typeUtils_1.makeInferenceContext)(expectedKeyType));
           if (keyTypeResult.isIncomplete) {
             isIncomplete = true;
           }
@@ -75789,12 +76046,7 @@ var require_typeEvaluator = __commonJS({
           if (!expectedKeyType || !(0, typeUtils_1.containsLiteralType)(expectedKeyType)) {
             keyType = stripLiteralValue(keyType);
           }
-          const valueTypeResult = getTypeOfExpression(
-            node.expression.valueExpression,
-            /* flags */
-            void 0,
-            (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType)
-          );
+          const valueTypeResult = getTypeOfExpression(node.expression.valueExpression, flags | 268435456, (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType));
           if (valueTypeResult.isIncomplete) {
             isIncomplete = true;
           }
@@ -75810,19 +76062,9 @@ var require_typeEvaluator = __commonJS({
             { type: valueType, isUnbounded: false }
           ]);
         } else if (node.expression.nodeType === 16) {
-          getTypeOfExpression(
-            node.expression.expandExpression,
-            /* flags */
-            void 0,
-            (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType)
-          );
+          getTypeOfExpression(node.expression.expandExpression, flags | 268435456, (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType));
         } else if ((0, parseNodes_1.isExpressionNode)(node)) {
-          const exprTypeResult = getTypeOfExpression(
-            node.expression,
-            /* flags */
-            void 0,
-            (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType)
-          );
+          const exprTypeResult = getTypeOfExpression(node.expression, flags | 268435456, (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType));
           if (exprTypeResult.isIncomplete) {
             isIncomplete = true;
           }
@@ -76121,7 +76363,11 @@ var require_typeEvaluator = __commonJS({
           }
           literalTypes.push(type);
         }
-        return (0, types_1.combineTypes)(literalTypes);
+        let result = (0, types_1.combineTypes)(literalTypes);
+        if ((0, types_1.isUnion)(result) && unionClassType && (0, types_1.isInstantiableClass)(unionClassType)) {
+          result = types_1.TypeBase.cloneAsSpecialForm(result, types_1.ClassType.cloneAsInstance(unionClassType));
+        }
+        return result;
       }
       function createClassVarType(classType, errorNode, typeArgs, flags) {
         var _a;
@@ -76793,7 +77039,7 @@ var require_typeEvaluator = __commonJS({
         return void 0;
       }
       function evaluateTypesForAssignmentStatement(node) {
-        var _a, _b;
+        var _a;
         const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
         if (isTypeCached(node)) {
           return;
@@ -76894,17 +77140,6 @@ var require_typeEvaluator = __commonJS({
               }
             }
             rightHandType = srcType;
-            let targetName;
-            if (node.leftExpression.nodeType === 38) {
-              targetName = node.leftExpression;
-            } else if (node.leftExpression.nodeType === 54 && node.leftExpression.valueExpression.nodeType === 38) {
-              targetName = node.leftExpression.valueExpression;
-            }
-            if (targetName) {
-              rightHandType = (_a = (0, enums_1.transformTypeForPossibleEnumClass)(evaluatorInterface, node, targetName, () => {
-                return { assignedType: rightHandType };
-              })) !== null && _a !== void 0 ? _a : rightHandType;
-            }
             if (typeAliasNameNode) {
               if (!isSpeculativeTypeAlias || isLegalImplicitTypeAliasType(rightHandType)) {
                 rightHandType = transformTypeForTypeAlias(
@@ -76924,7 +77159,7 @@ var require_typeEvaluator = __commonJS({
                   rightHandType = types_1.UnknownType.create();
                 }
                 typeAliasTypeVar.details.boundType = rightHandType;
-                typeAliasTypeVar.details.recursiveTypeParameters = (_b = rightHandType.typeAliasInfo) === null || _b === void 0 ? void 0 : _b.typeParameters;
+                typeAliasTypeVar.details.recursiveTypeParameters = (_a = rightHandType.typeAliasInfo) === null || _a === void 0 ? void 0 : _a.typeParameters;
               }
             }
           }
@@ -77783,12 +78018,15 @@ var require_typeEvaluator = __commonJS({
         const errorNode = argList.length > 0 ? (_b = (_a = argList[0].node) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : node.name : node.name;
         let newMethodMember;
         if (classType.details.effectiveMetaclass && (0, types_1.isClass)(classType.details.effectiveMetaclass)) {
-          newMethodMember = (0, typeUtils_1.lookUpClassMember)(
-            classType.details.effectiveMetaclass,
-            "__new__",
-            8
-            /* MemberAccessFlags.SkipTypeBaseClass */
-          );
+          const metaclassCallsInitSubclass = types_1.ClassType.isBuiltIn(classType.details.effectiveMetaclass, ["ABCMeta", "type"]) && !types_1.ClassType.isTypedDictClass(classType);
+          if (!metaclassCallsInitSubclass) {
+            newMethodMember = (0, typeUtils_1.lookUpClassMember)(
+              classType.details.effectiveMetaclass,
+              "__new__",
+              8
+              /* MemberAccessFlags.SkipTypeBaseClass */
+            );
+          }
         }
         if (newMethodMember) {
           const newMethodType = getTypeOfMember(newMethodMember);
@@ -77859,7 +78097,9 @@ var require_typeEvaluator = __commonJS({
                 void 0,
                 /* skipUnknownArgCheck */
                 false,
-                (0, typeUtils_1.makeInferenceContext)(getNoneType())
+                (0, typeUtils_1.makeInferenceContext)(getNoneType()),
+                /* signatureTracker */
+                void 0
               );
               if (callResult.argumentErrors) {
                 const diag = addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.initSubclassCallFailed(), node.name);
@@ -77881,7 +78121,6 @@ var require_typeEvaluator = __commonJS({
         });
       }
       function getTypeOfFunction(node) {
-        var _a;
         initializedBasicTypes(node);
         let functionType = readTypeCache(
           node.name,
@@ -77934,9 +78173,6 @@ var require_typeEvaluator = __commonJS({
             decoratedType = newDecoratedType;
           }
         }
-        decoratedType = (_a = (0, enums_1.transformTypeForPossibleEnumClass)(evaluatorInterface, node, node.name, () => {
-          return { assignedType: decoratedType };
-        })) !== null && _a !== void 0 ? _a : decoratedType;
         if ((0, types_1.isFunction)(decoratedType)) {
           decoratedType.details.deprecatedMessage = functionType.details.deprecatedMessage;
           if (types_1.FunctionType.isOverloaded(decoratedType)) {
@@ -78200,6 +78436,10 @@ var require_typeEvaluator = __commonJS({
             functionType.details.flags |= 32768;
           }
         }
+        const variadicsWithAnyType = functionType.details.parameters.filter((param) => param.category !== 0 && param.name && (0, types_1.isAnyOrUnknown)(param.type));
+        if (variadicsWithAnyType.length >= 2) {
+          functionType.details.flags |= 32768;
+        }
         const returnTypeAnnotationNode = (_b = node.returnTypeAnnotation) !== null && _b !== void 0 ? _b : (_c = node.functionAnnotationComment) === null || _c === void 0 ? void 0 : _c.returnTypeAnnotation;
         if (returnTypeAnnotationNode) {
           functionType.details.declaredReturnType = types_1.UnknownType.create();
@@ -78217,7 +78457,7 @@ var require_typeEvaluator = __commonJS({
           }
         }
         if (functionType.details.declaredReturnType && returnTypeAnnotationNode) {
-          rescopeTypeVarsForCallableReturnType(functionType.details.declaredReturnType, functionType, typeParametersSeen);
+          (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParametersSeen, (0, typeUtils_1.getTypeVarArgumentsRecursive)(functionType.details.declaredReturnType), functionType.details.typeVarScopeId);
         }
         if (fileInfo.isStubFile || ParseTreeUtils.isSuiteEmpty(node.suite)) {
           if (functionType.details.declaredReturnType && (0, types_1.isClassInstance)(functionType.details.declaredReturnType) && types_1.ClassType.isBuiltIn(functionType.details.declaredReturnType, [
@@ -78259,25 +78499,6 @@ var require_typeEvaluator = __commonJS({
           }
         }
       }
-      function rescopeTypeVarsForCallableReturnType(returnType, functionType, typeParametersSeen) {
-        const typeVarsInReturnType = (0, typeUtils_1.getTypeVarArgumentsRecursive)(returnType).filter((t) => t.scopeId === functionType.details.typeVarScopeId);
-        const rescopedTypeVars = [];
-        typeVarsInReturnType.forEach((typeVar) => {
-          if (types_1.TypeBase.isInstantiable(typeVar)) {
-            typeVar = types_1.TypeVarType.cloneAsInstance(typeVar);
-          }
-          if (typeParametersSeen.some((tp) => (0, types_1.isTypeSame)((0, typeUtils_1.convertToInstance)(tp), typeVar))) {
-            return;
-          }
-          if ((0, typeUtils_1.isTypeVarLimitedToCallable)(returnType, typeVar)) {
-            rescopedTypeVars.push(typeVar);
-          }
-        });
-        (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParametersSeen, typeVarsInReturnType);
-        if (rescopedTypeVars.length > 0) {
-          functionType.details.rescopedTypeParameters = rescopedTypeVars;
-        }
-      }
       function adjustParameterAnnotatedType(param, type) {
         var _a;
         if (((_a = param.defaultValue) === null || _a === void 0 ? void 0 : _a.nodeType) === 11 && param.defaultValue.constType === 26 && !(0, typeUtils_1.isOptionalType)(type) && !AnalyzerNodeInfo.getFileInfo(param).diagnosticRuleSet.strictParameterNoneValue) {
@@ -79906,19 +80127,26 @@ var require_typeEvaluator = __commonJS({
         const specializedClass = types_1.ClassType.cloneForSpecialization(classType, typeArgTypes, typeArgs !== void 0);
         return { type: specializedClass };
       }
-      function getTypeOfArgument(arg, inferenceContext) {
+      function getTypeOfArgument(arg, inferenceContext, signatureTracker) {
+        var _a, _b;
         if (arg.typeResult) {
-          return { type: arg.typeResult.type, isIncomplete: arg.typeResult.isIncomplete };
+          const type = (_b = (_a = arg.typeResult.type) === null || _a === void 0 ? void 0 : _a.specialForm) !== null && _b !== void 0 ? _b : arg.typeResult.type;
+          return { type, isIncomplete: arg.typeResult.isIncomplete };
         }
         if (!arg.valueExpression) {
           return { type: types_1.UnknownType.create() };
         }
-        return getTypeOfExpression(
+        const typeResult = getTypeOfExpression(
           arg.valueExpression,
           /* flags */
           void 0,
-          inferenceContext
+          inferenceContext,
+          signatureTracker
         );
+        if (signatureTracker) {
+          typeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(typeResult.type, signatureTracker, arg.valueExpression.start);
+        }
+        return typeResult;
       }
       function getTypeOfArgumentExpectingType(arg, options) {
         if (arg.typeResult) {
@@ -80292,7 +80520,7 @@ var require_typeEvaluator = __commonJS({
         return declarations;
       }
       function getTypeForDeclaration(declaration) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         switch (declaration.type) {
           case 0: {
             if (declaration.intrinsicType === "Any") {
@@ -80399,22 +80627,6 @@ var require_typeEvaluator = __commonJS({
                 });
               }
               if (declaredType) {
-                if (declaration.node.nodeType === 38) {
-                  const variableNode = (_c = ParseTreeUtils.getParentNodeOfType(
-                    declaration.node,
-                    3
-                    /* ParseNodeType.Assignment */
-                  )) !== null && _c !== void 0 ? _c : ParseTreeUtils.getParentNodeOfType(
-                    declaration.node,
-                    54
-                    /* ParseNodeType.TypeAnnotation */
-                  );
-                  if (variableNode) {
-                    declaredType = (_d = (0, enums_1.transformTypeForPossibleEnumClass)(evaluatorInterface, variableNode, declaration.node, () => {
-                      return { declaredType };
-                    })) !== null && _d !== void 0 ? _d : declaredType;
-                  }
-                }
                 if ((0, types_1.isClassInstance)(declaredType) && types_1.ClassType.isBuiltIn(declaredType, "TypeAlias")) {
                   return { type: void 0, isTypeAlias: true };
                 }
@@ -80566,7 +80778,7 @@ var require_typeEvaluator = __commonJS({
         return typeVar;
       }
       function getInferredTypeOfDeclaration(symbol, decl) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const resolvedDecl = resolveAliasDeclaration(
           decl,
           /* resolveLocalNames */
@@ -80669,32 +80881,6 @@ var require_typeEvaluator = __commonJS({
           let inferredType = (_c = evaluateTypeForSubnode(resolvedDecl.node, () => {
             evaluateTypesForStatement(typeSource);
           })) === null || _c === void 0 ? void 0 : _c.type;
-          if (inferredType && resolvedDecl.node.nodeType === 38) {
-            const variableNode = (_d = ParseTreeUtils.getParentNodeOfType(
-              resolvedDecl.node,
-              3
-              /* ParseNodeType.Assignment */
-            )) !== null && _d !== void 0 ? _d : ParseTreeUtils.getParentNodeOfType(
-              resolvedDecl.node,
-              54
-              /* ParseNodeType.TypeAnnotation */
-            );
-            if (variableNode) {
-              const enumMemberType = (0, enums_1.transformTypeForPossibleEnumClass)(evaluatorInterface, variableNode, resolvedDecl.node, () => {
-                var _a2, _b2;
-                (0, debug_1.assert)(resolvedDecl.inferredTypeSource !== void 0);
-                const inferredTypeSource = resolvedDecl.inferredTypeSource;
-                return {
-                  assignedType: (_b2 = (_a2 = evaluateTypeForSubnode(inferredTypeSource, () => {
-                    evaluateTypesForStatement(inferredTypeSource);
-                  })) === null || _a2 === void 0 ? void 0 : _a2.type) !== null && _b2 !== void 0 ? _b2 : types_1.UnknownType.create()
-                };
-              });
-              if (enumMemberType) {
-                inferredType = enumMemberType;
-              }
-            }
-          }
           if (inferredType && isTypeAlias && resolvedDecl.typeAliasName) {
             if (isLegalImplicitTypeAliasType(inferredType)) {
               inferredType = transformTypeForTypeAlias(
@@ -81056,12 +81242,8 @@ var require_typeEvaluator = __commonJS({
           false
         );
         if (specializedReturnType && !(0, types_1.isUnknown)(specializedReturnType)) {
-          return adjustCallableReturnType(
-            type,
-            specializedReturnType,
-            /* liveTypeVarScopes */
-            []
-          );
+          const liveTypeVarScopes = (callSiteInfo === null || callSiteInfo === void 0 ? void 0 : callSiteInfo.errorNode) ? ParseTreeUtils.getTypeVarScopesForNode(callSiteInfo === null || callSiteInfo === void 0 ? void 0 : callSiteInfo.errorNode) : [];
+          return adjustCallableReturnType(type, specializedReturnType, liveTypeVarScopes);
         }
         if (inferTypeIfNeeded) {
           return getFunctionInferredReturnType(type, callSiteInfo);
@@ -81390,22 +81572,24 @@ var require_typeEvaluator = __commonJS({
             return true;
           }
         }
-        const destErrorType = reportErrorsUsingObjType ? types_1.ClassType.cloneAsInstance(destType) : destType;
-        const srcErrorType = reportErrorsUsingObjType ? types_1.ClassType.cloneAsInstance(srcType) : srcType;
-        let destErrorTypeText = printType(destErrorType);
-        let srcErrorTypeText = printType(srcErrorType);
-        if (destErrorTypeText === srcErrorTypeText && destType.details.fullName && srcType.details.fullName) {
-          destErrorTypeText = destType.details.fullName;
-          srcErrorTypeText = srcType.details.fullName;
-        }
-        diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.typeIncompatible().format({
-          sourceType: srcErrorTypeText,
-          destType: destErrorTypeText
-        }));
-        if (types_1.ClassType.isBuiltIn(destType, "bytes")) {
-          const promotions = typePromotions.get(destType.details.fullName);
-          if (promotions && promotions.some((name) => name === srcType.details.fullName)) {
-            diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.bytesTypePromotions());
+        if (diag) {
+          const destErrorType = reportErrorsUsingObjType ? types_1.ClassType.cloneAsInstance(destType) : destType;
+          const srcErrorType = reportErrorsUsingObjType ? types_1.ClassType.cloneAsInstance(srcType) : srcType;
+          let destErrorTypeText = printType(destErrorType);
+          let srcErrorTypeText = printType(srcErrorType);
+          if (destErrorTypeText === srcErrorTypeText && destType.details.fullName && srcType.details.fullName) {
+            destErrorTypeText = destType.details.fullName;
+            srcErrorTypeText = srcType.details.fullName;
+          }
+          diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.typeIncompatible().format({
+            sourceType: srcErrorTypeText,
+            destType: destErrorTypeText
+          }));
+          if (types_1.ClassType.isBuiltIn(destType, "bytes")) {
+            const promotions = typePromotions.get(destType.details.fullName);
+            if (promotions && promotions.some((name) => name === srcType.details.fullName)) {
+              diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.bytesTypePromotions());
+            }
           }
         }
         return false;
@@ -81813,7 +81997,7 @@ var require_typeEvaluator = __commonJS({
         return isCompatible;
       }
       function assignType(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags = 0, recursionCount = 0) {
-        var _a, _b;
+        var _a, _b, _c;
         if (destType === srcType && !(0, typeUtils_1.requiresSpecialization)(destType)) {
           return true;
         }
@@ -82076,7 +82260,14 @@ var require_typeEvaluator = __commonJS({
                 return false;
               }
             }
-            if (!isSpecialFormClass(expandedSrcType, flags) && assignClass(
+            if (types_1.ClassType.isBuiltIn(destType, "type") && ((_c = srcType.instantiableNestingLevel) !== null && _c !== void 0 ? _c : 0) > 0) {
+              return true;
+            }
+            if (isSpecialFormClass(expandedSrcType, flags)) {
+              if (destType.specialForm) {
+                return assignType(destType.specialForm, expandedSrcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
+              }
+            } else if (assignClass(
               destType,
               expandedSrcType,
               diag,
@@ -82830,16 +83021,14 @@ var require_typeEvaluator = __commonJS({
           }
         }
         if (!assignType(specializedSrcType, specializedDestType, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), srcTypeVarContext, destTypeVarContext, flags, recursionCount)) {
-          if (!(0, types_1.isTypeSame)(destType, srcType)) {
-            if (diag && paramIndex !== void 0) {
-              diag.addMessage(localize_1.LocAddendum.paramAssignment().format({
-                index: paramIndex + 1,
-                sourceType: printType(destType),
-                destType: printType(srcType)
-              }));
-            }
-            return false;
+          if (diag && paramIndex !== void 0) {
+            diag.addMessage(localize_1.LocAddendum.paramAssignment().format({
+              index: paramIndex + 1,
+              sourceType: printType(destType),
+              destType: printType(srcType)
+            }));
           }
+          return false;
         }
         return true;
       }
@@ -82856,11 +83045,14 @@ var require_typeEvaluator = __commonJS({
         }
         let srcLastToPackIndex = srcDetails.params.findIndex((p, i) => {
           (0, debug_1.assert)(destDetails.argsIndex !== void 0);
-          return i >= destDetails.argsIndex && p.source === parameterUtils_1.ParameterSource.KeywordOnly;
+          return i >= destDetails.argsIndex && p.kind === parameterUtils_1.ParameterKind.Keyword;
         });
         if (srcLastToPackIndex < 0) {
           srcLastToPackIndex = srcDetails.params.length;
         }
+        if (srcDetails.argsIndex !== void 0 && destDetails.argsIndex > srcDetails.argsIndex) {
+          return;
+        }
         const destFirstNonPositional = (_a = destDetails.firstKeywordOnlyIndex) !== null && _a !== void 0 ? _a : destDetails.params.length;
         const suffixLength = destFirstNonPositional - destDetails.argsIndex - 1;
         const srcPositionalsToPack = srcDetails.params.slice(destDetails.argsIndex, srcLastToPackIndex - suffixLength);
@@ -82896,7 +83088,7 @@ var require_typeEvaluator = __commonJS({
               },
               type: srcPositionalsType,
               index: -1,
-              source: parameterUtils_1.ParameterSource.PositionOnly
+              kind: parameterUtils_1.ParameterKind.Positional
             },
             ...srcDetails.params.slice(destDetails.argsIndex + srcPositionalsToPack.length, srcDetails.params.length)
           ];
@@ -82910,13 +83102,13 @@ var require_typeEvaluator = __commonJS({
             /* ParameterCategory.KwargsDict */
           );
           srcDetails.kwargsIndex = kwargsIndex >= 0 ? kwargsIndex : void 0;
-          const firstKeywordOnlyIndex = srcDetails.params.findIndex((param) => param.source === parameterUtils_1.ParameterSource.KeywordOnly);
+          const firstKeywordOnlyIndex = srcDetails.params.findIndex((param) => param.kind === parameterUtils_1.ParameterKind.Keyword);
           srcDetails.firstKeywordOnlyIndex = firstKeywordOnlyIndex >= 0 ? firstKeywordOnlyIndex : void 0;
-          srcDetails.positionOnlyParamCount = Math.max(0, srcDetails.params.findIndex((p) => p.source !== parameterUtils_1.ParameterSource.PositionOnly || p.param.category !== 0 || p.param.hasDefault));
+          srcDetails.positionOnlyParamCount = Math.max(0, srcDetails.params.findIndex((p) => p.kind !== parameterUtils_1.ParameterKind.Positional || p.param.category !== 0 || p.param.hasDefault));
         }
       }
       function assignFunction(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let canAssign = true;
         const checkReturnType = (flags & 64) === 0;
         const reverseMatching = (flags & 2) !== 0;
@@ -82946,9 +83138,9 @@ var require_typeEvaluator = __commonJS({
           const destParamName = (_c = destParam.param.name) !== null && _c !== void 0 ? _c : "";
           const srcParamName = (_d = srcParam.param.name) !== null && _d !== void 0 ? _d : "";
           if (destParamName) {
-            const isDestPositionalOnly = destParam.source === parameterUtils_1.ParameterSource.PositionOnly;
+            const isDestPositionalOnly = destParam.kind === parameterUtils_1.ParameterKind.Positional;
             if (!isDestPositionalOnly && destParam.param.category !== 1 && srcParam.param.category !== 1) {
-              if (srcParam.source === parameterUtils_1.ParameterSource.PositionOnly) {
+              if (srcParam.kind === parameterUtils_1.ParameterKind.Positional) {
                 diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.LocAddendum.functionParamPositionOnly().format({
                   name: destParamName
                 }));
@@ -82971,10 +83163,17 @@ var require_typeEvaluator = __commonJS({
           if (paramIndex === 0 && srcType.details.name === "__init__" && types_1.FunctionType.isInstanceMethod(srcType) && destType.details.name === "__init__" && types_1.FunctionType.isInstanceMethod(destType) && types_1.FunctionType.isOverloaded(destType) && destParam.param.hasDeclaredType) {
             continue;
           }
-          if (!assignFunctionParameter(destParamType, srcParamType, paramIndex, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
+          if ((0, types_1.isUnpacked)(srcParamType)) {
+            canAssign = false;
+          } else if (!assignFunctionParameter(destParamType, srcParamType, paramIndex, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
             if ((flags & 512) === 0 || !(0, types_1.isTypeVar)(srcParamType) || !srcParamType.details.isSynthesized) {
               canAssign = false;
             }
+          } else if (destParam.kind !== parameterUtils_1.ParameterKind.Positional && srcParam.kind === parameterUtils_1.ParameterKind.Positional && srcParamDetails.kwargsIndex === void 0 && !srcParamDetails.params.some((p) => p.kind === parameterUtils_1.ParameterKind.Keyword && p.param.category === 0 && p.param.name === destParam.param.name)) {
+            diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.namedParamMissingInSource().format({
+              name: (_e = destParam.param.name) !== null && _e !== void 0 ? _e : ""
+            }));
+            canAssign = false;
           }
         }
         if (!types_1.FunctionType.shouldSkipArgsKwargsCompatibilityCheck(destType) && destParamDetails.firstPositionOrKeywordIndex < srcParamDetails.positionOnlyParamCount && !targetIncludesParamSpec) {
@@ -82984,33 +83183,50 @@ var require_typeEvaluator = __commonJS({
           }));
           canAssign = false;
         }
-        if (destPositionalCount < srcPositionalCount) {
-          if (!targetIncludesParamSpec) {
+        if (destPositionalCount < srcPositionalCount && !targetIncludesParamSpec) {
+          for (let i = destPositionalCount; i < srcPositionalCount; i++) {
+            if (destParamDetails.argsIndex !== void 0) {
+              const destArgsType = destParamDetails.params[destParamDetails.argsIndex].type;
+              const srcParamType = srcParamDetails.params[i].type;
+              if (!assignFunctionParameter(destArgsType, srcParamType, i, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
+                canAssign = false;
+              }
+              continue;
+            }
+            const srcParam = srcParamDetails.params[i];
+            if (srcParam.param.hasDefault) {
+              const paramInfo = srcParamDetails.params[i];
+              const defaultArgType = (_f = paramInfo.defaultArgType) !== null && _f !== void 0 ? _f : paramInfo.param.defaultType;
+              if (defaultArgType && !assignType(
+                paramInfo.type,
+                defaultArgType,
+                diag === null || diag === void 0 ? void 0 : diag.createAddendum(),
+                srcTypeVarContext,
+                /* destTypeVarContext */
+                void 0,
+                flags,
+                recursionCount
+              )) {
+                canAssign = false;
+              }
+              continue;
+            }
+            if (srcParam.kind === parameterUtils_1.ParameterKind.Standard) {
+              continue;
+            }
+            if (srcParam.param.category === 1) {
+              continue;
+            }
             const nonDefaultSrcParamCount = srcParamDetails.params.filter(
               (p) => !!p.param.name && !p.param.hasDefault && p.param.category === 0
               /* ParameterCategory.Simple */
             ).length;
-            if (destParamDetails.argsIndex === void 0) {
-              if (destPositionalCount < nonDefaultSrcParamCount) {
-                if (destParamDetails.firstPositionOrKeywordIndex > 0 && destParamDetails.firstPositionOrKeywordIndex < srcPositionalCount) {
-                  diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.LocAddendum.functionTooFewParams().format({
-                    expected: nonDefaultSrcParamCount,
-                    received: destPositionalCount
-                  }));
-                  canAssign = false;
-                }
-              }
-            } else {
-              const destArgsType = destParamDetails.params[destParamDetails.argsIndex].type;
-              if (!(0, types_1.isAnyOrUnknown)(destArgsType)) {
-                for (let paramIndex = destPositionalCount; paramIndex < srcPositionalCount; paramIndex++) {
-                  const srcParamType = srcParamDetails.params[paramIndex].type;
-                  if (!assignFunctionParameter(destArgsType, srcParamType, paramIndex, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
-                    canAssign = false;
-                  }
-                }
-              }
-            }
+            diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.LocAddendum.functionTooFewParams().format({
+              expected: nonDefaultSrcParamCount,
+              received: destPositionalCount
+            }));
+            canAssign = false;
+            break;
           }
         } else if (srcPositionalCount < destPositionalCount) {
           if (srcParamDetails.argsIndex !== void 0) {
@@ -83027,9 +83243,9 @@ var require_typeEvaluator = __commonJS({
                 if (!assignFunctionParameter(destParamType, srcArgsType, paramIndex, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
                   canAssign = false;
                 }
-                if (destParamDetails.params[paramIndex].source !== parameterUtils_1.ParameterSource.PositionOnly && srcParamDetails.kwargsIndex === void 0) {
+                if (destParamDetails.params[paramIndex].kind !== parameterUtils_1.ParameterKind.Positional && srcParamDetails.kwargsIndex === void 0) {
                   diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.namedParamMissingInSource().format({
-                    name: (_e = destParamDetails.params[paramIndex].param.name) !== null && _e !== void 0 ? _e : ""
+                    name: (_g = destParamDetails.params[paramIndex].param.name) !== null && _g !== void 0 ? _g : ""
                   }));
                   canAssign = false;
                 }
@@ -83072,7 +83288,7 @@ var require_typeEvaluator = __commonJS({
         }
         if (!types_1.FunctionType.shouldSkipArgsKwargsCompatibilityCheck(destType) && srcParamDetails.argsIndex === void 0 && srcType.details.paramSpec === void 0 && destParamDetails.argsIndex !== void 0 && !destParamDetails.hasUnpackedVariadicTypeVar) {
           diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.LocAddendum.argsParamMissing().format({
-            paramName: (_f = destParamDetails.params[destParamDetails.argsIndex].param.name) !== null && _f !== void 0 ? _f : ""
+            paramName: (_h = destParamDetails.params[destParamDetails.argsIndex].param.name) !== null && _h !== void 0 ? _h : ""
           }));
           canAssign = false;
         }
@@ -83093,14 +83309,15 @@ var require_typeEvaluator = __commonJS({
           }
           if (srcStartOfNamed >= 0) {
             srcParamDetails.params.forEach((srcParamInfo, index) => {
+              var _a2;
               if (index >= srcStartOfNamed) {
-                if (srcParamInfo.param.name && srcParamInfo.param.category === 0 && srcParamInfo.source !== parameterUtils_1.ParameterSource.PositionOnly) {
+                if (srcParamInfo.param.name && srcParamInfo.param.category === 0 && srcParamInfo.kind !== parameterUtils_1.ParameterKind.Positional) {
                   const destParamInfo = destParamMap.get(srcParamInfo.param.name);
                   const paramDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
                   const srcParamType = srcParamInfo.type;
                   if (!destParamInfo) {
                     if (destParamDetails.kwargsIndex === void 0 && !srcParamInfo.param.hasDefault) {
-                      if (paramDiag && srcParamDetails.firstKeywordOnlyIndex !== void 0) {
+                      if (paramDiag) {
                         paramDiag.addMessage(localize_1.LocAddendum.namedParamMissingInDest().format({
                           name: srcParamInfo.param.name
                         }));
@@ -83110,6 +83327,20 @@ var require_typeEvaluator = __commonJS({
                       if (!assignFunctionParameter(destParamDetails.params[destParamDetails.kwargsIndex].type, srcParamType, destParamDetails.params[destParamDetails.kwargsIndex].index, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
                         canAssign = false;
                       }
+                    } else if (srcParamInfo.param.hasDefault) {
+                      const defaultArgType = (_a2 = srcParamInfo.defaultArgType) !== null && _a2 !== void 0 ? _a2 : srcParamInfo.param.defaultType;
+                      if (defaultArgType && !assignType(
+                        srcParamInfo.type,
+                        defaultArgType,
+                        diag === null || diag === void 0 ? void 0 : diag.createAddendum(),
+                        srcTypeVarContext,
+                        /* destTypeVarContext */
+                        void 0,
+                        flags,
+                        recursionCount
+                      )) {
+                        canAssign = false;
+                      }
                     }
                   } else {
                     const destParamType = destParamInfo.type;
@@ -83169,7 +83400,7 @@ var require_typeEvaluator = __commonJS({
             canAssign = false;
           }
         }
-        if (targetIncludesParamSpec && ((_g = srcType.details.paramSpec) === null || _g === void 0 ? void 0 : _g.nameWithScope) === ((_h = destType.details.paramSpec) === null || _h === void 0 ? void 0 : _h.nameWithScope)) {
+        if (targetIncludesParamSpec && ((_j = srcType.details.paramSpec) === null || _j === void 0 ? void 0 : _j.nameWithScope) === ((_k = destType.details.paramSpec) === null || _k === void 0 ? void 0 : _k.nameWithScope)) {
           if (srcParamDetails.params.length !== destParamDetails.params.length) {
             canAssign = false;
           }
@@ -83569,10 +83800,10 @@ var require_typeEvaluator = __commonJS({
             }
             const baseParam = baseParamDetails.params[i].param;
             const overrideParam = overrideParamDetails.params[i].param;
-            if (i >= baseParamDetails.positionOnlyParamCount && !(0, symbolNameUtils_1.isPrivateOrProtectedName)(baseParam.name || "") && baseParamDetails.params[i].source !== parameterUtils_1.ParameterSource.PositionOnly && baseParam.category === 0 && enforceParamNames && baseParam.name !== overrideParam.name) {
+            if (i >= baseParamDetails.positionOnlyParamCount && !(0, symbolNameUtils_1.isPrivateOrProtectedName)(baseParam.name || "") && baseParamDetails.params[i].kind !== parameterUtils_1.ParameterKind.Positional && baseParam.category === 0 && enforceParamNames && baseParam.name !== overrideParam.name) {
               if (overrideParam.category === 0) {
                 if (!baseParam.isNameSynthesized) {
-                  if (overrideParamDetails.params[i].source === parameterUtils_1.ParameterSource.PositionOnly) {
+                  if (overrideParamDetails.params[i].kind === parameterUtils_1.ParameterKind.Positional) {
                     diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.overrideParamNamePositionOnly().format({
                       index: i + 1,
                       baseName: baseParam.name || "*"
@@ -83588,7 +83819,7 @@ var require_typeEvaluator = __commonJS({
                 }
               }
             } else if (i < overrideParamDetails.positionOnlyParamCount && i >= baseParamDetails.positionOnlyParamCount) {
-              if (!baseParam.isNameSynthesized && baseParamDetails.params[i].source !== parameterUtils_1.ParameterSource.PositionOnly) {
+              if (!baseParam.isNameSynthesized && baseParamDetails.params[i].kind !== parameterUtils_1.ParameterKind.Positional) {
                 diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.overrideParamNamePositionOnly().format({
                   index: i + 1,
                   baseName: baseParam.name || "*"
@@ -83629,7 +83860,7 @@ var require_typeEvaluator = __commonJS({
           if (enforceParamNames && overrideParamDetails.kwargsIndex === void 0) {
             for (let i = positionalParamCount; i < baseParamDetails.positionParamCount; i++) {
               const baseParam = baseParamDetails.params[i];
-              if (baseParam.source === parameterUtils_1.ParameterSource.PositionOrKeyword && baseParam.param.category === 0) {
+              if (baseParam.kind === parameterUtils_1.ParameterKind.Standard && baseParam.param.category === 0) {
                 diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.overrideParamNamePositionOnly().format({
                   index: i + 1,
                   baseName: baseParam.param.name || "*"
@@ -83667,11 +83898,11 @@ var require_typeEvaluator = __commonJS({
             }
           }
           const baseKwOnlyParams = baseParamDetails.params.filter(
-            (paramInfo) => paramInfo.source === parameterUtils_1.ParameterSource.KeywordOnly && paramInfo.param.category === 0
+            (paramInfo) => paramInfo.kind === parameterUtils_1.ParameterKind.Keyword && paramInfo.param.category === 0
             /* ParameterCategory.Simple */
           );
           const overrideKwOnlyParams = overrideParamDetails.params.filter(
-            (paramInfo) => paramInfo.source === parameterUtils_1.ParameterSource.KeywordOnly && paramInfo.param.category === 0
+            (paramInfo) => paramInfo.kind === parameterUtils_1.ParameterKind.Keyword && paramInfo.param.category === 0
             /* ParameterCategory.Simple */
           );
           baseKwOnlyParams.forEach((paramInfo) => {
@@ -85363,14 +85594,14 @@ var require_checker = __commonJS({
         }
         const exprTypeResult = this._evaluator.getTypeOfExpression(expression);
         let isExprFunction = true;
-        let isCoroutine = false;
+        let isCoroutine = true;
         (0, typeUtils_1.doForEachSubtype)(exprTypeResult.type, (subtype) => {
           subtype = this._evaluator.makeTopLevelTypeVarsConcrete(subtype);
           if (!(0, types_1.isFunction)(subtype) && !(0, types_1.isOverloadedFunction)(subtype)) {
             isExprFunction = false;
           }
-          if ((0, types_1.isClassInstance)(subtype) && types_1.ClassType.isBuiltIn(subtype, "Coroutine")) {
-            isCoroutine = true;
+          if (!(0, types_1.isClassInstance)(subtype) || !types_1.ClassType.isBuiltIn(subtype, "Coroutine")) {
+            isCoroutine = false;
           }
         });
         if (isExprFunction) {
@@ -85805,6 +86036,15 @@ var require_checker = __commonJS({
           exemptBoundTypeVar = false;
           nameWalker.walk(node.returnTypeAnnotation);
         }
+        if (node.functionAnnotationComment) {
+          node.functionAnnotationComment.paramTypeAnnotations.forEach((expr) => {
+            nameWalker.walk(expr);
+          });
+          if (node.functionAnnotationComment.returnTypeAnnotation) {
+            exemptBoundTypeVar = false;
+            nameWalker.walk(node.functionAnnotationComment.returnTypeAnnotation);
+          }
+        }
         localTypeVarUsage.forEach((usage) => {
           var _a;
           if (usage.nodes.length === 1 && !usage.isExempt) {
@@ -87121,7 +87361,7 @@ var require_checker = __commonJS({
         }
       }
       _conditionallyReportPrivateUsage(node) {
-        var _a;
+        var _a, _b;
         if (this._fileInfo.diagnosticRuleSet.reportPrivateUsage === "none") {
           return;
         }
@@ -87137,7 +87377,7 @@ var require_checker = __commonJS({
         if (!isPrivateName && !isProtectedName) {
           return;
         }
-        const declarations = this._evaluator.getDeclarationsForNameNode(node);
+        const declarations = (_b = this._evaluator.getDeclarationsForNameNode(node)) === null || _b === void 0 ? void 0 : _b.filter((decl) => decl.type !== 1 || !decl.isExplicitBinding);
         let primaryDeclaration = declarations && declarations.length > 0 ? declarations[declarations.length - 1] : void 0;
         if (!primaryDeclaration || primaryDeclaration.node === node) {
           return;
@@ -87425,8 +87665,8 @@ var require_checker = __commonJS({
           if (symbol.getTypedDeclarations().length > 0) {
             return;
           }
-          const symbolType = this._evaluator.getEffectiveTypeOfSymbol(symbol);
-          if (!(0, types_1.isClassInstance)(symbolType) || !types_1.ClassType.isSameGenericClass(symbolType, classType) || !(symbolType.literalValue instanceof types_1.EnumLiteral)) {
+          const symbolType = (0, enums_1.transformTypeForEnumMember)(this._evaluator, classType, name);
+          if (!symbolType || !(0, types_1.isClassInstance)(symbolType) || !types_1.ClassType.isSameGenericClass(symbolType, classType) || !(symbolType.literalValue instanceof types_1.EnumLiteral)) {
             return;
           }
           const decls = symbol.getDeclarations();
@@ -87454,10 +87694,34 @@ var require_checker = __commonJS({
                 }
               ];
               if (newMemberTypeResult) {
-                this._evaluator.validateCallArguments(errorNode, argList, newMemberTypeResult);
+                this._evaluator.validateCallArguments(
+                  errorNode,
+                  argList,
+                  newMemberTypeResult,
+                  /* typeVarContext */
+                  void 0,
+                  /* skipUnknownArgCheck */
+                  void 0,
+                  /* inferenceContext */
+                  void 0,
+                  /* signatureTracker */
+                  void 0
+                );
               }
               if (initMemberTypeResult) {
-                this._evaluator.validateCallArguments(errorNode, argList, initMemberTypeResult);
+                this._evaluator.validateCallArguments(
+                  errorNode,
+                  argList,
+                  initMemberTypeResult,
+                  /* typeVarContext */
+                  void 0,
+                  /* skipUnknownArgCheck */
+                  void 0,
+                  /* inferenceContext */
+                  void 0,
+                  /* signatureTracker */
+                  void 0
+                );
               }
             }
           } else if (declaredValueType) {
@@ -89375,7 +89639,7 @@ var require_sourceFile = __commonJS({
       IPythonMode2[IPythonMode2["CellDocs"] = 1] = "CellDocs";
     })(IPythonMode || (exports2.IPythonMode = IPythonMode = {}));
     var WriteableData = class {
-      constructor() {
+      constructor(console2) {
         this.diagnosticVersion = 0;
         this.fileContentsVersion = 0;
         this.lastFileContentLength = void 0;
@@ -89396,6 +89660,17 @@ var require_sourceFile = __commonJS({
         this.isBindingNeeded = true;
         this.isCheckingNeeded = true;
         this.isFileDeleted = false;
+        if (console_1.ConsoleInterface.hasLevel(console2)) {
+          this._consoleWithLevel = console2;
+        }
+      }
+      get parserOutput() {
+        return this._parserOutput;
+      }
+      set parserOutput(value) {
+        var _a;
+        this._lastCallstack = ((_a = this._consoleWithLevel) === null || _a === void 0 ? void 0 : _a.level) === console_1.LogLevel.Log && value === void 0 && this._parserOutput !== void 0 ? new Error().stack : void 0;
+        this._parserOutput = value;
       }
       debugPrint() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
@@ -89427,17 +89702,18 @@ var require_sourceFile = __commonJS({
  pyrightIgnoreLines=${(_l = this.pyrightIgnoreLines) === null || _l === void 0 ? void 0 : _l.size},
  checkTime=${this.checkTime},
  clientDocumentContents=${(_m = this.clientDocumentContents) === null || _m === void 0 ? void 0 : _m.length},
- parseResults=${(_o = this.parserOutput) === null || _o === void 0 ? void 0 : _o.parseTree.length}`;
+ parseResults=${(_o = this.parserOutput) === null || _o === void 0 ? void 0 : _o.parseTree.length},
+ parseResultsDropCallstack=${this._lastCallstack}`;
       }
     };
     var SourceFile = class {
       constructor(serviceProvider, uri, moduleName, isThirdPartyImport, isThirdPartyPyTypedPresent, editMode, console2, logTracker, ipythonMode) {
         this.serviceProvider = serviceProvider;
-        this._writableData = new WriteableData();
         this._diagnosticRuleSet = (0, configOptions_1.getBasicDiagnosticRuleSet)();
         this._ipythonMode = IPythonMode.None;
         this.fileSystem = serviceProvider.get(serviceKeys_1.ServiceKeys.fs);
         this._console = console2 || new console_1.StandardConsole();
+        this._writableData = new WriteableData(this._console);
         this._editMode = editMode;
         this._uri = uri;
         this._moduleName = moduleName;
@@ -89826,7 +90102,7 @@ var require_sourceFile = __commonJS({
         });
       }
       check(configOptions, importResolver, evaluator, sourceMapper, dependentFiles) {
-        (0, debug_1.assert)(!this.isParseRequired(), "Check called before parsing");
+        (0, debug_1.assert)(!this.isParseRequired(), `Check called before parsing: state=${this._writableData.debugPrint()}`);
         (0, debug_1.assert)(!this.isBindingRequired(), `Check called before binding: state=${this._writableData.debugPrint()}`);
         (0, debug_1.assert)(!this._writableData.isBindingInProgress, "Check called while binding in progress");
         (0, debug_1.assert)(this.isCheckingRequired(), "Check called unnecessarily");
@@ -89957,7 +90233,9 @@ var require_sourceFile = __commonJS({
             const rangeEnd = rangeStart + this._writableData.typeIgnoreAll.range.length;
             const range = (0, positionUtils_1.convertOffsetsToRange)(rangeStart, rangeEnd, this._writableData.tokenizerLines);
             if (!isUnreachableCodeRange(range) && this._diagnosticRuleSet.enableTypeIgnoreComments) {
-              unnecessaryTypeIgnoreDiags.push(new diagnostic_1.Diagnostic(diagCategory, localize_1.LocMessage.unnecessaryTypeIgnore(), range));
+              const diag = new diagnostic_1.Diagnostic(diagCategory, localize_1.LocMessage.unnecessaryTypeIgnore(), range);
+              diag.setRule(diagnosticRules_1.DiagnosticRule.reportUnnecessaryTypeIgnoreComment);
+              unnecessaryTypeIgnoreDiags.push(diag);
             }
           }
           typeIgnoreLinesClone.forEach((ignoreComment) => {
@@ -89966,7 +90244,9 @@ var require_sourceFile = __commonJS({
               const rangeEnd = rangeStart + ignoreComment.range.length;
               const range = (0, positionUtils_1.convertOffsetsToRange)(rangeStart, rangeEnd, this._writableData.tokenizerLines);
               if (!isUnreachableCodeRange(range) && this._diagnosticRuleSet.enableTypeIgnoreComments) {
-                unnecessaryTypeIgnoreDiags.push(new diagnostic_1.Diagnostic(diagCategory, localize_1.LocMessage.unnecessaryTypeIgnore(), range));
+                const diag = new diagnostic_1.Diagnostic(diagCategory, localize_1.LocMessage.unnecessaryTypeIgnore(), range);
+                diag.setRule(diagnosticRules_1.DiagnosticRule.reportUnnecessaryTypeIgnoreComment);
+                unnecessaryTypeIgnoreDiags.push(diag);
               }
             }
           });
@@ -89977,7 +90257,9 @@ var require_sourceFile = __commonJS({
                 const rangeEnd = rangeStart + ignoreComment.range.length;
                 const range = (0, positionUtils_1.convertOffsetsToRange)(rangeStart, rangeEnd, this._writableData.tokenizerLines);
                 if (!isUnreachableCodeRange(range)) {
-                  unnecessaryTypeIgnoreDiags.push(new diagnostic_1.Diagnostic(diagCategory, localize_1.LocMessage.unnecessaryPyrightIgnore(), range));
+                  const diag = new diagnostic_1.Diagnostic(diagCategory, localize_1.LocMessage.unnecessaryTypeIgnore(), range);
+                  diag.setRule(diagnosticRules_1.DiagnosticRule.reportUnnecessaryTypeIgnoreComment);
+                  unnecessaryTypeIgnoreDiags.push(diag);
                 }
               } else {
                 ignoreComment.rulesList.forEach((unusedRule) => {
@@ -89985,9 +90267,11 @@ var require_sourceFile = __commonJS({
                   const rangeEnd = rangeStart + unusedRule.range.length;
                   const range = (0, positionUtils_1.convertOffsetsToRange)(rangeStart, rangeEnd, this._writableData.tokenizerLines);
                   if (!isUnreachableCodeRange(range)) {
-                    unnecessaryTypeIgnoreDiags.push(new diagnostic_1.Diagnostic(diagCategory, localize_1.LocMessage.unnecessaryPyrightIgnoreRule().format({
+                    const diag = new diagnostic_1.Diagnostic(diagCategory, localize_1.LocMessage.unnecessaryPyrightIgnoreRule().format({
                       name: unusedRule.text
-                    }), range));
+                    }), range);
+                    diag.setRule(diagnosticRules_1.DiagnosticRule.reportUnnecessaryTypeIgnoreComment);
+                    unnecessaryTypeIgnoreDiags.push(diag);
                   }
                 });
               }
@@ -90030,7 +90314,7 @@ var require_sourceFile = __commonJS({
           return;
         }
         this._preEditData = this._writableData;
-        this._writableData = new WriteableData();
+        this._writableData = new WriteableData(this._console);
       }
       // Get all task list diagnostics for the current file and add them
       // to the specified diagnostic list.
@@ -92856,7 +93140,7 @@ var require_parser = __commonJS({
             const peekToken1 = this._peekToken(1);
             const peekToken2 = this._peekToken(2);
             let isInvalidTypeToken = true;
-            if (peekToken1.type === 7 || peekToken1.type === 8) {
+            if (peekToken1.type === 7 || peekToken1.type === 8 && tokenizerTypes_1.KeywordToken.isSoftKeyword(peekToken1)) {
               if (peekToken2.type === 15) {
                 isInvalidTypeToken = false;
               } else if (peekToken2.type === 9 && peekToken2.operatorType === 2) {
@@ -94738,8 +95022,8 @@ var require_parser = __commonJS({
           return tokenizerTypes_1.IdentifierToken.create(nextToken.start, nextToken.length, "", nextToken.comments);
         }
         if (nextToken.type === 8) {
-          const keywordType = this._peekKeywordType();
-          if (tokenizerTypes_1.softKeywords.find((type) => type === keywordType)) {
+          const keywordToken = nextToken;
+          if (tokenizerTypes_1.KeywordToken.isSoftKeyword(keywordToken)) {
             const keywordText = this._fileContents.substr(nextToken.start, nextToken.length);
             this._getNextToken();
             return tokenizerTypes_1.IdentifierToken.create(nextToken.start, nextToken.length, keywordText, nextToken.comments);