npm - coc-pyright - Versions diffs - 1.1.333 → 1.1.334 - Mend

coc-pyright 1.1.333 → 1.1.334

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

Files changed (3) hide show

package/lib/index.js CHANGED Viewed

@@ -13130,6 +13130,112 @@ var require_crypto = __commonJS({
   }
 });
+// node_modules/@zzzen/pyright-internal/dist/common/memUtils.js
+var require_memUtils = __commonJS({
+  "node_modules/@zzzen/pyright-internal/dist/common/memUtils.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.getHeapStatistics = void 0;
+    function getHeapStatisticsFunc() {
+      try {
+        const getHeapStatistics = require("v8").getHeapStatistics;
+        if (getHeapStatistics) {
+          return getHeapStatistics;
+        }
+      } catch {
+      }
+      return () => ({
+        total_heap_size: 0,
+        total_heap_size_executable: 0,
+        total_physical_size: 0,
+        total_available_size: 0,
+        used_heap_size: 0,
+        heap_size_limit: 0,
+        malloced_memory: 0,
+        peak_malloced_memory: 0,
+        does_zap_garbage: 0,
+        number_of_native_contexts: 0,
+        number_of_detached_contexts: 0
+      });
+    }
+    exports.getHeapStatistics = getHeapStatisticsFunc();
+  }
+});
+// node_modules/@zzzen/pyright-internal/dist/analyzer/cacheManager.js
+var require_cacheManager = __commonJS({
+  "node_modules/@zzzen/pyright-internal/dist/analyzer/cacheManager.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.CacheManager = void 0;
+    var debug_1 = require_debug2();
+    var memUtils_1 = require_memUtils();
+    var CacheManager = class {
+      constructor() {
+        this._pausedCount = 0;
+        this._cacheOwners = [];
+      }
+      registerCacheOwner(provider) {
+        this._cacheOwners.push(provider);
+      }
+      unregisterCacheOwner(provider) {
+        const index = this._cacheOwners.findIndex((p) => p === provider);
+        if (index < 0) {
+          (0, debug_1.fail)("Specified cache provider not found");
+        } else {
+          this._cacheOwners.splice(index, 1);
+        }
+      }
+      pauseTracking() {
+        const local = this;
+        local._pausedCount++;
+        return {
+          dispose() {
+            local._pausedCount--;
+          }
+        };
+      }
+      getCacheUsage() {
+        if (this._pausedCount > 0) {
+          return -1;
+        }
+        let totalUsage = 0;
+        this._cacheOwners.forEach((p) => {
+          totalUsage += p.getCacheUsage();
+        });
+        return totalUsage;
+      }
+      emptyCache(console2) {
+        if (console2) {
+          const heapStats = (0, memUtils_1.getHeapStatistics)();
+          console2.info(`Emptying type cache to avoid heap overflow. Used ${this._convertToMB(heapStats.used_heap_size)} out of ${this._convertToMB(heapStats.heap_size_limit)}.`);
+        }
+        this._cacheOwners.forEach((p) => {
+          p.emptyCache();
+        });
+      }
+      // Returns a ratio of used bytes to total bytes.
+      getUsedHeapRatio(console2) {
+        const heapStats = (0, memUtils_1.getHeapStatistics)();
+        if (console2) {
+          console2.info(`Heap stats: total_heap_size=${this._convertToMB(heapStats.total_heap_size)}, used_heap_size=${this._convertToMB(heapStats.used_heap_size)}, total_physical_size=${this._convertToMB(heapStats.total_physical_size)}, total_available_size=${this._convertToMB(heapStats.total_available_size)}, heap_size_limit=${this._convertToMB(heapStats.heap_size_limit)}`);
+        }
+        return heapStats.used_heap_size / heapStats.heap_size_limit;
+      }
+      _convertToMB(bytes) {
+        return `${Math.round(bytes / (1024 * 1024))}MB`;
+      }
+    };
+    exports.CacheManager = CacheManager;
+    (function(CacheManager2) {
+      function is(obj) {
+        return obj.registerCacheOwner !== void 0 && obj.unregisterCacheOwner !== void 0 && obj.pauseTracking !== void 0 && obj.getCacheUsage !== void 0 && obj.emptyCache !== void 0 && obj.getUsedHeapRatio !== void 0;
+      }
+      CacheManager2.is = is;
+    })(CacheManager = exports.CacheManager || (exports.CacheManager = {}));
+  }
+});
 // node_modules/vscode-languageserver-textdocument/lib/esm/main.js
 var main_exports2 = {};
 __export(main_exports2, {
@@ -14083,106 +14189,6 @@ var require_analyzerNodeInfo = __commonJS({
   }
 });
-// node_modules/@zzzen/pyright-internal/dist/common/memUtils.js
-var require_memUtils = __commonJS({
-  "node_modules/@zzzen/pyright-internal/dist/common/memUtils.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.getHeapStatistics = void 0;
-    function getHeapStatisticsFunc() {
-      try {
-        const getHeapStatistics = require("v8").getHeapStatistics;
-        if (getHeapStatistics) {
-          return getHeapStatistics;
-        }
-      } catch {
-      }
-      return () => ({
-        total_heap_size: 0,
-        total_heap_size_executable: 0,
-        total_physical_size: 0,
-        total_available_size: 0,
-        used_heap_size: 0,
-        heap_size_limit: 0,
-        malloced_memory: 0,
-        peak_malloced_memory: 0,
-        does_zap_garbage: 0,
-        number_of_native_contexts: 0,
-        number_of_detached_contexts: 0
-      });
-    }
-    exports.getHeapStatistics = getHeapStatisticsFunc();
-  }
-});
-// node_modules/@zzzen/pyright-internal/dist/analyzer/cacheManager.js
-var require_cacheManager = __commonJS({
-  "node_modules/@zzzen/pyright-internal/dist/analyzer/cacheManager.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.CacheManager = void 0;
-    var debug_1 = require_debug2();
-    var memUtils_1 = require_memUtils();
-    var CacheManager = class {
-      constructor() {
-        this._pausedCount = 0;
-        this._cacheOwners = [];
-      }
-      registerCacheOwner(provider) {
-        this._cacheOwners.push(provider);
-      }
-      unregisterCacheOwner(provider) {
-        const index = this._cacheOwners.findIndex((p) => p === provider);
-        if (index < 0) {
-          (0, debug_1.fail)("Specified cache provider not found");
-        } else {
-          this._cacheOwners.splice(index, 1);
-        }
-      }
-      pauseTracking() {
-        const local = this;
-        local._pausedCount++;
-        return {
-          dispose() {
-            local._pausedCount--;
-          }
-        };
-      }
-      getCacheUsage() {
-        if (this._pausedCount > 0) {
-          return -1;
-        }
-        let totalUsage = 0;
-        this._cacheOwners.forEach((p) => {
-          totalUsage += p.getCacheUsage();
-        });
-        return totalUsage;
-      }
-      emptyCache(console2) {
-        if (console2) {
-          const heapStats = (0, memUtils_1.getHeapStatistics)();
-          console2.info(`Emptying type cache to avoid heap overflow. Used ${this._convertToMB(heapStats.used_heap_size)} out of ${this._convertToMB(heapStats.heap_size_limit)}.`);
-        }
-        this._cacheOwners.forEach((p) => {
-          p.emptyCache();
-        });
-      }
-      // Returns a ratio of used bytes to total bytes.
-      getUsedHeapRatio(console2) {
-        const heapStats = (0, memUtils_1.getHeapStatistics)();
-        if (console2) {
-          console2.info(`Heap stats: total_heap_size=${this._convertToMB(heapStats.total_heap_size)}, used_heap_size=${this._convertToMB(heapStats.used_heap_size)}, total_physical_size=${this._convertToMB(heapStats.total_physical_size)}, total_available_size=${this._convertToMB(heapStats.total_available_size)}, heap_size_limit=${this._convertToMB(heapStats.heap_size_limit)}`);
-        }
-        return heapStats.used_heap_size / heapStats.heap_size_limit;
-      }
-      _convertToMB(bytes) {
-        return `${Math.round(bytes / (1024 * 1024))}MB`;
-      }
-    };
-    exports.CacheManager = CacheManager;
-  }
-});
 // node_modules/@zzzen/pyright-internal/dist/analyzer/circularDependency.js
 var require_circularDependency = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/analyzer/circularDependency.js"(exports) {
