coc-pyright 1.1.283 → 1.1.284

package/lib/index.js

@@ -6053,18 +6053,13 @@ var require_positionUtils = __commonJS({
           character: 0
         };
       }
-      let offsetAdjustment = 0;
-      if (offset >= lines.end) {
-        offset = lines.end - 1;
-        offsetAdjustment = 1;
-      }
-      const itemIndex = lines.getItemContaining(offset);
-      (0, debug_1.assert)(itemIndex >= 0 && itemIndex <= lines.length);
+      const itemIndex = offset >= lines.end ? lines.count - 1 : lines.getItemContaining(offset);
+      (0, debug_1.assert)(itemIndex >= 0 && itemIndex <= lines.count);
       const lineRange = lines.getItemAt(itemIndex);
       (0, debug_1.assert)(lineRange !== void 0);
       return {
         line: itemIndex,
-        character: offset - lineRange.start + offsetAdjustment
+        character: Math.max(0, Math.min(lineRange.length, offset - lineRange.start))
       };
     }
     exports.convertOffsetToPosition = convertOffsetToPosition;
@@ -14192,9 +14187,9 @@ var init_main2 = __esm({
       DiagnosticSeverity3.Information = 3;
       DiagnosticSeverity3.Hint = 4;
     })(DiagnosticSeverity || (DiagnosticSeverity = {}));