@@ -16626,8 +16632,8 @@ var require_parseTreeUtils = __commonJS({
       return result;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.getCallNodeAndActiveParameterIndex = exports.getEnclosingParameter = exports.CallNodeWalker = exports.NameNodeWalker = exports.isAssignmentToDefaultsFollowingNamedTuple = exports.isDocString = exports.getDocString = exports.isWithinAssertExpression = exports.isWithinTryBlock = exports.isWithinLoop = exports.isWithinAnnotationComment = exports.isWithinTypeAnnotation = exports.isWithinDefaultParamInitializer = exports.isPartialMatchingExpression = exports.isMatchingExpression = exports.containsAwaitNode = exports.isSuiteEmpty = exports.isNodeContainedWithinNodeType = exports.getParentAnnotationNode = exports.getParentNodeOfType = exports.isNodeContainedWithin = exports.isRequiredAllowedForAssignmentTarget = exports.isClassVarAllowedForAssignmentTarget = exports.isFinalAllowedForAssignmentTarget = exports.getTypeAnnotationNode = exports.getExecutionScopeNode = exports.getTypeVarScopeNode = exports.getEvaluationScopeNode = exports.getEvaluationNodeForAssignmentExpression = exports.getEnclosingSuiteOrModule = exports.getEnclosingClassOrFunction = exports.getEnclosingLambda = exports.getEnclosingFunctionEvaluationScope = exports.getEnclosingFunction = exports.getEnclosingClassOrModule = exports.getEnclosingModule = exports.getEnclosingClass = exports.getEnclosingSuite = exports.getDecoratorForName = exports.getCallForName = exports.printOperator = exports.printExpression = exports.printArgument = exports.getTypeSourceId = exports.getClassFullName = exports.isCompliantWithNodeRangeRules = exports.findNodeByOffset = exports.findNodeByPosition = exports.getNodeDepth = exports.PrintExpressionFlags = void 0;
-    exports.getTypeVarScopesForNode = exports.getScopeIdForNode = exports.getVariableDocStringNode = exports.operatorSupportsChaining = exports.isValidLocationForFutureImport = exports.isUnannotatedFunction = exports.isBlankLine = exports.getFullStatementRange = exports.getStringValueRange = exports.getStringNodeValueRange = exports.isLastNameOfDottedName = exports.isFirstNameOfDottedName = exports.getFirstNameOfDottedName = exports.getDottedName = exports.getDecoratorName = exports.getDottedNameWithGivenNodeAsLastName = exports.getFirstAncestorOrSelf = exports.getFirstAncestorOrSelfOfKind = exports.isLastNameOfModuleName = exports.isFromImportAlias = exports.isFromImportName = exports.isFromImportModuleName = exports.isImportAlias = exports.isImportModuleName = exports.getTypeAnnotationForParameter = exports.isFunctionSuiteEmpty = exports.getFileInfoFromNode = exports.getModuleNode = exports.isWriteAccess = exports.printParseNodeType = exports.getTokenOverlapping = exports.getTokenAt = exports.getTokenAtIndex = exports.isWhitespace = exports.getTokenAtLeft = exports.getTokenIndexAtLeft = void 0;
+    exports.getEnclosingParameter = exports.CallNodeWalker = exports.NameNodeWalker = exports.isAssignmentToDefaultsFollowingNamedTuple = exports.isDocString = exports.getDocString = exports.isWithinAssertExpression = exports.isWithinTryBlock = exports.isWithinLoop = exports.isWithinAnnotationComment = exports.isWithinTypeAnnotation = exports.isWithinDefaultParamInitializer = exports.isPartialMatchingExpression = exports.isMatchingExpression = exports.containsAwaitNode = exports.isSuiteEmpty = exports.isNodeContainedWithinNodeType = exports.getParentAnnotationNode = exports.getParentNodeOfType = exports.isNodeContainedWithin = exports.isRequiredAllowedForAssignmentTarget = exports.isClassVarAllowedForAssignmentTarget = exports.isFinalAllowedForAssignmentTarget = exports.getArgumentsByRuntimeOrder = exports.getTypeAnnotationNode = exports.getExecutionScopeNode = exports.getTypeVarScopeNode = exports.getEvaluationScopeNode = exports.getEvaluationNodeForAssignmentExpression = exports.getEnclosingSuiteOrModule = exports.getEnclosingClassOrFunction = exports.getEnclosingLambda = exports.getEnclosingFunctionEvaluationScope = exports.getEnclosingFunction = exports.getEnclosingClassOrModule = exports.getEnclosingModule = exports.getEnclosingClass = exports.getEnclosingSuite = exports.getDecoratorForName = exports.getCallForName = exports.printOperator = exports.printExpression = exports.printArgument = exports.getTypeSourceId = exports.getClassFullName = exports.isCompliantWithNodeRangeRules = exports.findNodeByOffset = exports.findNodeByPosition = exports.getNodeDepth = exports.PrintExpressionFlags = void 0;
+    exports.getTypeVarScopesForNode = exports.getScopeIdForNode = exports.getVariableDocStringNode = exports.operatorSupportsChaining = exports.isValidLocationForFutureImport = exports.isUnannotatedFunction = exports.isBlankLine = exports.getFullStatementRange = exports.getStringValueRange = exports.getStringNodeValueRange = exports.isLastNameOfDottedName = exports.isFirstNameOfDottedName = exports.getFirstNameOfDottedName = exports.getDottedName = exports.getDecoratorName = exports.getDottedNameWithGivenNodeAsLastName = exports.getFirstAncestorOrSelf = exports.getFirstAncestorOrSelfOfKind = exports.isLastNameOfModuleName = exports.isFromImportAlias = exports.isFromImportName = exports.isFromImportModuleName = exports.isImportAlias = exports.isImportModuleName = exports.getTypeAnnotationForParameter = exports.isFunctionSuiteEmpty = exports.getFileInfoFromNode = exports.getModuleNode = exports.isWriteAccess = exports.printParseNodeType = exports.getTokenOverlapping = exports.getTokenAt = exports.getTokenAtIndex = exports.isWhitespace = exports.getTokenAtLeft = exports.getTokenIndexAtLeft = exports.getCallNodeAndActiveParameterIndex = void 0;
     var AnalyzerNodeInfo = __importStar(require_analyzerNodeInfo());
     var core_1 = require_core();
     var debug_1 = require_debug2();
@@ -17426,6 +17432,18 @@ var require_parseTreeUtils = __commonJS({
       return void 0;
     }
     exports.getTypeAnnotationNode = getTypeAnnotationNode;
+    function getArgumentsByRuntimeOrder(node) {
+      const positionalArgs = node.arguments.filter(
+        (arg) => !arg.name && arg.argumentCategory !== 2
+        /* UnpackedDictionary */
+      );
+      const keywordArgs = node.arguments.filter(
+        (arg) => !!arg.name || arg.argumentCategory === 2
+        /* UnpackedDictionary */
+      );
+      return positionalArgs.concat(keywordArgs);
+    }
+    exports.getArgumentsByRuntimeOrder = getArgumentsByRuntimeOrder;
     function isFinalAllowedForAssignmentTarget(targetNode) {
       if (targetNode.nodeType === 38) {
         return true;
@@ -18670,6 +18688,138 @@ var require_parseTreeUtils = __commonJS({
   }
 });
+// node_modules/@zzzen/pyright-internal/dist/analyzer/sourceFileInfo.js
+var require_sourceFileInfo = __commonJS({
+  "node_modules/@zzzen/pyright-internal/dist/analyzer/sourceFileInfo.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.SourceFileInfo = void 0;
+    var SourceFileInfo = class {
+      constructor(sourceFile, isTypeshedFile, isThirdPartyImport, isThirdPartyPyTypedPresent, _editModeTracker, args = {}) {
+        this.sourceFile = sourceFile;
+        this.isTypeshedFile = isTypeshedFile;
+        this.isThirdPartyImport = isThirdPartyImport;
+        this.isThirdPartyPyTypedPresent = isThirdPartyPyTypedPresent;
+        this._editModeTracker = _editModeTracker;
+        this.isCreatedInEditMode = this._editModeTracker.isEditMode;
+        this._writableData = this._createWriteableData(args);
+        this._cachePreEditState();
+      }
+      get diagnosticsVersion() {
+        return this._writableData.diagnosticsVersion;
+      }
+      get builtinsImport() {
+        return this._writableData.builtinsImport;
+      }
+      // Information about the chained source file
+      // Chained source file is not supposed to exist on file system but
+      // must exist in the program's source file list. Module level
+      // scope of the chained source file will be inserted before
+      // current file's scope.
+      get chainedSourceFile() {
+        return this._writableData.chainedSourceFile;
+      }
+      get effectiveFutureImports() {
+        return this._writableData.effectiveFutureImports;
+      }
+      // Information about why the file is included in the program
+      // and its relation to other source files in the program.
+      get isTracked() {
+        return this._writableData.isTracked;
+      }
+      get isOpenByClient() {
+        return this._writableData.isOpenByClient;
+      }
+      get imports() {
+        return this._writableData.imports;
+      }
+      get importedBy() {
+        return this._writableData.importedBy;
+      }
+      get shadows() {
+        return this._writableData.shadows;
+      }
+      get shadowedBy() {
+        return this._writableData.shadowedBy;
+      }
+      set diagnosticsVersion(value) {
+        this._cachePreEditState();
+        this._writableData.diagnosticsVersion = value;
+      }
+      set builtinsImport(value) {
+        this._cachePreEditState();
+        this._writableData.builtinsImport = value;
+      }
+      set chainedSourceFile(value) {
+        this._cachePreEditState();
+        this._writableData.chainedSourceFile = value;
+      }
+      set effectiveFutureImports(value) {
+        this._cachePreEditState();
+        this._writableData.effectiveFutureImports = value;
+      }
+      set isTracked(value) {
+        this._cachePreEditState();
+        this._writableData.isTracked = value;
+      }
+      set isOpenByClient(value) {
+        this._cachePreEditState();
+        this._writableData.isOpenByClient = value;
+      }
+      mutate(callback) {
+        this._cachePreEditState();
+        callback(this._writableData);
+      }
+      restore() {
+        if (this._preEditData) {
+          this._writableData = this._preEditData;
+          this._preEditData = void 0;
+          this.sourceFile.dropParseAndBindInfo();
+        }
+        return this.sourceFile.restore();
+      }
+      _cachePreEditState() {
+        if (!this._editModeTracker.isEditMode || this._preEditData) {
+          return;
+        }
+        this._preEditData = this._writableData;
+        this._writableData = this._cloneWriteableData(this._writableData);
+        this._editModeTracker.addMutatedFiles(this);
+      }
+      _createWriteableData(args) {
+        var _a, _b;
+        return {
+          isTracked: (_a = args.isTracked) !== null && _a !== void 0 ? _a : false,
+          isOpenByClient: (_b = args.isOpenByClient) !== null && _b !== void 0 ? _b : false,
+          builtinsImport: args.builtinsImport,
+          chainedSourceFile: args.chainedSourceFile,
+          diagnosticsVersion: args.diagnosticsVersion,
+          effectiveFutureImports: args.effectiveFutureImports,
+          imports: [],
+          importedBy: [],
+          shadows: [],
+          shadowedBy: []
+        };
+      }
+      _cloneWriteableData(data) {
+        return {
+          isTracked: data.isTracked,
+          isOpenByClient: data.isOpenByClient,
+          builtinsImport: data.builtinsImport,
+          chainedSourceFile: data.chainedSourceFile,
+          diagnosticsVersion: data.diagnosticsVersion,
+          effectiveFutureImports: data.effectiveFutureImports,
+          imports: data.imports.slice(),
+          importedBy: data.importedBy.slice(),
+          shadows: data.shadows.slice(),
+          shadowedBy: data.shadowedBy.slice()
+        };
+      }
+    };
+    exports.SourceFileInfo = SourceFileInfo;
+  }
+});
 // node_modules/@zzzen/pyright-internal/dist/analyzer/sourceFileInfoUtils.js
 var require_sourceFileInfoUtils = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/analyzer/sourceFileInfoUtils.js"(exports) {
@@ -19086,7 +19236,6 @@ var require_types = __commonJS({
       ClassTypeFlags2[ClassTypeFlags2["SynthesizedDataClassOrder"] = 64] = "SynthesizedDataClassOrder";
       ClassTypeFlags2[ClassTypeFlags2["TypedDictClass"] = 128] = "TypedDictClass";
       ClassTypeFlags2[ClassTypeFlags2["CanOmitDictValues"] = 256] = "CanOmitDictValues";
-      ClassTypeFlags2[ClassTypeFlags2["DictValuesReadOnly"] = 512] = "DictValuesReadOnly";
       ClassTypeFlags2[ClassTypeFlags2["SupportsAbstractMethods"] = 1024] = "SupportsAbstractMethods";
       ClassTypeFlags2[ClassTypeFlags2["PropertyClass"] = 2048] = "PropertyClass";
       ClassTypeFlags2[ClassTypeFlags2["Final"] = 4096] = "Final";
@@ -19396,10 +19545,6 @@ var require_types = __commonJS({
         return !!(classType.details.flags & 256);
       }
       ClassType2.isCanOmitDictValues = isCanOmitDictValues;
-      function isDictValuesReadOnly(classType) {
-        return !!(classType.details.flags & 512);
-      }
-      ClassType2.isDictValuesReadOnly = isDictValuesReadOnly;
       function isEnumClass(classType) {
         return !!(classType.details.flags & 1048576);
       }
@@ -20253,13 +20398,8 @@ var require_types = __commonJS({
         );
       }
       TypeVarType2.createInstance = createInstance;
-      function createInstantiable(name, isParamSpec2 = false) {
-        return create(
-          name,
-          isParamSpec2,
-          1
-          /* Instantiable */
-        );
+      function createInstantiable(name, isParamSpec2 = false, runtimeClass) {
+        return create(name, isParamSpec2, 1, runtimeClass);
       }
       TypeVarType2.createInstantiable = createInstantiable;
       function cloneAsInstance(type) {
@@ -20379,7 +20519,7 @@ var require_types = __commonJS({
         return `${name}.${scopeId}`;
       }
       TypeVarType2.makeNameWithScope = makeNameWithScope;
-      function create(name, isParamSpec2, typeFlags) {
+      function create(name, isParamSpec2, typeFlags, runtimeClass) {
         const newTypeVarType = {
           category: 10,
           details: {
@@ -20388,7 +20528,8 @@ var require_types = __commonJS({
             declaredVariance: 2,
             isParamSpec: isParamSpec2,
             isVariadic: false,
-            isSynthesized: false
+            isSynthesized: false,
+            runtimeClass
           },
           flags: typeFlags
         };
@@ -26439,6 +26580,7 @@ var require_package_nls_cs = __commonJS({
         memberSetClassVar: "\u010Clen \u201E{name}\u201C nelze p\u0159i\u0159adit prost\u0159ednictv\xEDm instance t\u0159\xEDdy, proto\u017Ee se jedn\xE1 o t\u0159\xEDdu ClassVar",
         memberTypeMismatch: "{name} je nekompatibiln\xED typ",
         memberUnknown: "\u010Clen {name} je nezn\xE1m\xFD",
+        metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
         missingDeleter: "Chyb\xED metoda odstran\u011Bn\xED vlastnosti",
         missingGetter: "Chyb\xED metoda getter vlastnosti",
         missingProtocolMember: "\u010Clen {name} je deklarov\xE1n ve t\u0159\xEDd\u011B protokolu {classType}",
@@ -27188,6 +27330,7 @@ var require_package_nls_de = __commonJS({
         memberSetClassVar: 'Der Member "{name}" kann nicht \xFCber eine Klasseninstanz zugewiesen werden, da es sich um eine ClassVar handelt.',
         memberTypeMismatch: '"{name}" ist ein inkompatibler Typ.',
         memberUnknown: 'Das Member "{name}" ist unbekannt.',
+        metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
         missingDeleter: "Die Eigenschaft-Deleter-Methode fehlt.",
         missingGetter: "Die Eigenschaft-Getter-Methode fehlt.",
         missingProtocolMember: 'Member "{name}" ist in Protokollklasse "{classType}" deklariert.',
@@ -28687,6 +28830,7 @@ var require_package_nls_es = __commonJS({
         memberSetClassVar: 'El miembro "{name}" no se puede asignar a trav\xE9s de una instancia de clase porque es un ClassVar.',
         memberTypeMismatch: '"{name}" es un tipo incompatible',
         memberUnknown: 'El miembro "{name}" es desconocido',
+        metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
         missingDeleter: "Falta el m\xE9todo de eliminaci\xF3n de propiedades",
         missingGetter: "Falta el m\xE9todo Getter de la propiedad",
         missingProtocolMember: 'El miembro "{name}" est\xE1 declarado en la clase de protocolo "{classType}"',
@@ -29436,6 +29580,7 @@ var require_package_nls_fr = __commonJS({
         memberSetClassVar: `Le membre "{name}" ne peut pas \xEAtre attribu\xE9 via une instance de classe car il s'agit d'une ClassVar`,
         memberTypeMismatch: "\xAB {name} \xBB est un type incompatible",
         memberUnknown: "Le membre \xAB\xA0{name}\xA0\xBB est inconnu",
+        metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
         missingDeleter: "La m\xE9thode de suppression de propri\xE9t\xE9s est manquante",
         missingGetter: "La m\xE9thode getter de propri\xE9t\xE9 est manquante",
         missingProtocolMember: "Le membre \xAB\xA0{name}\xA0\xBB est d\xE9clar\xE9 dans la classe de protocole \xAB\xA0{classType}\xA0\xBB",
@@ -30185,6 +30330,7 @@ var require_package_nls_it = __commonJS({
         memberSetClassVar: `Non \xE8 possibile assegnare il membro "{name}" tramite un'istanza di classe perch\xE9 \xE8 una ClassVar`,
         memberTypeMismatch: '"{name}" \xE8 un tipo non compatibile',
         memberUnknown: 'Il membro "{name}" \xE8 sconosciuto',
+        metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
         missingDeleter: "Manca il metodo di eliminazione delle propriet\xE0",
         missingGetter: "Metodo getter propriet\xE0 mancante",
         missingProtocolMember: 'Il "{name}" membro \xE8 dichiarato nella classe di protocollo "{classType}"',
@@ -30934,6 +31080,7 @@ var require_package_nls_ja = __commonJS({
         memberSetClassVar: '\u30E1\u30F3\u30D0\u30FC "{name}" \u306F ClassVar \u3067\u3042\u308B\u305F\u3081\u3001\u30AF\u30E9\u30B9 \u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4ECB\u3057\u3066\u5272\u308A\u5F53\u3066\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093',
         memberTypeMismatch: '"{name}" \u306F\u4E92\u63DB\u6027\u306E\u306A\u3044\u578B\u3067\u3059',
         memberUnknown: '\u30E1\u30F3\u30D0\u30FC "{name}" \u304C\u4E0D\u660E\u3067\u3059',
+        metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
         missingDeleter: "\u30D7\u30ED\u30D1\u30C6\u30A3\u524A\u9664\u30E1\u30BD\u30C3\u30C9\u304C\u3042\u308A\u307E\u305B\u3093",
         missingGetter: "\u30D7\u30ED\u30D1\u30C6\u30A3 getter \u30E1\u30BD\u30C3\u30C9\u304C\u3042\u308A\u307E\u305B\u3093",
         missingProtocolMember: '\u30E1\u30F3\u30D0\u30FC "{name}" \u306F\u30D7\u30ED\u30C8\u30B3\u30EB \u30AF\u30E9\u30B9 "{classType}" \u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059',
@@ -31683,6 +31830,7 @@ var require_package_nls_ko = __commonJS({
         memberSetClassVar: "\u2018{name}\u2019 \uBA64\uBC84\uB294 ClassVar\uC774\uBBC0\uB85C \uD074\uB798\uC2A4 \uC778\uC2A4\uD134\uC2A4\uB97C \uD1B5\uD574 \uD560\uB2F9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.",
         memberTypeMismatch: '"{name}"\uC740(\uB294) \uD638\uD658\uB418\uC9C0 \uC54A\uB294 \uD615\uC2DD\uC785\uB2C8\uB2E4.',
         memberUnknown: '\uBA64\uBC84 "{name}"\uC744(\uB97C) \uC54C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.',
+        metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
         missingDeleter: "\uC18D\uC131 \uC0AD\uC81C\uC790 \uBA54\uC11C\uB4DC\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.",
         missingGetter: "\uC18D\uC131 getter \uBA54\uC11C\uB4DC\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.",
         missingProtocolMember: '"{name}" \uBA64\uBC84\uAC00 \uD504\uB85C\uD1A0\uCF5C \uD074\uB798\uC2A4 "{classType}"\uB85C \uC120\uC5B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4.',
@@ -32432,6 +32580,7 @@ var require_package_nls_pl = __commonJS({
         memberSetClassVar: "Nie mo\u017Cna przypisa\u0107 sk\u0142adowej \u201E{name}\u201D przez wyst\u0105pienie klasy, poniewa\u017C jest to element ClassVar",
         memberTypeMismatch: "Nazwa \u201E{name}\u201D jest niezgodnym typem",
         memberUnknown: "Sk\u0142adowa \u201E{name}\u201D jest nieznana",
+        metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
         missingDeleter: "Brak metody usuwania w\u0142a\u015Bciwo\u015Bci",
         missingGetter: "Brak metody pobieraj\u0105cej w\u0142a\u015Bciwo\u015Bci",
         missingProtocolMember: "Sk\u0142adowa \u201E{name}\u201D jest zadeklarowana w klasie protoko\u0142u \u201E{classType}\u201D",
@@ -33181,6 +33330,7 @@ var require_package_nls_pt_br = __commonJS({
         memberSetClassVar: 'O membro "{name}" n\xE3o pode ser atribu\xEDdo por meio de uma inst\xE2ncia de classe porque \xE9 um ClassVar',
         memberTypeMismatch: '"{name}" \xE9 um tipo incompat\xEDvel',
         memberUnknown: 'O membro "{name}" \xE9 desconhecido',
+        metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
         missingDeleter: "O m\xE9todo de exclus\xE3o de propriedade est\xE1 ausente",
         missingGetter: "O m\xE9todo getter da propriedade est\xE1 ausente",
         missingProtocolMember: 'O membro "{name}" est\xE1 declarado na classe de protocolo "{classType}"',
@@ -33930,6 +34080,7 @@ var require_package_nls_qps_ploc = __commonJS({
         memberSetClassVar: '[2pVfQ][\u0E19\u0E31\u0E49M\xEBm\xFE\xEBr "{\xF1\xE6m\xEB}" \xE7\xE6\xF1\xF1\xF8t \xFE\xEB \xE6ss\xEFg\xF1\xEB\xF0 thr\xF8\xB5gh \xE6 \xE7l\xE6ss \xEF\xF1st\xE6\xF1\xE7\xEB \xFE\xEB\xE7\xE6\xB5s\xEB \xEFt \xEFs \xE6 \xC7l\xE6ssV\xE6r\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\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
         memberTypeMismatch: '[IHN4x][\u0E19\u0E31\u0E49"{\xF1\xE6m\xEB}" \xEFs \xE6\xF1 \xEF\xF1\xE7\xF8mp\xE6t\xEF\xFEl\xEB t\xFFp\xEB\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
         memberUnknown: '[7kDIF][\u0E19\u0E31\u0E49M\xEBm\xFE\xEBr "{\xF1\xE6m\xEB}" \xEFs \xB5\xF1k\xF1\xF8w\xF1\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
+        metaclassConflict: '[fjWW1][\u0E19\u0E31\u0E49M\xEBt\xE6\xE7l\xE6ss "{m\xEBt\xE6\xE7l\xE6ss1}" \xE7\xF8\xF1fl\xEF\xE7ts w\xEFth "{m\xEBt\xE6\xE7l\xE6ss2}"\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]',
         missingDeleter: "[5IVNI][\u0E19\u0E31\u0E49Pr\xF8p\xEBrt\xFF \xF0\xEBl\xEBt\xEBr m\xEBth\xF8\xF0 \xEFs m\xEFss\xEF\xF1g\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u307E\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
         missingGetter: "[Mzn4K][\u0E19\u0E31\u0E49Pr\xF8p\xEBrt\xFF g\xEBtt\xEBr m\xEBth\xF8\xF0 \xEFs m\xEFss\xEF\xF1g\u1EA4\u011F\u502A\u0130\u0402\u04B0\u0915\u094D\u0930\u094D\u0924\u093F\u0943\u0E19\u0E31\u0E49\u0922\u0942\u0901]",
         missingProtocolMember: '[ZIqwL][\u0E19\u0E31\u0E49M\xEBm\xFE\xEBr "{\xF1\xE6m\xEB}" \xEFs \xF0\xEB\xE7l\xE6r\xEB\xF0 \xEF\xF1 pr\xF8t\xF8\xE7\xF8l \xE7l\xE6ss "{\xE7l\xE6ssT\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\u0E19\u0E31\u0E49\u0922\u0942\u0901]',
@@ -34679,6 +34830,7 @@ var require_package_nls_ru = __commonJS({
         memberSetClassVar: '\u042D\u043B\u0435\u043C\u0435\u043D\u0442 "{name}" \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043D\u0430\u0437\u043D\u0430\u0447\u0435\u043D \u0447\u0435\u0440\u0435\u0437 \u044D\u043A\u0437\u0435\u043C\u043F\u043B\u044F\u0440 \u043A\u043B\u0430\u0441\u0441\u0430, \u0442\u0430\u043A \u043A\u0430\u043A \u044D\u0442\u043E ClassVar',
         memberTypeMismatch: '"{name}" \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u043D\u0435\u0441\u043E\u0432\u043C\u0435\u0441\u0442\u0438\u043C\u044B\u043C \u0442\u0438\u043F\u043E\u043C',
         memberUnknown: '\u042D\u043B\u0435\u043C\u0435\u043D\u0442 "{name}" \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u0435\u043D',
+        metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
         missingDeleter: "\u041E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u043C\u0435\u0442\u043E\u0434 \u0443\u0434\u0430\u043B\u0435\u043D\u0438\u044F \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430",
         missingGetter: "\u041E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u043C\u0435\u0442\u043E\u0434 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u044F \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430",
         missingProtocolMember: '\u042D\u043B\u0435\u043C\u0435\u043D\u0442 "{name}" \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D \u0432 \u043A\u043B\u0430\u0441\u0441\u0435 \u043F\u0440\u043E\u0442\u043E\u043A\u043E\u043B\u0430 "{classType}"',
@@ -35428,6 +35580,7 @@ var require_package_nls_tr = __commonJS({
         memberSetClassVar: '"{name}" \xFCyesi bir ClassVar oldu\u011Fundan s\u0131n\u0131f \xF6rne\u011Fi arac\u0131l\u0131\u011F\u0131yla atanamaz',
         memberTypeMismatch: '"{name}" uyumsuz bir t\xFCr',
         memberUnknown: '"{name}" \xFCyesi bilinmiyor',
+        metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
         missingDeleter: "\xD6zellik silici metodu eksik",
         missingGetter: "\xD6zellik al\u0131c\u0131 metodu eksik",
         missingProtocolMember: '"{name}" \xFCyesi "{classType}" protokol s\u0131n\u0131f\u0131nda bildirildi',
@@ -36177,6 +36330,7 @@ var require_package_nls_zh_cn = __commonJS({
         memberSetClassVar: "\u65E0\u6CD5\u901A\u8FC7\u7C7B\u5B9E\u4F8B\u5206\u914D\u6210\u5458\u201C{name}\u201D\uFF0C\u56E0\u4E3A\u5B83\u662F ClassVar",
         memberTypeMismatch: '"{name}"\u662F\u4E0D\u517C\u5BB9\u7684\u7C7B\u578B',
         memberUnknown: '\u6210\u5458"{name}"\u672A\u77E5',
+        metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
         missingDeleter: "\u7F3A\u5C11\u5C5E\u6027 deleter\u65B9\u6CD5",
         missingGetter: "\u7F3A\u5C11\u5C5E\u6027 getter \u65B9\u6CD5",
         missingProtocolMember: '\u6210\u5458"{name}"\u5DF2\u5728\u534F\u8BAE\u7C7B"{classType}"\u4E2D\u58F0\u660E',
@@ -36926,6 +37080,7 @@ var require_package_nls_zh_tw = __commonJS({
         memberSetClassVar: '\u7121\u6CD5\u900F\u904E\u985E\u5225\u57F7\u884C\u500B\u9AD4\u6307\u6D3E\u6210\u54E1 "{name}"\uFF0C\u56E0\u70BA\u5B83\u662F ClassVar',
         memberTypeMismatch: '"{name}" \u662F\u4E0D\u76F8\u5BB9\u7684\u985E\u578B',
         memberUnknown: '\u6210\u54E1 "{name}" \u672A\u77E5',
+        metaclassConflict: 'Metaclass "{metaclass1}" conflicts with "{metaclass2}"',
         missingDeleter: "\u5C6C\u6027 deleter \u65B9\u6CD5\u907A\u5931",
         missingGetter: "\u5C6C\u6027 getter \u65B9\u6CD5\u907A\u5931",
         missingProtocolMember: '\u6210\u54E1 "{name}" \u5DF2\u5728\u901A\u8A0A\u5354\u5B9A\u985E\u5225 "{classType}" \u4E2D\u5BA3\u544A',
@@ -37123,6 +37278,7 @@ var require_localize = __commonJS({
     }
     var localeOverride;
     function setLocaleOverride(locale) {
+      localizedStrings = void 0;
       localeOverride = locale.toLowerCase();
     }
     exports.setLocaleOverride = setLocaleOverride;
@@ -38354,6 +38510,7 @@ var require_typeEvaluatorTypes = __commonJS({
       EvaluatorFlags2[EvaluatorFlags2["InterpreterParsesStringLiteral"] = 4194304] = "InterpreterParsesStringLiteral";
       EvaluatorFlags2[EvaluatorFlags2["AllowUnpackedTypedDict"] = 8388608] = "AllowUnpackedTypedDict";
       EvaluatorFlags2[EvaluatorFlags2["DisallowPep695TypeAlias"] = 16777216] = "DisallowPep695TypeAlias";
+      EvaluatorFlags2[EvaluatorFlags2["SkipConvertParamSpecToRuntimeObject"] = 33554432] = "SkipConvertParamSpecToRuntimeObject";
       EvaluatorFlags2[EvaluatorFlags2["CallBaseDefaults"] = 16777218] = "CallBaseDefaults";
       EvaluatorFlags2[EvaluatorFlags2["IndexBaseDefaults"] = 2] = "IndexBaseDefaults";
       EvaluatorFlags2[EvaluatorFlags2["MemberAccessBaseDefaults"] = 16777218] = "MemberAccessBaseDefaults";
@@ -39210,17 +39367,20 @@ var require_constraintSolver = __commonJS({
     function logTypeVarSignatureContext(evaluator, context, indent) {
       let loggedConstraint = false;
       context.getTypeVars().forEach((entry) => {
+        var _a;
         const typeVarName = `${indent}${entry.typeVar.details.name}`;
-        if (entry.narrowBound && entry.wideBound && (0, types_1.isTypeSame)(entry.narrowBound, entry.wideBound)) {
-          console.log(`${typeVarName} = ${evaluator.printType(entry.narrowBound)}`);
+        const narrowBound = (_a = entry.narrowBoundNoLiterals) !== null && _a !== void 0 ? _a : entry.narrowBound;
+        const wideBound = entry.wideBound;
+        if (narrowBound && wideBound && (0, types_1.isTypeSame)(narrowBound, wideBound)) {
+          console.log(`${typeVarName} = ${evaluator.printType(narrowBound)}`);
           loggedConstraint = true;
         } else {
-          if (entry.narrowBound) {
-            console.log(`${typeVarName} \u2264 ${evaluator.printType(entry.narrowBound)}`);
+          if (narrowBound) {
+            console.log(`${typeVarName} \u2264 ${evaluator.printType(narrowBound)}`);
             loggedConstraint = true;
           }
-          if (entry.wideBound) {
-            console.log(`${typeVarName} \u2265 ${evaluator.printType(entry.wideBound)}`);
+          if (wideBound) {
+            console.log(`${typeVarName} \u2265 ${evaluator.printType(wideBound)}`);
             loggedConstraint = true;
           }
         }
@@ -39281,7 +39441,7 @@ var require_typedDicts = __commonJS({
     var typeUtils_1 = require_typeUtils();
     var typeVarContext_1 = require_typeVarContext();
     function createTypedDictType(evaluator, errorNode, typedDictClass, argList) {
-      var _a, _b;
+      var _a;
       const fileInfo = AnalyzerNodeInfo.getFileInfo(errorNode);
       let className = "TypedDict";
       if (argList.length === 0) {
@@ -39359,13 +39519,11 @@ var require_typedDicts = __commonJS({
       }
       if (usingDictSyntax) {
         for (const arg of argList.slice(2)) {
-          if (((_a = arg.name) === null || _a === void 0 ? void 0 : _a.value) === "total" || ((_b = arg.name) === null || _b === void 0 ? void 0 : _b.value) === "readonly") {
+          if (((_a = arg.name) === null || _a === void 0 ? void 0 : _a.value) === "total") {
             if (!arg.valueExpression || arg.valueExpression.nodeType !== 11 || !(arg.valueExpression.constType === 15 || arg.valueExpression.constType === 33)) {
               evaluator.addError(localize_1.Localizer.Diagnostic.typedDictBoolParam().format({ name: arg.name.value }), arg.valueExpression || errorNode);
             } else if (arg.name.value === "total" && arg.valueExpression.constType === 15) {
               classType.details.flags |= 256;
-            } else if (arg.name.value === "readonly" && arg.valueExpression.constType === 33) {
-              classType.details.flags |= 512;
             }
           } else {
             evaluator.addError(localize_1.Localizer.Diagnostic.typedDictExtraArgs(), arg.valueExpression || errorNode);
@@ -39720,7 +39878,7 @@ var require_typedDicts = __commonJS({
             name: "",
             type: types_1.AnyType.create()
           });
-          return types_1.OverloadedFunctionType.create([updateMethod1, updateMethod2, updateMethod3]);
+          return types_1.OverloadedFunctionType.create([updateMethod2, updateMethod1, updateMethod3]);
         };
         const selfParam = {
           category: 0,
@@ -39922,7 +40080,7 @@ var require_typedDicts = __commonJS({
             let valueType = evaluator.getEffectiveTypeOfSymbol(symbol);
             valueType = (0, typeUtils_1.applySolvedTypeVars)(valueType, typeVarContext);
             let isRequired = !types_1.ClassType.isCanOmitDictValues(classType);
-            let isReadOnly = types_1.ClassType.isDictValuesReadOnly(classType);
+            let isReadOnly = false;
             if (isRequiredTypedDictVariable(evaluator, symbol)) {
               isRequired = true;
             } else if (isNotRequiredTypedDictVariable(evaluator, symbol)) {
@@ -43347,7 +43505,7 @@ var require_codeFlowEngine = __commonJS({
               }
               if (curFlowNode.flags & codeFlowTypes_1.FlowFlags.Call) {
                 const callFlowNode = curFlowNode;
-                if (!(options === null || options === void 0 ? void 0 : options.skipNoReturnCallAnalysis) && isCallNoReturn(evaluator, callFlowNode)) {
+                if (isCallNoReturn(evaluator, callFlowNode)) {
                   return setCacheEntry(
                     curFlowNode,
                     /* type */
@@ -54815,6 +54973,7 @@ var require_protocols = __commonJS({
             return;
           }
           let srcMemberType;
+          let isSrcReadOnly = false;
           if ((0, types_1.isClass)(srcType)) {
             if (treatSourceAsInstantiable && srcType.details.effectiveMetaclass && (0, types_1.isInstantiableClass)(srcType.details.effectiveMetaclass)) {
               srcMemberInfo = (0, typeUtils_1.lookUpClassMember)(srcType.details.effectiveMetaclass, name);
@@ -54867,6 +55026,9 @@ var require_protocols = __commonJS({
                 }
               }
             }
+            if (types_1.ClassType.isFrozenDataClass(srcType) || types_1.ClassType.isReadOnlyInstanceVariables(srcType)) {
+              isSrcReadOnly = true;
+            }
           } else {
             srcSymbol = srcType.fields.get(name);
             if (!srcSymbol) {
@@ -54943,6 +55105,19 @@ var require_protocols = __commonJS({
                 }
                 typesAreConsistent = false;
               }
+              if (isSrcReadOnly) {
+                if ((0, typeUtils_1.lookUpClassMember)(
+                  destMemberType,
+                  "__set__",
+                  8
+                  /* SkipInstanceVariables */
+                )) {
+                  if (subDiag) {
+                    subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberIsWritableInProtocol().format({ name }));
+                  }
+                  typesAreConsistent = false;
+                }
+              }
             }
           } else {
             const primaryDecl = destSymbol.getDeclarations()[0];
@@ -54987,9 +55162,14 @@ var require_protocols = __commonJS({
           const destPrimaryDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(destSymbol);
           const srcPrimaryDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(srcSymbol);
           if ((destPrimaryDecl === null || destPrimaryDecl === void 0 ? void 0 : destPrimaryDecl.type) === 1 && (srcPrimaryDecl === null || srcPrimaryDecl === void 0 ? void 0 : srcPrimaryDecl.type) === 1) {
-            const isDestConst = !!destPrimaryDecl.isConstant;
-            const isSrcConst = srcMemberInfo && (0, types_1.isClass)(srcMemberInfo.classType) && types_1.ClassType.isReadOnlyInstanceVariables(srcMemberInfo.classType) || !!srcPrimaryDecl.isConstant;
-            if (!isDestConst && isSrcConst) {
+            const isDestReadOnly = !!destPrimaryDecl.isConstant;
+            let isSrcReadOnly2 = !!srcPrimaryDecl.isConstant;
+            if (srcMemberInfo && (0, types_1.isClass)(srcMemberInfo.classType)) {
+              if (types_1.ClassType.isReadOnlyInstanceVariables(srcMemberInfo.classType) || types_1.ClassType.isFrozenDataClass(srcMemberInfo.classType)) {
+                isSrcReadOnly2 = true;
+              }
+            }
+            if (!isDestReadOnly && isSrcReadOnly2) {
               if (subDiag) {
                 subDiag.addMessage(localize_1.Localizer.DiagnosticAddendum.memberIsWritableInProtocol().format({ name }));
               }
@@ -57899,10 +58079,7 @@ var require_typeEvaluator = __commonJS({
           /* targetSymbolId */
           void 0,
           /* typeAtStart */
-          types_1.UnboundType.create(),
-          {
-            skipNoReturnCallAnalysis: true
-          }
+          types_1.UnboundType.create()
         );
         return codeFlowResult.type !== void 0 && !(0, types_1.isNever)(codeFlowResult.type);
       }
@@ -58897,7 +59074,6 @@ var require_typeEvaluator = __commonJS({
         return void 0;
       }
       function getTypeOfName(node, flags) {
-        var _a;
         const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
         const name = node.value;
         let symbol;
@@ -59024,17 +59200,7 @@ var require_typeEvaluator = __commonJS({
             type = types_1.UnknownType.create();
           }
         }
-        if ((0, types_1.isTypeVar)(type) && !type.details.isParamSpec && !type.isVariadicInUnion && (flags & 128) === 0 && type.details.name === name) {
-          const isPep604Union = ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 7 && node.parent.operator === 6;
-          if (!isPep604Union) {
-            const typeVarType = type.details.isVariadic ? getTypingType(node, "TypeVarTuple") : getTypingType(node, "TypeVar");
-            if (typeVarType && (0, types_1.isInstantiableClass)(typeVarType)) {
-              type = types_1.ClassType.cloneAsInstance(typeVarType);
-            } else {
-              type = types_1.UnknownType.create();
-            }
-          }
-        }
+        type = convertTypeVarToRuntimeInstance(node, type, flags);
         if ((flags & 256) === 0) {
           reportUseOfTypeCheckOnly(type, node);
         }
@@ -59055,6 +59221,23 @@ var require_typeEvaluator = __commonJS({
         }
         return { type, isIncomplete };
       }
+      function convertTypeVarToRuntimeInstance(node, type, flags) {
+        var _a;
+        if (node.nodeType === 38 && (0, types_1.isTypeVar)(type) && node.value === type.details.name && !type.isVariadicInUnion && (flags & 128) === 0) {
+          if ((flags & 33554432) !== 0 && type.details.isParamSpec) {
+            return type;
+          }
+          const isPep604Union = ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 7 && node.parent.operator === 6;
+          if (!isPep604Union) {
+            if (type.details.runtimeClass) {
+              type = types_1.ClassType.cloneAsInstance(type.details.runtimeClass);
+            } else {
+              type = types_1.UnknownType.create();
+            }
+          }
+        }
+        return type;
+      }
       function getCodeFlowTypeForCapturedVariable(node, symbolWithScope, effectiveType) {
         const decls = symbolWithScope.symbol.getDeclarations();
         if (!decls.every(
@@ -59325,8 +59508,15 @@ var require_typeEvaluator = __commonJS({
         return { type, isRescoped: false, foundInterveningClass: false };
       }
       function getTypeOfMemberAccess(node, flags) {
-        const baseTypeFlags = 16777218 | flags & (256 | 32768 | 4 | 524288 | 2048 | 8192);
-        const baseTypeResult = getTypeOfExpression(node.leftExpression, baseTypeFlags);
+        let leftExprFlags = 16777218;
+        leftExprFlags |= flags & (256 | 32768 | 4 | 524288 | 2048 | 8192);
+        if ((flags & 128) !== 0) {
+          const memberName = node.memberName.value;
+          if (memberName === "args" || memberName === "kwargs") {
+            leftExprFlags |= 33554432;
+          }
+        }
+        const baseTypeResult = getTypeOfExpression(node.leftExpression, leftExprFlags);
         if ((0, typeUtils_1.isTypeAliasPlaceholder)(baseTypeResult.type)) {
           return {
             type: types_1.UnknownType.create(
@@ -61354,7 +61544,7 @@ var require_typeEvaluator = __commonJS({
         } else {
           baseTypeResult = getTypeOfExpression(node.leftExpression, 16777218 | flags & 4);
         }
-        const argList = node.arguments.map((arg) => {
+        const argList = ParseTreeUtils.getArgumentsByRuntimeOrder(node).map((arg) => {
           const functionArg = {
             valueExpression: arg.valueExpression,
             argumentCategory: arg.argumentCategory,
@@ -63779,7 +63969,8 @@ var require_typeEvaluator = __commonJS({
         const typeVar = types_1.TypeVarType.createInstantiable(
           typeVarName,
           /* isParamSpec */
-          false
+          false,
+          classType
         );
         const paramNameMap = /* @__PURE__ */ new Map();
         for (let i = 1; i < argList.length; i++) {
@@ -63888,7 +64079,8 @@ var require_typeEvaluator = __commonJS({
         const typeVar = types_1.TypeVarType.createInstantiable(
           typeVarName,
           /* isParamSpec */
-          false
+          false,
+          classType
         );
         typeVar.details.isVariadic = true;
         for (let i = 1; i < argList.length; i++) {
@@ -63939,7 +64131,8 @@ var require_typeEvaluator = __commonJS({
         const paramSpec = types_1.TypeVarType.createInstantiable(
           paramSpecName,
           /* isParamSpec */
-          true
+          true,
+          classType
         );
         for (let i = 1; i < argList.length; i++) {
           const paramNameNode = argList[i].name;
@@ -65011,21 +65204,6 @@ var require_typeEvaluator = __commonJS({
         return { type: returnedType };
       }
       function getTypeOfLambda(node, inferenceContext) {
-        let isIncomplete = !!(inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.isTypeIncomplete);
-        const functionType = types_1.FunctionType.createInstance(
-          "",
-          "",
-          "",
-          131072
-          /* PartiallyEvaluated */
-        );
-        functionType.details.typeVarScopeId = ParseTreeUtils.getScopeIdForNode(node);
-        writeTypeCache(
-          node,
-          { type: functionType, isIncomplete: true },
-          0
-          /* None */
-        );
         let expectedFunctionTypes = [];
         if (inferenceContext) {
           (0, typeUtils_1.mapSubtypes)(inferenceContext.expectedType, (subtype) => {
@@ -65040,21 +65218,61 @@ var require_typeEvaluator = __commonJS({
             }
             return void 0;
           });
-          const minLambdaParamCount = node.parameters.filter((param) => param.category === 0 && !!param.name && param.defaultValue === void 0).length;
-          const maxLambdaParamCount = node.parameters.filter((param) => param.category === 0 && !!param.name).length;
-          expectedFunctionTypes = expectedFunctionTypes.filter((functionType2) => {
-            const functionParamCount = functionType2.details.parameters.filter((param) => !!param.name && !param.hasDefault).length;
-            const hasVarArgs = functionType2.details.parameters.some(
-              (param) => !!param.name && param.category !== 0
-              /* Simple */
+        }
+        if (expectedFunctionTypes.length <= 1) {
+          return getTypeOfLambdaWithExpectedType(
+            node,
+            expectedFunctionTypes.length > 0 ? expectedFunctionTypes[0] : void 0,
+            inferenceContext,
+            /* forceSpeculative */
+            false
+          );
+        }
+        expectedFunctionTypes = (0, typeUtils_1.sortTypes)(expectedFunctionTypes);
+        for (const expectedFunctionType of expectedFunctionTypes) {
+          const result = getTypeOfLambdaWithExpectedType(
+            node,
+            expectedFunctionType,
+            inferenceContext,
+            /* forceSpeculative */
+            true
+          );
+          if (!result.typeErrors) {
+            return getTypeOfLambdaWithExpectedType(
+              node,
+              expectedFunctionType,
+              inferenceContext,
+              /* forceSpeculative */
+              false
             );
-            const hasParamSpec = !!functionType2.details.paramSpec;
-            return hasVarArgs || hasParamSpec || functionParamCount >= minLambdaParamCount && functionParamCount <= maxLambdaParamCount;
-          });
+          }
         }
-        const expectedFunctionType = expectedFunctionTypes.length > 0 ? expectedFunctionTypes[0] : void 0;
+        return getTypeOfLambdaWithExpectedType(
+          node,
+          expectedFunctionTypes[0],
+          inferenceContext,
+          /* forceSpeculative */
+          true
+        );
+      }
+      function getTypeOfLambdaWithExpectedType(node, expectedType, inferenceContext, forceSpeculative) {
+        let isIncomplete = !!(inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.isTypeIncomplete);
         let paramsArePositionOnly = true;
-        const expectedParamDetails = expectedFunctionType ? (0, parameterUtils_1.getParameterListDetails)(expectedFunctionType) : void 0;
+        const expectedParamDetails = expectedType ? (0, parameterUtils_1.getParameterListDetails)(expectedType) : void 0;
+        const functionType = types_1.FunctionType.createInstance(
+          "",
+          "",
+          "",
+          131072
+          /* PartiallyEvaluated */
+        );
+        functionType.details.typeVarScopeId = ParseTreeUtils.getScopeIdForNode(node);
+        writeTypeCache(
+          node,
+          { type: functionType, isIncomplete: true },
+          0
+          /* None */
+        );
         node.parameters.forEach((param, index) => {
           let paramType;
           if (expectedParamDetails) {
@@ -65114,8 +65332,9 @@ var require_typeEvaluator = __commonJS({
             type: types_1.UnknownType.create()
           });
         }
-        const expectedReturnType = expectedFunctionType ? getFunctionEffectiveReturnType(expectedFunctionType) : void 0;
-        useSpeculativeMode(isSpeculativeModeInUse(node) || (inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.isTypeIncomplete) ? node.expression : void 0, () => {
+        const expectedReturnType = expectedType ? getFunctionEffectiveReturnType(expectedType) : void 0;
+        let typeErrors = false;
+        useSpeculativeMode(forceSpeculative || isSpeculativeModeInUse(node) || (inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.isTypeIncomplete) ? node.expression : void 0, () => {
           const returnTypeResult = getTypeOfExpression(
             node.expression,
             /* flags */
@@ -65126,11 +65345,17 @@ var require_typeEvaluator = __commonJS({
           if (returnTypeResult.isIncomplete) {
             isIncomplete = true;
           }
+          if (returnTypeResult.typeErrors) {
+            typeErrors = true;
+          }
         }, {
-          dependentType: inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.expectedType
+          dependentType: expectedType
         });
         functionType.details.flags &= ~131072;
-        return { type: functionType, isIncomplete };
+        if (expectedType && !assignType(expectedType, functionType)) {
+          typeErrors = true;
+        }
+        return { type: functionType, isIncomplete, typeErrors };
       }
       function getTypeOfListComprehension(node, inferenceContext) {
         var _a;
@@ -66619,14 +66844,12 @@ var require_typeEvaluator = __commonJS({
               } else {
                 metaclassNode = arg.valueExpression;
               }
-            } else if (types_1.ClassType.isTypedDictClass(classType) && (arg.name.value === "total" || arg.name.value === "readonly")) {
+            } else if (types_1.ClassType.isTypedDictClass(classType) && arg.name.value === "total") {
               const constArgValue = (0, staticExpressions_1.evaluateStaticBoolExpression)(arg.valueExpression, fileInfo.executionEnvironment, fileInfo.definedConstants);
               if (constArgValue === void 0) {
                 addError(localize_1.Localizer.Diagnostic.typedDictBoolParam().format({ name: arg.name.value }), arg.valueExpression);
               } else if (arg.name.value === "total" && !constArgValue) {
                 classType.details.flags |= 256;
-              } else if (arg.name.value === "readonly" && constArgValue) {
-                classType.details.flags |= 512;
               }
             } else {
               initSubclassArgs.push({
@@ -69355,6 +69578,16 @@ var require_typeEvaluator = __commonJS({
                     /* Parameter */
                   );
                 }
+                const parameterDetails = (0, parameterUtils_1.getParameterListDetails)(type);
+                if (parameterDetails.unpackedKwargsTypedDictType) {
+                  const lookupResults = (0, typeUtils_1.lookUpClassMember)(parameterDetails.unpackedKwargsTypedDictType, paramName);
+                  if (lookupResults) {
+                    return lookupResults.symbol.getDeclarations().find(
+                      (decl) => decl.type === 1
+                      /* Variable */
+                    );
+                  }
+                }
               }
             }
           }
@@ -69666,12 +69899,18 @@ var require_typeEvaluator = __commonJS({
         if (cachedTypeVarType && (0, types_1.isTypeVar)(cachedTypeVarType)) {
           return cachedTypeVarType;
         }
-        let typeVar = types_1.TypeVarType.createInstantiable(node.name.value);
+        let runtimeClassName = "TypeVar";
+        if (node.typeParamCategory === parseNodes_1.TypeParameterCategory.TypeVarTuple) {
+          runtimeClassName = "TypeVarTuple";
+        } else if (node.typeParamCategory === parseNodes_1.TypeParameterCategory.ParamSpec) {
+          runtimeClassName = "ParamSpec";
+        }
+        const runtimeType = getTypingType(node, runtimeClassName);
+        const runtimeClass = runtimeType && (0, types_1.isInstantiableClass)(runtimeType) ? runtimeType : void 0;
+        let typeVar = types_1.TypeVarType.createInstantiable(node.name.value, node.typeParamCategory === parseNodes_1.TypeParameterCategory.ParamSpec, runtimeClass);
         typeVar.details.isTypeParamSyntax = true;
         if (node.typeParamCategory === parseNodes_1.TypeParameterCategory.TypeVarTuple) {
           typeVar.details.isVariadic = true;
-        } else if (node.typeParamCategory === parseNodes_1.TypeParameterCategory.ParamSpec) {
-          typeVar.details.isParamSpec = true;
         }
         writeTypeCache(
           node,
@@ -69953,7 +70192,6 @@ var require_typeEvaluator = __commonJS({
         return getEffectiveTypeOfSymbolForUsage(symbol).type;
       }
       function getEffectiveTypeOfSymbolForUsage(symbol, usageNode, useLastDecl = false) {
-        var _a, _b;
         let declaredTypeInfo;
         if (symbol.hasTypedDeclarations()) {
           declaredTypeInfo = getDeclaredTypeOfSymbol(symbol, usageNode);
@@ -69986,13 +70224,9 @@ var require_typeEvaluator = __commonJS({
         let cacheEntries = effectiveTypeCache.get(symbol.id);
         const usageNodeId = usageNode ? usageNode.id : void 0;
         const effectiveTypeCacheKey = `${usageNodeId === void 0 ? "." : usageNodeId.toString()}${useLastDecl ? "*" : ""}`;
-        if (cacheEntries) {
-          const result2 = cacheEntries.get(effectiveTypeCacheKey);
-          if (result2) {
-            if (!result2.isIncomplete) {
-              return result2;
-            }
-          }
+        const cacheEntry = cacheEntries === null || cacheEntries === void 0 ? void 0 : cacheEntries.get(effectiveTypeCacheKey);
+        if (cacheEntry && !cacheEntry.isIncomplete) {
+          return cacheEntry;
         }
         const decls = symbol.getDeclarations();
         let declIndexToConsider;
@@ -70028,7 +70262,7 @@ var require_typeEvaluator = __commonJS({
         const declsToConsider = [];
         let sawExplicitTypeAlias = false;
         decls.forEach((decl, index) => {
-          var _a2, _b2, _c;
+          var _a, _b, _c;
           if (declIndexToConsider !== void 0 && declIndexToConsider !== index) {
             return;
           }
@@ -70049,26 +70283,25 @@ var require_typeEvaluator = __commonJS({
               }
             }
           }
-          const resolvedDecl = (_a2 = resolveAliasDeclaration(
+          const resolvedDecl = (_a = resolveAliasDeclaration(
             decl,
             /* resolveLocalNames */
             true,
             {
               allowExternallyHiddenAccess: AnalyzerNodeInfo.getFileInfo(decl.node).isStubFile
             }
-          )) !== null && _a2 !== void 0 ? _a2 : decl;
+          )) !== null && _a !== void 0 ? _a : decl;
           const isExplicitTypeAlias = isExplicitTypeAliasDeclaration(resolvedDecl);
           const isTypeAlias = isExplicitTypeAlias || isPossibleTypeAliasOrTypedDict(resolvedDecl);
           if (isExplicitTypeAlias) {
             sawExplicitTypeAlias = true;
           }
-          if (isTypeAlias && resolvedDecl.type === 1 && ((_c = (_b2 = resolvedDecl.inferredTypeSource) === null || _b2 === void 0 ? void 0 : _b2.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 3) {
+          if (isTypeAlias && resolvedDecl.type === 1 && ((_c = (_b = resolvedDecl.inferredTypeSource) === null || _b === void 0 ? void 0 : _b.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 3) {
             evaluateTypesForAssignmentStatement(resolvedDecl.inferredTypeSource.parent);
           }
           declsToConsider.push(resolvedDecl);
         });
-        const evaluationAttempts = ((_b = (_a = cacheEntries === null || cacheEntries === void 0 ? void 0 : cacheEntries.get(effectiveTypeCacheKey)) === null || _a === void 0 ? void 0 : _a.evaluationAttempts) !== null && _b !== void 0 ? _b : 0) + 1;
-        const result = getTypeOfSymbolForDecls(symbol, declsToConsider, evaluationAttempts);
+        const result = getTypeOfSymbolForDecls(symbol, declsToConsider, effectiveTypeCacheKey);
         if (!result.includesSpeculativeResult) {
           addToEffectiveTypeCache(result);
         }
@@ -70081,7 +70314,8 @@ var require_typeEvaluator = __commonJS({
           cacheEntries.set(effectiveTypeCacheKey, result2);
         }
       }
-      function getTypeOfSymbolForDecls(symbol, decls, evaluationAttempts) {
+      function getTypeOfSymbolForDecls(symbol, decls, typeCacheKey) {
+        var _a, _b;
         const typesToCombine = [];
         let isIncomplete = false;
         let sawPendingEvaluation = false;
@@ -70135,6 +70369,8 @@ var require_typeEvaluator = __commonJS({
             sawPendingEvaluation = true;
           }
         });
+        const cacheEntries = effectiveTypeCache.get(symbol.id);
+        const evaluationAttempts = ((_b = (_a = cacheEntries === null || cacheEntries === void 0 ? void 0 : cacheEntries.get(typeCacheKey)) === null || _a === void 0 ? void 0 : _a.evaluationAttempts) !== null && _b !== void 0 ? _b : 0) + 1;
         let type;
         if (typesToCombine.length > 0) {
           isIncomplete = sawPendingEvaluation && evaluationAttempts < maxEffectiveTypeEvaluationAttempts;
@@ -73874,147 +74110,6 @@ var require_typeStubWriter = __commonJS({
   }
 });
-// node_modules/@zzzen/pyright-internal/dist/analyzer/sourceFileInfo.js
-var require_sourceFileInfo = __commonJS({
-  "node_modules/@zzzen/pyright-internal/dist/analyzer/sourceFileInfo.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.SourceFileInfo = void 0;
-    var SourceFileInfo = class {
-      constructor(sourceFile, isTypeshedFile, isThirdPartyImport, isThirdPartyPyTypedPresent, _editModeTracker, args = {}) {
-        this.sourceFile = sourceFile;
-        this.isTypeshedFile = isTypeshedFile;
-        this.isThirdPartyImport = isThirdPartyImport;
-        this.isThirdPartyPyTypedPresent = isThirdPartyPyTypedPresent;
-        this._editModeTracker = _editModeTracker;
-        this.isCreatedInEditMode = this._editModeTracker.isEditMode;
-        this._writableData = this._createWriteableData(args);
-        this._cachePreEditState();
-      }
-      get diagnosticsVersion() {
-        return this._writableData.diagnosticsVersion;
-      }
-      get builtinsImport() {
-        return this._writableData.builtinsImport;
-      }
-      get ipythonDisplayImport() {
-        return this._writableData.ipythonDisplayImport;
-      }
-      // Information about the chained source file
-      // Chained source file is not supposed to exist on file system but
-      // must exist in the program's source file list. Module level
-      // scope of the chained source file will be inserted before
-      // current file's scope.
-      get chainedSourceFile() {
-        return this._writableData.chainedSourceFile;
-      }
-      get effectiveFutureImports() {
-        return this._writableData.effectiveFutureImports;
-      }
-      // Information about why the file is included in the program
-      // and its relation to other source files in the program.
-      get isTracked() {
-        return this._writableData.isTracked;
-      }
-      get isOpenByClient() {
-        return this._writableData.isOpenByClient;
-      }
-      get imports() {
-        return this._writableData.imports;
-      }
-      get importedBy() {
-        return this._writableData.importedBy;
-      }
-      get shadows() {
-        return this._writableData.shadows;
-      }
-      get shadowedBy() {
-        return this._writableData.shadowedBy;
-      }
-      set diagnosticsVersion(value) {
-        this._cachePreEditState();
-        this._writableData.diagnosticsVersion = value;
-      }
-      set builtinsImport(value) {
-        this._cachePreEditState();
-        this._writableData.builtinsImport = value;
-      }
-      set ipythonDisplayImport(value) {
-        this._cachePreEditState();
-        this._writableData.ipythonDisplayImport = value;
-      }
-      set chainedSourceFile(value) {
-        this._cachePreEditState();
-        this._writableData.chainedSourceFile = value;
-      }
-      set effectiveFutureImports(value) {
-        this._cachePreEditState();
-        this._writableData.effectiveFutureImports = value;
-      }
-      set isTracked(value) {
-        this._cachePreEditState();
-        this._writableData.isTracked = value;
-      }
-      set isOpenByClient(value) {
-        this._cachePreEditState();
-        this._writableData.isOpenByClient = value;
-      }
-      mutate(callback) {
-        this._cachePreEditState();
-        callback(this._writableData);
-      }
-      restore() {
-        if (this._preEditData) {
-          this._writableData = this._preEditData;
-          this._preEditData = void 0;
-          this.sourceFile.dropParseAndBindInfo();
-        }
-        return this.sourceFile.restore();
-      }
-      _cachePreEditState() {
-        if (!this._editModeTracker.isEditMode || this._preEditData) {
-          return;
-        }
-        this._preEditData = this._writableData;
-        this._writableData = this._cloneWriteableData(this._writableData);
-        this._editModeTracker.addMutatedFiles(this);
-      }
-      _createWriteableData(args) {
-        var _a, _b;
-        return {
-          isTracked: (_a = args.isTracked) !== null && _a !== void 0 ? _a : false,
-          isOpenByClient: (_b = args.isOpenByClient) !== null && _b !== void 0 ? _b : false,
-          builtinsImport: args.builtinsImport,
-          chainedSourceFile: args.chainedSourceFile,
-          diagnosticsVersion: args.diagnosticsVersion,
-          effectiveFutureImports: args.effectiveFutureImports,
-          ipythonDisplayImport: args.ipythonDisplayImport,
-          imports: [],
-          importedBy: [],
-          shadows: [],
-          shadowedBy: []
-        };
-      }
-      _cloneWriteableData(data) {
-        return {
-          isTracked: data.isTracked,
-          isOpenByClient: data.isOpenByClient,
-          builtinsImport: data.builtinsImport,
-          chainedSourceFile: data.chainedSourceFile,
-          diagnosticsVersion: data.diagnosticsVersion,
-          effectiveFutureImports: data.effectiveFutureImports,
-          ipythonDisplayImport: data.ipythonDisplayImport,
-          imports: data.imports.slice(),
-          importedBy: data.importedBy.slice(),
-          shadows: data.shadows.slice(),
-          shadowedBy: data.shadowedBy.slice()
-        };
-      }
-    };
-    exports.SourceFileInfo = SourceFileInfo;
-  }
-});
 // node_modules/@zzzen/pyright-internal/dist/analyzer/program.js
 var require_program = __commonJS({
   "node_modules/@zzzen/pyright-internal/dist/analyzer/program.js"(exports) {
@@ -74068,12 +74163,12 @@ var require_program = __commonJS({
     var circularDependency_1 = require_circularDependency();
     var parseTreeUtils_1 = require_parseTreeUtils();
     var sourceFile_1 = require_sourceFile();
+    var sourceFileInfo_1 = require_sourceFileInfo();
     var sourceFileInfoUtils_1 = require_sourceFileInfoUtils();
     var sourceMapper_1 = require_sourceMapper();
     var tracePrinter_1 = require_tracePrinter();
     var typeEvaluatorWithTracker_1 = require_typeEvaluatorWithTracker();
     var typeStubWriter_1 = require_typeStubWriter();
-    var sourceFileInfo_1 = require_sourceFileInfo();
     var _maxImportDepth = 256;
     var ISourceFileFactory;
     (function(ISourceFileFactory2) {
@@ -74105,7 +74200,8 @@ var require_program = __commonJS({
       }
     };
     var Program = class _Program {
-      constructor(initialImportResolver, initialConfigOptions, serviceProvider, logTracker, _disableChecker, cacheManager, id) {
+      constructor(initialImportResolver, initialConfigOptions, serviceProvider, logTracker, _disableChecker, id) {
+        var _a;
         this.serviceProvider = serviceProvider;
         this._disableChecker = _disableChecker;
         this._sourceFileList = [];
@@ -74113,7 +74209,7 @@ var require_program = __commonJS({
         this._parsedFileCount = 0;
         this._editModeTracker = new EditModeTracker();
         this._lookUpImport = (filePathOrModule, options) => {
-          var _a;
+          var _a2;
           let sourceFileInfo;
           if (typeof filePathOrModule === "string") {
             sourceFileInfo = this.getSourceFileInfo(filePathOrModule);
@@ -74169,7 +74265,7 @@ var require_program = __commonJS({
           return {
             symbolTable,
             dunderAllNames: dunderAllInfo === null || dunderAllInfo === void 0 ? void 0 : dunderAllInfo.names,
-            usesUnsupportedDunderAllForm: (_a = dunderAllInfo === null || dunderAllInfo === void 0 ? void 0 : dunderAllInfo.usesUnsupportedDunderAllForm) !== null && _a !== void 0 ? _a : false,
+            usesUnsupportedDunderAllForm: (_a2 = dunderAllInfo === null || dunderAllInfo === void 0 ? void 0 : dunderAllInfo.usesUnsupportedDunderAllForm) !== null && _a2 !== void 0 ? _a2 : false,
             get docString() {
               return (0, parseTreeUtils_1.getDocString)(moduleNode.statements);
             },
@@ -74181,7 +74277,7 @@ var require_program = __commonJS({
         this._importResolver = initialImportResolver;
         this._configOptions = initialConfigOptions;
         this._sourceFileFactory = serviceProvider.sourceFileFactory();
-        this._cacheManager = cacheManager !== null && cacheManager !== void 0 ? cacheManager : new cacheManager_1.CacheManager();
+        this._cacheManager = (_a = serviceProvider.tryGet(serviceProviderExtensions_1.ServiceKeys.cacheManager)) !== null && _a !== void 0 ? _a : new cacheManager_1.CacheManager();
         this._cacheManager.registerCacheOwner(this);
         this._createNewEvaluator();
         this._id = id !== null && id !== void 0 ? id : `Prog_${_Program._nextId}`;
@@ -75079,12 +75175,6 @@ var require_program = __commonJS({
           const resolvedBuiltinsPath = builtinsImport.resolvedPaths[builtinsImport.resolvedPaths.length - 1];
           sourceFileInfo.builtinsImport = this.getSourceFileInfo(resolvedBuiltinsPath);
         }
-        sourceFileInfo.ipythonDisplayImport = void 0;
-        const ipythonDisplayImport = sourceFileInfo.sourceFile.getIPythonDisplayImport();
-        if (ipythonDisplayImport && ipythonDisplayImport.isImportFound) {
-          const resolvedIPythonDisplayPath = ipythonDisplayImport.resolvedPaths[ipythonDisplayImport.resolvedPaths.length - 1];
-          sourceFileInfo.ipythonDisplayImport = this.getSourceFileInfo(resolvedIPythonDisplayPath);
-        }
         return filesAdded;
       }
       _removeSourceFileFromListAndMap(filePath, indexToRemove) {
@@ -75143,27 +75233,19 @@ var require_program = __commonJS({
         return shadowFileInfo.sourceFile;
       }
       _createInterimFileInfo(filePath) {
-        const importName = this._getImportNameForFile(filePath);
-        const sourceFile = this._sourceFileFactory.createSourceFile(
-          this.serviceProvider,
+        const moduleImportInfo = this._importResolver.getModuleNameForImport(
           filePath,
-          importName,
-          /* isThirdPartyImport */
-          false,
-          /* isInPyTypedPackage */
-          false,
-          this._editModeTracker,
-          this._console,
-          this._logTracker
+          this._configOptions.getDefaultExecEnvironment(),
+          /* allowIllegalModuleName */
+          true
         );
+        const sourceFile = this._sourceFileFactory.createSourceFile(this.serviceProvider, filePath, moduleImportInfo.moduleName, moduleImportInfo.importType === 1, moduleImportInfo.isThirdPartyPyTypedPresent, this._editModeTracker, this._console, this._logTracker);
         const sourceFileInfo = new sourceFileInfo_1.SourceFileInfo(
           sourceFile,
           /* isTypeshedFile */
           false,
-          /* isThirdPartyImport */
-          false,
-          /* isThirdPartyPyTypedPresent */
-          false,
+          moduleImportInfo.importType === 1,
+          moduleImportInfo.isThirdPartyPyTypedPresent,
           this._editModeTracker
         );
         return sourceFileInfo;
@@ -75197,7 +75279,7 @@ var require_program = __commonJS({
         }
       }
       _getImplicitImports(file) {
-        var _a, _b;
+        var _a;
         if (file.builtinsImport === file) {
           return void 0;
         }
@@ -75207,7 +75289,7 @@ var require_program = __commonJS({
           }
           return input;
         };
-        return (_b = (_a = tryReturn(file.chainedSourceFile)) !== null && _a !== void 0 ? _a : tryReturn(file.ipythonDisplayImport)) !== null && _b !== void 0 ? _b : file.builtinsImport;
+        return (_a = tryReturn(file.chainedSourceFile)) !== null && _a !== void 0 ? _a : file.builtinsImport;
       }
       _bindImplicitImports(fileToAnalyze, skipFileNeededCheck) {
         const implicitImports = [];
@@ -75246,7 +75328,7 @@ var require_program = __commonJS({
       // Binds the specified file and all of its dependencies, recursively. If
       // it runs out of time, it returns true. If it completes, it returns false.
       _bindFile(fileToAnalyze, content, skipFileNeededCheck, isImplicitImport) {
-        var _a, _b;
+        var _a;
         if (!this._isFileNeeded(fileToAnalyze, skipFileNeededCheck) || !fileToAnalyze.sourceFile.isBindingRequired()) {
           return;
         }
@@ -75270,7 +75352,7 @@ var require_program = __commonJS({
           if (!isImplicitImport) {
             this._bindImplicitImports(fileToAnalyze);
           }
-          builtinsScope = (_b = (_a = getScopeIfAvailable(fileToAnalyze.chainedSourceFile)) !== null && _a !== void 0 ? _a : getScopeIfAvailable(fileToAnalyze.ipythonDisplayImport)) !== null && _b !== void 0 ? _b : getScopeIfAvailable(fileToAnalyze.builtinsImport);
+          builtinsScope = (_a = getScopeIfAvailable(fileToAnalyze.chainedSourceFile)) !== null && _a !== void 0 ? _a : getScopeIfAvailable(fileToAnalyze.builtinsImport);
         }
         let futureImports = fileToAnalyze.sourceFile.getParseResults().futureImports;
         if (fileToAnalyze.chainedSourceFile) {
@@ -75973,6 +76055,7 @@ var require_serviceProviderExtensions = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.createServiceProvider = exports.ServiceKeys = void 0;
+    var cacheManager_1 = require_cacheManager();
     var program_1 = require_program();
     var sourceFile_1 = require_sourceFile();
     var pyrightFileSystem_1 = require_pyrightFileSystem();
@@ -75989,6 +76072,7 @@ var require_serviceProviderExtensions = __commonJS({
       ServiceKeys2.symbolUsageProviderFactory = new serviceProvider_1.GroupServiceKey();
       ServiceKeys2.stateMutationListeners = new serviceProvider_1.GroupServiceKey();
       ServiceKeys2.tempFile = new serviceProvider_1.ServiceKey();
+      ServiceKeys2.cacheManager = new serviceProvider_1.ServiceKey();
     })(ServiceKeys = exports.ServiceKeys || (exports.ServiceKeys = {}));
     function createServiceProvider(...services2) {
       const sp = new serviceProvider_1.ServiceProvider();
@@ -76008,6 +76092,9 @@ var require_serviceProviderExtensions = __commonJS({
         if (fileSystem_1.TempFile.is(service)) {
           sp.add(ServiceKeys.tempFile, service);
         }
+        if (cacheManager_1.CacheManager.is(service)) {
+          sp.add(ServiceKeys.cacheManager, service);
+        }
       });
       return sp;
     }
@@ -76074,8 +76161,8 @@ var require_pathUtils = __commonJS({
     var core_1 = require_core();
     var crypto_1 = require_crypto();
     var debug = __importStar(require_debug2());
-    var stringUtils_1 = require_stringUtils();
     var serviceProviderExtensions_1 = require_serviceProviderExtensions();
+    var stringUtils_1 = require_stringUtils();
     var _fsCaseSensitivity = void 0;
     var _underTest = false;
     var _includeFileRegex = /\.pyi?$/;
@@ -76149,7 +76236,12 @@ var require_pathUtils = __commonJS({
         }
       }
       if (isUri(pathString)) {
-        return vscode_uri_1.URI.parse(pathString).scheme.length + 3;
+        const uri = vscode_uri_1.URI.parse(pathString);
+        if (uri.authority) {
+          return uri.scheme.length + 3;
+        } else {
+          return uri.scheme.length + 2;
+        }
       }
       return 0;
     }
@@ -78318,15 +78410,7 @@ var require_binder = __commonJS({
         var _a, _b;
         this._disableTrueFalseTargets(() => {
           this.walk(node.leftExpression);
-          const positionalArgs = node.arguments.filter(
-            (arg) => !arg.name && arg.argumentCategory !== 2
-            /* UnpackedDictionary */
-          );
-          const keywordArgs = node.arguments.filter(
-            (arg) => !!arg.name || arg.argumentCategory === 2
-            /* UnpackedDictionary */
-          );
-          const sortedArgs = positionalArgs.concat(keywordArgs);
+          const sortedArgs = ParseTreeUtils.getArgumentsByRuntimeOrder(node);
           sortedArgs.forEach((argNode) => {
             if (this._currentFlowNode) {
               AnalyzerNodeInfo.setFlowNode(argNode, this._currentFlowNode);
@@ -82513,6 +82597,7 @@ var require_importResolver = __commonJS({
     var pathConsts_1 = require_pathConsts();
     var pathUtils_1 = require_pathUtils();
     var pythonVersion_1 = require_pythonVersion();
+    var serviceProviderExtensions_1 = require_serviceProviderExtensions();
     var StringUtils = __importStar(require_stringUtils());
     var stringUtils_1 = require_stringUtils();
     var characters_1 = require_characters();
@@ -82522,7 +82607,6 @@ var require_importResolver = __commonJS({
     var PythonPathUtils = __importStar(require_pythonPathUtils());
     var SymbolNameUtils = __importStar(require_symbolNameUtils());
     var symbolNameUtils_1 = require_symbolNameUtils();
-    var serviceProviderExtensions_1 = require_serviceProviderExtensions();
     function createImportedModuleDescriptor(moduleName) {
       if (moduleName.length === 0) {
         return { leadingDots: 0, nameParts: [], importedSymbols: /* @__PURE__ */ new Set() };
@@ -83145,6 +83229,7 @@ var require_importResolver = __commonJS({
         let moduleName;
         let importType = 0;
         let isLocalTypingsFile = false;
+        let isThirdPartyPyTypedPresent = false;
         const importFailureInfo = [];
         let moduleNameWithInvalidCharacters;
         const stdLibTypeshedPath = this._getStdlibTypeshedPath(this._configOptions.typeshedPath, execEnv.pythonVersion, importFailureInfo);
@@ -83157,7 +83242,12 @@ var require_importResolver = __commonJS({
               importedSymbols: void 0
             };
             if (this._isStdlibTypeshedStubValidForVersion(moduleDescriptor, this._configOptions.typeshedPath, execEnv.pythonVersion, [])) {
-              return { moduleName, importType, isLocalTypingsFile };
+              return {
+                moduleName,
+                importType,
+                isLocalTypingsFile,
+                isThirdPartyPyTypedPresent
+              };
             }
           }
         }
@@ -83237,13 +83327,41 @@ var require_importResolver = __commonJS({
             }
           }
         }
+        if (importType === 1) {
+          const root = this.getParentImportResolutionRoot(filePath, execEnv.root);
+          let current = (0, pathUtils_1.ensureTrailingDirectorySeparator)((0, pathUtils_1.getDirectoryPath)(filePath));
+          while (this._shouldWalkUp(current, root, execEnv)) {
+            if (this.fileExistsCached((0, pathUtils_1.combinePaths)(current, "py.typed"))) {
+              const pyTypedInfo = (0, pyTypedUtils_1.getPyTypedInfo)(this.fileSystem, current);
+              if (pyTypedInfo && !pyTypedInfo.isPartiallyTyped) {
+                isThirdPartyPyTypedPresent = true;
+              }
+              break;
+            }
+            let success;
+            [success, current] = this._tryWalkUp(current);
+            if (!success) {
+              break;
+            }
+          }
+        }
         if (moduleName) {
-          return { moduleName, importType, isLocalTypingsFile };
+          return { moduleName, importType, isLocalTypingsFile, isThirdPartyPyTypedPresent };
         }
         if (allowInvalidModuleName && moduleNameWithInvalidCharacters) {
-          return { moduleName: moduleNameWithInvalidCharacters, importType, isLocalTypingsFile };
+          return {
+            moduleName: moduleNameWithInvalidCharacters,
+            importType,
+            isLocalTypingsFile,
+            isThirdPartyPyTypedPresent
+          };
         }
-        return { moduleName: "", importType: 2, isLocalTypingsFile };
+        return {
+          moduleName: "",
+          importType: 2,
+          isLocalTypingsFile,
+          isThirdPartyPyTypedPresent
+        };
       }
       _invalidateFileSystemCache() {
         this._cachedEntriesForPath.clear();
@@ -89003,9 +89121,6 @@ var require_sourceFile = __commonJS({
       getBuiltinsImport() {
         return this._writableData.builtinsImport;
       }
-      getIPythonDisplayImport() {
-        return this._writableData.ipythonDisplayImport;
-      }
       getModuleSymbolTable() {
         return this._writableData.moduleSymbolTable;
       }
@@ -89210,7 +89325,6 @@ var require_sourceFile = __commonJS({
               const importResult = this._resolveImports(importResolver, parseResults.importedModules, execEnvironment);
               this._writableData.imports = importResult.imports;
               this._writableData.builtinsImport = importResult.builtinsImportResult;
-              this._writableData.ipythonDisplayImport = importResult.ipythonDisplayImportResult;
               this._writableData.parseDiagnostics = diagSink.fetchAndClear();
             });
             const useStrict = configOptions.strict.find((strictFileSpec) => strictFileSpec.regExp.test(this._realFilePath)) !== void 0;
@@ -89244,7 +89358,6 @@ var require_sourceFile = __commonJS({
             };
             this._writableData.imports = void 0;
             this._writableData.builtinsImport = void 0;
-            this._writableData.ipythonDisplayImport = void 0;
             const diagSink2 = this.createDiagnosticSink();
             diagSink2.addError(localize_1.Localizer.Diagnostic.internalParseError().format({ file: this.getFilePath(), message }), (0, textRange_1.getEmptyRange)());
             this._writableData.parseDiagnostics = diagSink2.fetchAndClear();
@@ -89597,7 +89710,6 @@ var require_sourceFile = __commonJS({
         if (!builtinsImportResult) {
           builtinsImportResult = resolveAndAddIfNotSelf(["builtins"]);
         }
-        const ipythonDisplayImportResult = this._ipythonMode ? resolveAndAddIfNotSelf(["IPython", "display"]) : void 0;
         for (const moduleImport of moduleImports) {
           const importResult = importResolver.resolveImport(this._filePath, execEnv, {
             leadingDots: moduleImport.leadingDots,
@@ -89615,8 +89727,7 @@ var require_sourceFile = __commonJS({
         }
         return {
           imports,
-          builtinsImportResult,
-          ipythonDisplayImportResult
+          builtinsImportResult
         };
       }
       _getPathForLogging(filepath) {