-    (function(DiagnosticTag2) {
-      DiagnosticTag2.Unnecessary = 1;
-      DiagnosticTag2.Deprecated = 2;
+    (function(DiagnosticTag3) {
+      DiagnosticTag3.Unnecessary = 1;
+      DiagnosticTag3.Deprecated = 2;
     })(DiagnosticTag || (DiagnosticTag = {}));
     (function(CodeDescription2) {
       function is(value) {
@@ -20586,6 +20581,7 @@ var require_diagnosticRules = __commonJS({
       DiagnosticRule2["strictListInference"] = "strictListInference";
       DiagnosticRule2["strictSetInference"] = "strictSetInference";
       DiagnosticRule2["strictDictionaryInference"] = "strictDictionaryInference";
+      DiagnosticRule2["analyzeUnannotatedFunctions"] = "analyzeUnannotatedFunctions";
       DiagnosticRule2["strictParameterNoneValue"] = "strictParameterNoneValue";
       DiagnosticRule2["enableTypeIgnoreComments"] = "enableTypeIgnoreComments";
       DiagnosticRule2["reportGeneralTypeIssues"] = "reportGeneralTypeIssues";
@@ -20783,6 +20779,7 @@ var require_configOptions = __commonJS({
         diagnosticRules_1.DiagnosticRule.strictListInference,
         diagnosticRules_1.DiagnosticRule.strictSetInference,
         diagnosticRules_1.DiagnosticRule.strictDictionaryInference,
+        diagnosticRules_1.DiagnosticRule.analyzeUnannotatedFunctions,
         diagnosticRules_1.DiagnosticRule.strictParameterNoneValue
       ];
       if (includeNonOverridable) {
@@ -20872,6 +20869,7 @@ var require_configOptions = __commonJS({
         strictListInference: false,
         strictSetInference: false,
         strictDictionaryInference: false,
+        analyzeUnannotatedFunctions: true,
         strictParameterNoneValue: true,
         enableTypeIgnoreComments: true,
         reportGeneralTypeIssues: "none",
@@ -20950,6 +20948,7 @@ var require_configOptions = __commonJS({
         strictListInference: false,
         strictSetInference: false,
         strictDictionaryInference: false,
+        analyzeUnannotatedFunctions: true,
         strictParameterNoneValue: true,
         enableTypeIgnoreComments: true,
         reportGeneralTypeIssues: "error",
@@ -21028,6 +21027,7 @@ var require_configOptions = __commonJS({
         strictListInference: true,
         strictSetInference: true,
         strictDictionaryInference: true,
+        analyzeUnannotatedFunctions: true,
         strictParameterNoneValue: true,
         enableTypeIgnoreComments: true,
         reportGeneralTypeIssues: "error",
@@ -21108,7 +21108,6 @@ var require_configOptions = __commonJS({
         this.logTypeEvaluationTime = false;
         this.typeEvaluationTimeThreshold = 50;
         this.initializedFromJson = false;
-        this.analyzeUnannotatedFunctions = true;
         this.executionEnvironments = [];
         this.projectRoot = projectRoot;
         this.typeCheckingMode = typeCheckingMode;
@@ -24189,7 +24188,7 @@ var require_types = __commonJS({
         }
       }
       UnionType2.addType = addType;
-      function containsType(unionType, subtype, recursionCount = 0) {
+      function containsType(unionType, subtype, exclusionSet, recursionCount = 0) {
         if (isClassInstance(subtype) && subtype.condition === void 0 && subtype.literalValue !== void 0) {
           if (ClassType.isBuiltIn(subtype, "str") && unionType.literalStrMap !== void 0) {
             return unionType.literalStrMap.has(subtype.literalValue);
@@ -24197,7 +24196,17 @@ var require_types = __commonJS({
             return unionType.literalIntMap.has(subtype.literalValue);
           }
         }
-        return unionType.subtypes.find((t) => isTypeSame(t, subtype, {}, recursionCount)) !== void 0;
+        const foundIndex = unionType.subtypes.findIndex((t, i) => {
+          if (exclusionSet === null || exclusionSet === void 0 ? void 0 : exclusionSet.has(i)) {
+            return false;
+          }
+          return isTypeSame(t, subtype, {}, recursionCount);
+        });
+        if (foundIndex < 0) {
+          return false;
+        }
+        exclusionSet === null || exclusionSet === void 0 ? void 0 : exclusionSet.add(foundIndex);
+        return true;
       }
       UnionType2.containsType = containsType;
       function addTypeAliasSource(unionType, typeAliasSource) {
@@ -24619,7 +24628,8 @@ var require_types = __commonJS({
           if (subtypes1.length !== subtypes2.length) {
             return false;
           }
-          return findSubtype(type1, (subtype) => !UnionType.containsType(unionType2, subtype, recursionCount)) === void 0;
+          const exclusionSet = /* @__PURE__ */ new Set();
+          return findSubtype(type1, (subtype) => !UnionType.containsType(unionType2, subtype, exclusionSet, recursionCount)) === void 0;
         }
         case 10: {
           const type2TypeVar = type2;
@@ -25990,7 +26000,7 @@ var require_typeUtils = __commonJS({
     }
     exports.isTupleClass = isTupleClass;
     function isUnboundedTupleClass(type) {
-      return type.tupleTypeArguments && type.tupleTypeArguments.some((t) => t.isUnbounded);
+      return type.tupleTypeArguments && type.tupleTypeArguments.some((t) => t.isUnbounded || (0, types_1.isUnpackedVariadicTypeVar)(t.type));
     }
     exports.isUnboundedTupleClass = isUnboundedTupleClass;
     function partiallySpecializeType(type, contextClassType, selfClass, typeClassType) {
@@ -28180,7 +28190,6 @@ var require_package_nls_en_us = __commonJS({
         declaredReturnTypeUnknown: "Declared return type is unknown",
         defaultValueContainsCall: "Function calls and mutable objects not allowed within parameter default value expression",
         defaultValueNotAllowed: 'Parameter with "*" or "**" cannot have default value',
-        defaultValueNotEllipsis: 'Default values in stub files should be specified as "..."',
         deprecatedType: 'This type is deprecated as of Python {version}; use "{replacement}" instead',
         delTargetExpr: "Expression cannot be deleted",
         dictExpandIllegalInComprehension: "Dictionary expansion not allowed in comprehension",
@@ -28562,6 +28571,7 @@ var require_package_nls_en_us = __commonJS({
         unaccessedImport: 'Import "{name}" is not accessed',
         unaccessedSymbol: '"{name}" is not accessed',
         unaccessedVariable: 'Variable "{name}" is not accessed',
+        unannotatedFunctionSkipped: 'Analysis of function "{name}" is skipped because it unannotated',
         unexpectedAsyncToken: 'Expected "def", "with" or "for" to follow "async"',
         unexpectedExprToken: "Unexpected token at end of expression",
         unexpectedIndent: "Unexpected indentation",
@@ -29039,7 +29049,6 @@ var require_localize = __commonJS({
         Diagnostic6.declaredReturnTypeUnknown = () => getRawString("Diagnostic.declaredReturnTypeUnknown");
         Diagnostic6.defaultValueContainsCall = () => getRawString("Diagnostic.defaultValueContainsCall");
         Diagnostic6.defaultValueNotAllowed = () => getRawString("Diagnostic.defaultValueNotAllowed");
-        Diagnostic6.defaultValueNotEllipsis = () => getRawString("Diagnostic.defaultValueNotEllipsis");
         Diagnostic6.deprecatedType = () => new ParameterizedString(getRawString("Diagnostic.deprecatedType"));
         Diagnostic6.dictExpandIllegalInComprehension = () => getRawString("Diagnostic.dictExpandIllegalInComprehension");
         Diagnostic6.dictInAnnotation = () => getRawString("Diagnostic.dictInAnnotation");
@@ -29421,6 +29430,7 @@ var require_localize = __commonJS({
         Diagnostic6.unaccessedImport = () => new ParameterizedString(getRawString("Diagnostic.unaccessedImport"));
         Diagnostic6.unaccessedSymbol = () => new ParameterizedString(getRawString("Diagnostic.unaccessedSymbol"));
         Diagnostic6.unaccessedVariable = () => new ParameterizedString(getRawString("Diagnostic.unaccessedVariable"));
+        Diagnostic6.unannotatedFunctionSkipped = () => new ParameterizedString(getRawString("Diagnostic.unannotatedFunctionSkipped"));
         Diagnostic6.unexpectedAsyncToken = () => getRawString("Diagnostic.unexpectedAsyncToken");
         Diagnostic6.unexpectedExprToken = () => getRawString("Diagnostic.unexpectedExprToken");
         Diagnostic6.unexpectedIndent = () => getRawString("Diagnostic.unexpectedIndent");
@@ -32389,7 +32399,7 @@ var require_typeDocStringUtils = __commonJS({
       return result;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.getVariableDocString = exports.getFunctionOrClassDeclDocString = exports.getClassDocString = exports.getModuleDocString = exports.getVariableInStubFileDocStrings = exports.getPropertyDocStringInherited = exports.getOverloadedFunctionDocStringsInherited = exports.getFunctionDocStringInherited = void 0;
+    exports.getVariableDocString = exports.getFunctionOrClassDeclDocString = exports.getClassDocString = exports.getModuleDocString = exports.getModuleNodeDocString = exports.getVariableInStubFileDocStrings = exports.getPropertyDocStringInherited = exports.getOverloadedFunctionDocStringsInherited = exports.getFunctionDocStringInherited = void 0;
     var declaration_1 = require_declaration();
     var ParseTreeUtils = __importStar(require_parseTreeUtils());
     var sourceMapper_1 = require_sourceMapper();
@@ -32483,12 +32493,24 @@ var require_typeDocStringUtils = __commonJS({
       return docStrings;
     }
     exports.getVariableInStubFileDocStrings = getVariableInStubFileDocStrings;
+    function getModuleNodeDocString(modules) {
+      for (const module3 of modules) {
+        if (module3.statements) {
+          const docString = ParseTreeUtils.getDocString(module3.statements);
+          if (docString) {
+            return docString;
+          }
+        }
+      }
+      return void 0;
+    }
+    exports.getModuleNodeDocString = getModuleNodeDocString;
     function getModuleDocString(type, resolvedDecl, sourceMapper) {
       let docString = type.docString;
       if (!docString) {
         if (resolvedDecl && (0, sourceMapper_1.isStubFile)(resolvedDecl.path)) {
           const modules = sourceMapper.findModules(resolvedDecl.path);
-          docString = _getModuleNodeDocString(modules);
+          docString = getModuleNodeDocString(modules);
         }
       }
       return docString;
@@ -32622,17 +32644,6 @@ var require_typeDocStringUtils = __commonJS({
       }
       return void 0;
     }
-    function _getModuleNodeDocString(modules) {
-      for (const module3 of modules) {
-        if (module3.statements) {
-          const docString = ParseTreeUtils.getDocString(module3.statements);
-          if (docString) {
-            return docString;
-          }
-        }
-      }
-      return void 0;
-    }
   }
 });
 
@@ -33038,6 +33049,9 @@ var require_completionProvider = __commonJS({
               return result;
             }
           }
+          if (curNode.nodeType === 31 && this._options.triggerCharacter === "[") {
+            return void 0;
+          }
           if (curNode.nodeType === 22) {
             return this._getImportFromCompletions(curNode, priorWord);
           }
@@ -35055,7 +35069,7 @@ var require_aliasDeclarationUtils = __commonJS({
       let curDeclaration = declaration;
       const alreadyVisited = [];
       let isPrivate = false;
-      let isPrivatePyTypedImport = false;
+      let sawPyTypedTransition = false;
       let privatePyTypedImported;
       let privatePyTypedImporter;
       while (true) {
@@ -35116,14 +35130,17 @@ var require_aliasDeclarationUtils = __commonJS({
         } else {
           curDeclaration = declarations[declarations.length - 1];
         }
-        if (isPrivatePyTypedImport) {
-          privatePyTypedImported = privatePyTypedImported !== null && privatePyTypedImported !== void 0 ? privatePyTypedImported : curDeclaration === null || curDeclaration === void 0 ? void 0 : curDeclaration.moduleName;
-        }
-        if (symbol.isPrivatePyTypedImport()) {
-          isPrivatePyTypedImport = true;
-        }
-        if (isPrivatePyTypedImport) {
-          privatePyTypedImporter = privatePyTypedImporter !== null && privatePyTypedImporter !== void 0 ? privatePyTypedImporter : curDeclaration === null || curDeclaration === void 0 ? void 0 : curDeclaration.moduleName;
+        if (lookupResult === null || lookupResult === void 0 ? void 0 : lookupResult.isInPyTypedPackage) {
+          if (!sawPyTypedTransition) {
+            if (symbol.isPrivatePyTypedImport()) {
+              privatePyTypedImporter = curDeclaration === null || curDeclaration === void 0 ? void 0 : curDeclaration.moduleName;
+            }
+            sawPyTypedTransition = true;
+          } else {
+            if (!symbol.isPrivatePyTypedImport()) {
+              privatePyTypedImported = privatePyTypedImported !== null && privatePyTypedImported !== void 0 ? privatePyTypedImported : curDeclaration === null || curDeclaration === void 0 ? void 0 : curDeclaration.moduleName;
+            }
+          }
         }
         if (alreadyVisited.find((decl) => decl === curDeclaration)) {
           if (curDeclaration.path === declaration.path && curDeclaration.type === 8 && curDeclaration.submoduleFallback) {
@@ -35360,7 +35377,7 @@ var require_documentSymbolProvider = __commonJS({
         if (symbol.isIgnoredForProtocolMatch()) {
           return;
         }
-        if (options.indexingForAutoImportMode && !options.forceIndexing && !fileInfo.isStubFile && !fileInfo.isInPyTypedPackage && !symbol.isInDunderAll()) {
+        if (options.indexingForAutoImportMode && !options.includeAllSymbols && !fileInfo.isStubFile && !fileInfo.isInPyTypedPackage && !symbol.isInDunderAll()) {
           return;
         }
         let declaration = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(symbol);
@@ -35476,6 +35493,7 @@ var require_hoverProvider = __commonJS({
     var vscode_languageserver_1 = require_main3();
     var docStringConversion_1 = require_docStringConversion();
     var ParseTreeUtils = __importStar(require_parseTreeUtils());
+    var typeDocStringUtils_1 = require_typeDocStringUtils();
     var types_1 = require_types();
     var typeUtils_1 = require_typeUtils();
     var cancellationUtils_1 = require_cancellationUtils();
@@ -35634,10 +35652,16 @@ var require_hoverProvider = __commonJS({
 ${(0, tooltipUtils_1.getOverloadedFunctionTooltip)(type, evaluator)}`,
                   true
                 );
+              } else if ((0, types_1.isFunction)(type)) {
+                this._addResultsPart(
+                  parts,
+                  `(${label}) ${node.value}${sep}${evaluator.printType(type)}`,
+                  true
+                );
               } else {
                 this._addResultsPart(
                   parts,
-                  `(${label}) ` + node.value + sep + evaluator.printType(type),
+                  `(${label}) ${node.value}: ${evaluator.printType(type)}`,
                   true
                 );
               }
@@ -35646,8 +35670,7 @@ ${(0, tooltipUtils_1.getOverloadedFunctionTooltip)(type, evaluator)}`,
             break;
           }
           case 8: {
-            this._addResultsPart(parts, "(module) " + node.value, true);
-            this._addDocumentationPart(format, sourceMapper, parts, node, evaluator, resolvedDecl);
+            this._addModuleParts(format, sourceMapper, parts, node.value, [resolvedDecl.path]);
             break;
           }
           case 4: {
@@ -35757,6 +35780,16 @@ ${(0, tooltipUtils_1.getOverloadedFunctionTooltip)(type, evaluator)}`,
           this._addDocumentationPartForType(format, sourceMapper, parts, type, resolvedDecl, evaluator);
         }
       }
+      static _addModuleParts(format, sourceMapper, parts, name, resolvedPaths) {
+        this._addResultsPart(parts, "(module) " + name, true);
+        const modules = resolvedPaths.map((p) => sourceMapper.findModules(p)).flat();
+        const docString = (0, typeDocStringUtils_1.getModuleNodeDocString)(modules);
+        if (docString) {
+          this._addDocumentationResultsPart(format, parts, docString);
+          return true;
+        }
+        return false;
+      }
       static _addDocumentationPartForType(format, sourceMapper, parts, type, resolvedDecl, evaluator) {
         const docString = (0, tooltipUtils_1.getDocumentationPartsForTypeAndDecl)(sourceMapper, type, resolvedDecl, evaluator);
         if (docString) {
@@ -38276,7 +38309,7 @@ var require_binder = __commonJS({
             node,
             path: pathOfLastSubmodule,
             loadSymbolsFromPath: false,
-            range: importAlias ? (0, positionUtils_1.convertTextRangeToRange)(importAlias, this._fileInfo.lines) : (0, textRange_1.getEmptyRange)(),
+            range: (0, textRange_1.getEmptyRange)(),
             usesLocalName: !!importAlias,
             moduleName: importInfo.importName,
             firstNamePart: firstNamePartValue,
@@ -38288,7 +38321,7 @@ var require_binder = __commonJS({
             node,
             path: pathOfLastSubmodule,
             loadSymbolsFromPath: true,
-            range: importAlias ? (0, positionUtils_1.convertTextRangeToRange)(importAlias, this._fileInfo.lines) : (0, textRange_1.getEmptyRange)(),
+            range: (0, textRange_1.getEmptyRange)(),
             usesLocalName: !!importAlias,
             moduleName: (_a = importInfo === null || importInfo === void 0 ? void 0 : importInfo.importName) !== null && _a !== void 0 ? _a : "",
             firstNamePart: firstNamePartValue,
@@ -44635,7 +44668,7 @@ var require_importResolver = __commonJS({
                 readDir(dirRoot, prefix ? `${prefix}.${entry.name}` : entry.name);
               } else if (entry.name.includes(".py")) {
                 const stripped = (0, pathUtils_1.stripFileExtension)(entry.name);
-                if (stripped !== "__init__") {
+                if (!stripped.startsWith("_")) {
                   cache.add(prefix ? `${prefix}.${stripped}` : stripped);
                 }
               }
@@ -51467,6 +51500,7 @@ var require_typeEvaluator = __commonJS({
     var maxEffectiveTypeEvaluationAttempts = 16;
     var maxOverloadUnionExpansionCount = 64;
     var maxInferFunctionReturnRecursionCount = 12;
+    var maxRecursiveTypeAliasRecursionCount = 10;
     var verifyTypeCacheEvaluatorFlags = false;
     var printExpressionTypes = false;
     var maxLiteralMathSubtypeCount = 64;
@@ -51890,7 +51924,7 @@ var require_typeEvaluator = __commonJS({
           }
         }
         if (flags & 65536) {
-          if ((0, typeUtils_1.isTypeAliasPlaceholder)(typeResult.type)) {
+          if ((0, types_1.isTypeVar)(typeResult.type) && (0, typeUtils_1.isTypeAliasPlaceholder)(typeResult.type)) {
             typeResult.type.details.illegalRecursionDetected = true;
           }
         }
@@ -53041,6 +53075,13 @@ var require_typeEvaluator = __commonJS({
         if (diagLevel === "none") {
           return void 0;
         }
+        const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
+        if (!fileInfo.diagnosticRuleSet.analyzeUnannotatedFunctions) {
+          const containingFunction = ParseTreeUtils.getEnclosingFunction(node);
+          if (containingFunction && ParseTreeUtils.isUnannotatedFunction(containingFunction) && ParseTreeUtils.isNodeContainedWithin(node, containingFunction.suite)) {
+            return void 0;
+          }
+        }
         const diagnostic = addDiagnosticWithSuppressionCheck(diagLevel, message, node, range);
         if (diagnostic) {
           diagnostic.setRule(rule);
@@ -53724,15 +53765,6 @@ var require_typeEvaluator = __commonJS({
         let type;
         let isIncomplete = false;
         const allowForwardReferences = (flags & 4) !== 0 || fileInfo.isStubFile;
-        if (!evaluatorOptions.analyzeUnannotatedFunctions) {
-          const containingFunction = ParseTreeUtils.getEnclosingFunction(node);
-          if (containingFunction && ParseTreeUtils.isUnannotatedFunction(containingFunction)) {
-            return {
-              type: types_1.AnyType.create(),
-              isIncomplete: false
-            };
-          }
-        }
         const typeParamSymbol = AnalyzerNodeInfo.getTypeParameterSymbol(node);
         if (typeParamSymbol) {
           symbol = typeParamSymbol;
@@ -53752,6 +53784,16 @@ var require_typeEvaluator = __commonJS({
               useCodeFlowAnalysis = false;
             }
             symbol = symbolWithScope.symbol;
+            setSymbolAccessed(fileInfo, symbol, node);
+            if (!fileInfo.diagnosticRuleSet.analyzeUnannotatedFunctions) {
+              const containingFunction = ParseTreeUtils.getEnclosingFunction(node);
+              if (containingFunction && ParseTreeUtils.isUnannotatedFunction(containingFunction)) {
+                return {
+                  type: types_1.AnyType.create(),
+                  isIncomplete: false
+                };
+              }
+            }
             const effectiveTypeInfo = getEffectiveTypeOfSymbolForUsage(symbol, useCodeFlowAnalysis ? node : void 0);
             let effectiveType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(effectiveTypeInfo.type);
             if (effectiveTypeInfo.isIncomplete) {
@@ -53804,7 +53846,6 @@ var require_typeEvaluator = __commonJS({
               }
             }
             type = reportMissingTypeArguments(node, type, flags);
-            setSymbolAccessed(fileInfo, symbol, node);
             if ((flags & 1024) !== 0) {
               if (effectiveTypeInfo.includesVariableDecl && !type.typeAliasInfo) {
                 let isAllowedTypeForVariable = (0, types_1.isTypeVar)(type) || (0, typeUtils_1.isTypeAliasPlaceholder)(type);
@@ -55096,7 +55137,7 @@ var require_typeEvaluator = __commonJS({
         if (typeAliasResult) {
           return typeAliasResult;
         }
-        if ((0, typeUtils_1.isTypeAliasPlaceholder)(baseTypeResult.type)) {
+        if ((0, types_1.isTypeVar)(baseTypeResult.type) && (0, typeUtils_1.isTypeAliasPlaceholder)(baseTypeResult.type)) {
           const typeArgTypes = getTypeArgs(node, flags).map((t) => (0, typeUtils_1.convertToInstance)(t.type));
           const type2 = types_1.TypeBase.cloneForTypeAlias(baseTypeResult.type, baseTypeResult.type.details.recursiveTypeAliasName, "", baseTypeResult.type.details.recursiveTypeAliasScopeId, baseTypeResult.type.details.recursiveTypeParameters, typeArgTypes);
           return { type: type2 };
@@ -56242,7 +56283,7 @@ var require_typeEvaluator = __commonJS({
             }
           });
         }
-        if (!validatedTypes && argList.length > 0) {
+        if (!validatedTypes && argList.some((arg) => arg.argumentCategory === 0)) {
           const isCustomMetaclass = !!type.details.effectiveMetaclass && (0, types_1.isInstantiableClass)(type.details.effectiveMetaclass) && !types_1.ClassType.isBuiltIn(type.details.effectiveMetaclass);
           if (!isCustomMetaclass && !usedMetaclassCallMethod) {
             const fileInfo = AnalyzerNodeInfo.getFileInfo(errorNode);
@@ -57166,8 +57207,8 @@ var require_typeEvaluator = __commonJS({
                 const tupleTypeArgs = variadicArgs.map((argParam) => {
                   var _a2;
                   const argType = getTypeOfArgument(argParam.argument).type;
-                  const containsVariadicTypeVar = (0, types_1.isUnpackedVariadicTypeVar)(argType) || (0, types_1.isClassInstance)(argType) && (0, typeUtils_1.isTupleClass)(argType) && argType.tupleTypeArguments && argType.tupleTypeArguments.some((arg) => (0, types_1.isUnpackedVariadicTypeVar)(arg.type));
-                  if (containsVariadicTypeVar && argParam.argument.argumentCategory !== 1) {
+                  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) {
                     addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeVarTupleMustBeUnpacked(), (_a2 = argParam.argument.valueExpression) !== null && _a2 !== void 0 ? _a2 : errorNode);
                     reportedArgError = true;
                   }
@@ -58638,13 +58679,18 @@ var require_typeEvaluator = __commonJS({
         let effectiveExpectedType = expectedType;
         if (expectedType && (0, types_1.isUnion)(expectedType)) {
           let matchingSubtype;
+          let matchingSubtypeResult;
           (0, typeUtils_1.doForEachSubtype)(expectedType, (subtype) => {
-            if (!matchingSubtype) {
-              const subtypeResult = useSpeculativeMode(node, () => {
-                return getTypeOfDictionaryExpected(node, subtype);
-              });
-              if (subtypeResult && assignType(subtype, subtypeResult.type)) {
+            if (matchingSubtypeResult && !matchingSubtypeResult.typeErrors) {
+              return;
+            }
+            const subtypeResult = useSpeculativeMode(node, () => {
+              return getTypeOfDictionaryExpected(node, subtype);
+            });
+            if (subtypeResult && assignType(subtype, subtypeResult.type)) {
+              if (!matchingSubtypeResult || matchingSubtypeResult.typeErrors && !subtypeResult.typeErrors) {
                 matchingSubtype = subtype;
+                matchingSubtypeResult = subtypeResult;
               }
             }
           });
@@ -58914,13 +58960,18 @@ var require_typeEvaluator = __commonJS({
         let effectiveExpectedType = expectedType;
         if (expectedType && (0, types_1.isUnion)(expectedType)) {
           let matchingSubtype;
+          let matchingSubtypeResult;
           (0, typeUtils_1.doForEachSubtype)(expectedType, (subtype) => {
-            if (!matchingSubtype) {
-              const subtypeResult = useSpeculativeMode(node, () => {
-                return getTypeOfListOrSetExpected(node, subtype);
-              });
-              if (subtypeResult && assignType(subtype, subtypeResult.type)) {
+            if (matchingSubtypeResult && !matchingSubtypeResult.typeErrors) {
+              return;
+            }
+            const subtypeResult = useSpeculativeMode(node, () => {
+              return getTypeOfListOrSetExpected(node, subtype);
+            });
+            if (subtypeResult && assignType(subtype, subtypeResult.type)) {
+              if (!matchingSubtypeResult || matchingSubtypeResult.typeErrors && !subtypeResult.typeErrors) {
                 matchingSubtype = subtype;
+                matchingSubtypeResult = subtypeResult;
               }
             }
           });
@@ -63655,6 +63706,7 @@ var require_typeEvaluator = __commonJS({
         var _a;
         let returnType;
         let isIncomplete = false;
+        let analyzeUnannotatedFunctions = true;
         if (types_1.FunctionType.isStubDefinition(type)) {
           return types_1.UnknownType.create();
         }
@@ -63665,7 +63717,8 @@ var require_typeEvaluator = __commonJS({
             returnType = types_1.NoneType.createInstance();
           } else if (type.details.declaration) {
             const functionNode = type.details.declaration.node;
-            if (evaluatorOptions.analyzeUnannotatedFunctions && !checkCodeFlowTooComplex(functionNode.suite)) {
+            analyzeUnannotatedFunctions = AnalyzerNodeInfo.getFileInfo(functionNode).diagnosticRuleSet.analyzeUnannotatedFunctions;
+            if (analyzeUnannotatedFunctions && !checkCodeFlowTooComplex(functionNode.suite)) {
               const codeFlowComplexity = AnalyzerNodeInfo.getCodeFlowComplexity(functionNode);
               const parametersAreAnnotated = type.details.parameters.length <= 1 || type.details.parameters.some((param) => param.hasDeclaredType);
               if (parametersAreAnnotated || codeFlowComplexity < maxReturnTypeInferenceCodeFlowComplexity) {
@@ -63690,7 +63743,7 @@ var require_typeEvaluator = __commonJS({
             type.inferredReturnType = returnType;
           }
         }
-        if (!isIncomplete && evaluatorOptions.analyzeUnannotatedFunctions && (0, typeUtils_1.isPartlyUnknown)(returnType) && types_1.FunctionType.hasUnannotatedParams(type) && !types_1.FunctionType.isStubDefinition(type) && !types_1.FunctionType.isPyTypedDefinition(type) && args) {
+        if (!isIncomplete && analyzeUnannotatedFunctions && (0, typeUtils_1.isPartlyUnknown)(returnType) && types_1.FunctionType.hasUnannotatedParams(type) && !types_1.FunctionType.isStubDefinition(type) && !types_1.FunctionType.isPyTypedDefinition(type) && args) {
           const contextualReturnType = getFunctionInferredReturnTypeUsingArguments(type, args);
           if (contextualReturnType) {
             returnType = contextualReturnType;
@@ -64237,8 +64290,15 @@ var require_typeEvaluator = __commonJS({
             flags |= 2048;
           }
         }
-        destType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(destType);
-        srcType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(srcType);
+        const transformedDestType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(destType);
+        const transformedSrcType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(srcType);
+        if (transformedDestType !== destType && transformedSrcType !== srcType && (0, types_1.isUnion)(transformedDestType) && (0, types_1.isUnion)(transformedSrcType)) {
+          if (recursionCount > maxRecursiveTypeAliasRecursionCount) {
+            return true;
+          }
+        }
+        destType = transformedDestType;
+        srcType = transformedSrcType;
         if ((0, types_1.isUnbound)(destType) || (0, types_1.isUnbound)(srcType)) {
           return true;
         }
@@ -64427,19 +64487,21 @@ var require_typeEvaluator = __commonJS({
               return types_1.TypeBase.isInstantiable(destType);
             }
             instantiableType = (0, typeUtils_1.convertToInstantiable)(typeTypeArg);
-          } else {
+          } else if (types_1.TypeBase.isInstantiable(destType)) {
             typeTypeArg = objectType !== null && objectType !== void 0 ? objectType : types_1.AnyType.create();
             instantiableType = expandedSrcType;
           }
-          if ((0, types_1.isClassInstance)(typeTypeArg) || (0, types_1.isTypeVar)(typeTypeArg)) {
-            if (assignType(destType, instantiableType, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
-              return true;
+          if (instantiableType && typeTypeArg) {
+            if ((0, types_1.isClassInstance)(typeTypeArg) || (0, types_1.isTypeVar)(typeTypeArg)) {
+              if (assignType(destType, instantiableType, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
+                return true;
+              }
+              diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.typeAssignmentMismatch().format({
+                sourceType: printType(srcType),
+                destType: printType(destType)
+              }));
+              return false;
             }
-            diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.typeAssignmentMismatch().format({
-              sourceType: printType(srcType),
-              destType: printType(destType)
-            }));
-            return false;
           }
         }
         if ((0, types_1.isInstantiableClass)(destType)) {
@@ -64877,7 +64939,7 @@ var require_typeEvaluator = __commonJS({
             let bestDestTypeVarContext;
             let bestSrcTypeVarContext;
             let bestTypeVarContextScore;
-            if ((0, types_1.isClassInstance)(srcType) && (0, typeUtils_1.isLiteralType)(srcType) && types_1.UnionType.containsType(destType, srcType, recursionCount)) {
+            if ((0, types_1.isClassInstance)(srcType) && (0, typeUtils_1.isLiteralType)(srcType) && types_1.UnionType.containsType(destType, srcType, void 0, recursionCount)) {
               return true;
             }
             (0, typeUtils_1.doForEachSubtype)(destType, (subtype) => {
@@ -65882,7 +65944,7 @@ var require_typeEvaluator = __commonJS({
         if ((0, types_1.isAnyOrUnknown)(srcType)) {
           return srcType;
         }
-        let effectiveSrcType = srcType;
+        let effectiveSrcType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(srcType);
         if ((0, types_1.isTypeVar)(srcType)) {
           if ((0, types_1.isTypeSame)(srcType, destType)) {
             return srcType;
@@ -65892,7 +65954,7 @@ var require_typeEvaluator = __commonJS({
         if ((0, types_1.isClass)(effectiveSrcType) && types_1.ClassType.isPartiallyEvaluated(effectiveSrcType)) {
           return srcType;
         }
-        if (destType.details.boundType) {
+        if (destType.details.boundType && !(0, typeUtils_1.isTypeAliasPlaceholder)(effectiveSrcType)) {
           if (!assignType(
             destType.details.boundType,
             effectiveSrcType,
@@ -65934,6 +65996,9 @@ var require_typeEvaluator = __commonJS({
         if (constraints.length === 0) {
           return srcType;
         }
+        if ((0, typeUtils_1.isTypeAliasPlaceholder)(srcType)) {
+          return srcType;
+        }
         if ((0, types_1.isTypeVar)(srcType) && srcType.details.constraints.length > 0) {
           if (srcType.details.constraints.every((sourceConstraint) => {
             return constraints.some((destConstraint) => assignType(destConstraint, sourceConstraint));
@@ -66471,6 +66536,11 @@ var require_checker = __commonJS({
         if (node.typeParameters) {
           this.walk(node.typeParameters);
         }
+        if (!this._fileInfo.diagnosticRuleSet.analyzeUnannotatedFunctions && !this._fileInfo.isStubFile) {
+          if (ParseTreeUtils.isUnannotatedFunction(node)) {
+            this._evaluator.addInformation(localize_1.Localizer.Diagnostic.unannotatedFunctionSkipped().format({ name: node.name.value }), node.name);
+          }
+        }
         const functionTypeResult = this._evaluator.getTypeOfFunction(node);
         const containingClassNode = ParseTreeUtils.getEnclosingClass(node, true);
         if (functionTypeResult) {
@@ -66523,12 +66593,6 @@ var require_checker = __commonJS({
                 }
               }
             }
-            if (param.defaultValue && this._fileInfo.isStubFile) {
-              const defaultValueType = this._evaluator.getType(param.defaultValue);
-              if (!defaultValueType || !(0, typeUtils_1.isEllipsisType)(defaultValueType)) {
-                this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportInvalidStubStatement, diagnosticRules_1.DiagnosticRule.reportInvalidStubStatement, localize_1.Localizer.Diagnostic.defaultValueNotEllipsis(), param.defaultValue);
-              }
-            }
           });
           const paramSpecParams = functionTypeResult.functionType.details.parameters.filter((param) => {
             if (param.typeAnnotation && (0, types_1.isTypeVar)(param.type) && (0, types_1.isParamSpec)(param.type)) {
@@ -68434,9 +68498,14 @@ var require_checker = __commonJS({
         }
       }
       _conditionallyReportShadowedImport(node) {
+        var _a, _b;
         if (this._fileInfo.diagnosticRuleSet.reportShadowedImports === "none") {
           return;
         }
+        const nodeModule = node.nodeType === 23 ? ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 22 ? (_b = node.parent) === null || _b === void 0 ? void 0 : _b.module : void 0 : node.module;
+        if (nodeModule === null || nodeModule === void 0 ? void 0 : nodeModule.leadingDots) {
+          return;
+        }
         const namePartNodes = node.nodeType === 21 ? node.module.nameParts : node.nodeType === 23 ? [node.name] : node.module.nameParts;
         const nameParts = namePartNodes.map((n) => n.value);
         const module3 = {
@@ -71569,9 +71638,7 @@ var require_tokenizer = __commonJS({
       }
       _addLineRange() {
         const lineLength = this._cs.position - this._prevLineStart;
-        if (lineLength > 0) {
-          this._lineRanges.push({ start: this._prevLineStart, length: lineLength });
-        }
+        this._lineRanges.push({ start: this._prevLineStart, length: lineLength });
         this._prevLineStart = this._cs.position;
       }
       _handleNewLine(length, newLineType) {
@@ -71983,22 +72050,17 @@ var require_tokenizer = __commonJS({
         this._addComments(comment);
       }
       _handleComment() {
-        var _a, _b;
         const start = this._cs.position + 1;
         this._cs.skipToEol();
         const length = this._cs.position - start;
         const value = this._cs.getText().substring(start, start + length);
         const comment = tokenizerTypes_1.Comment.create(start, length, value);
-        const typeIgnoreRegexMatch = value.match(/((^|#)\s*)type:\s*ignore(\s*\[([\s*\w-,]*)\]|\s|$)/);
+        const typeIgnoreRegexMatch = 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 = {
-            start: commentStart + typeIgnoreRegexMatch[1].length,
-            length: typeIgnoreRegexMatch[0].length - typeIgnoreRegexMatch[1].length
-          };
+          const textRange = { start, length: typeIgnoreRegexMatch[0].length };
           const ignoreComment = {
             range: textRange,
-            rulesList: this._getIgnoreCommentRulesList(commentStart, typeIgnoreRegexMatch)
+            rulesList: this._getIgnoreCommentRulesList(start, typeIgnoreRegexMatch)
           };
           if (this._tokens.findIndex((t) => t.type !== 2 && t && t.type !== 3) < 0) {
             this._typeIgnoreAll = ignoreComment;
@@ -72006,26 +72068,22 @@ var require_tokenizer = __commonJS({
             this._typeIgnoreLines.set(this._lineRanges.length, ignoreComment);
           }
         }
-        const pyrightIgnoreRegexMatch = value.match(/((^|#)\s*)pyright:\s*ignore(\s*\[([\s*\w-,]*)\]|\s|$)/);
+        const pyrightIgnoreRegexMatch = 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 = {
-            start: commentStart + pyrightIgnoreRegexMatch[1].length,
-            length: pyrightIgnoreRegexMatch[0].length - pyrightIgnoreRegexMatch[1].length
-          };
+          const textRange = { start, length: pyrightIgnoreRegexMatch[0].length };
           const ignoreComment = {
             range: textRange,
-            rulesList: this._getIgnoreCommentRulesList(commentStart, pyrightIgnoreRegexMatch)
+            rulesList: this._getIgnoreCommentRulesList(start, pyrightIgnoreRegexMatch)
           };
           this._pyrightIgnoreLines.set(this._lineRanges.length, ignoreComment);
         }
         this._addComments(comment);
       }
       _getIgnoreCommentRulesList(start, match) {
-        if (match.length < 5 || match[4] === void 0) {
+        if (match.length < 3 || match[2] === void 0) {
           return void 0;
         }
-        const splitElements = match[4].split(",");
+        const splitElements = match[2].split(",");
         const commentRules = [];
         let currentOffset = start + match[0].indexOf("[") + 1;
         for (const element of splitElements) {
@@ -73114,14 +73172,15 @@ var require_parser = __commonJS({
           if (postColonCallback) {
             postColonCallback();
           }
+          let bodyIndentToken;
           const possibleIndent = this._peekToken();
           if (!this._consumeTokenIfType(3)) {
             this._addError(localize_1.Localizer.Diagnostic.expectedIndentedBlock(), this._peekToken());
-            return suite;
-          }
-          const bodyIndentToken = possibleIndent;
-          if (bodyIndentToken.isIndentAmbiguous) {
-            this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), bodyIndentToken);
+          } else {
+            bodyIndentToken = possibleIndent;
+            if (bodyIndentToken.isIndentAmbiguous) {
+              this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), bodyIndentToken);
+            }
           }
           while (true) {
             const nextToken2 = this._peekToken();
@@ -73148,12 +73207,6 @@ var require_parser = __commonJS({
               }
               if (!bodyIndentToken || dedentToken.indentAmount < bodyIndentToken.indentAmount) {
                 break;
-              } else if (dedentToken.indentAmount === bodyIndentToken.indentAmount) {
-                const nextToken3 = this._peekToken();
-                if (this._consumeTokenIfType(4)) {
-                  (0, parseNodes_1.extendRange)(suite, nextToken3);
-                  break;
-                }
               }
             }
             const statement = this._parseStatement();
@@ -93196,7 +93249,7 @@ var ImportCompletionProvider = class {
       return [];
     const items = [];
     for (const o of result.items) {
-      items.push({ label: o.word, sortText: o.sortText, kind: import_coc10.CompletionItemKind.Module, filterText: o.filterText });
+      items.push({ label: o.label || o.word, sortText: o.sortText, kind: import_coc10.CompletionItemKind.Module, filterText: o.filterText });
     }
     return items;
   }
@@ -94042,6 +94095,7 @@ var Ruff = class extends BaseLinter {
           message: msg.message,
           type: "",
           severity: 2 /* Warning */,
+          tags: ["F401", "F841"].includes(msg.code) ? [import_coc24.DiagnosticTag.Unnecessary] : [],
           provider: this.info.id,
           file: msg.filename,
           fix: this.fixToWorkspaceEdit(msg.filename, msg.fix)
@@ -94176,6 +94230,7 @@ var LintingEngine = class {
     diagnostic.code = message.code;
     diagnostic.source = message.provider;
     diagnostic.fix = message.fix;
+    diagnostic.tags = message.tags;
     return diagnostic;
   }
   shouldLintDocument(document) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-pyright",
-  "version": "1.1.283",
+  "version": "1.1.284",
   "description": "Pyright extension for coc.nvim, static type checker for Python",
   "author": "Heyward Fann <fannheyward@gmail.com>",
   "license": "MIT",
@@ -44,7 +44,7 @@
     "@types/which": "^2.0.0",
     "@typescript-eslint/eslint-plugin": "^5.6.0",
     "@typescript-eslint/parser": "^5.6.0",
-    "@zzzen/pyright-internal": "^1.2.0-dev.20221204",
+    "@zzzen/pyright-internal": "^1.2.0-dev.20221211",
     "coc.nvim": "^0.0.82",
     "diff-match-patch": "^1.0.5",
     "esbuild": "^0.15.6",
@@ -1526,6 +1526,6 @@
     ]
   },
   "dependencies": {
-    "pyright": "^1.1.283"
+    "pyright": "^1.1.284"
   }
 }