coc-pyright 1.1.271 → 1.1.272

package/lib/index.js

@@ -8833,12 +8833,6 @@ var require_parseTreeUtils = __commonJS({
           }
           return void 0;
         }
-        if (curNode.nodeType === 48) {
-          if (prevNode === curNode.typeAnnotation) {
-            return prevNode;
-          }
-          return void 0;
-        }
         prevNode = curNode;
         curNode = curNode.parent;
       }
@@ -13690,7 +13684,7 @@ __export(main_exports2, {
   ColorPresentation: () => ColorPresentation,
   Command: () => Command,
   CompletionItem: () => CompletionItem,
-  CompletionItemKind: () => CompletionItemKind2,
+  CompletionItemKind: () => CompletionItemKind,
   CompletionItemLabelDetails: () => CompletionItemLabelDetails,
   CompletionItemTag: () => CompletionItemTag,
   CompletionList: () => CompletionList,
@@ -13752,7 +13746,7 @@ __export(main_exports2, {
   integer: () => integer,
   uinteger: () => uinteger
 });
-var DocumentUri, URI, integer, uinteger, Position, Range, Location, LocationLink, Color, ColorInformation, ColorPresentation, FoldingRangeKind, FoldingRange, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, CodeDescription, Diagnostic, Command, TextEdit, ChangeAnnotation, ChangeAnnotationIdentifier, AnnotatedTextEdit, TextDocumentEdit, CreateFile, RenameFile, DeleteFile, WorkspaceEdit, TextEditChangeImpl, ChangeAnnotations, WorkspaceChange, TextDocumentIdentifier, VersionedTextDocumentIdentifier, OptionalVersionedTextDocumentIdentifier, TextDocumentItem, MarkupKind, MarkupContent, CompletionItemKind2, InsertTextFormat, CompletionItemTag, InsertReplaceEdit, InsertTextMode, CompletionItemLabelDetails, CompletionItem, CompletionList, MarkedString, Hover, ParameterInformation, SignatureInformation, DocumentHighlightKind, DocumentHighlight, SymbolKind, SymbolTag, SymbolInformation, WorkspaceSymbol, DocumentSymbol, CodeActionKind, CodeActionTriggerKind, CodeActionContext, CodeAction, CodeLens, FormattingOptions, DocumentLink, SelectionRange, SemanticTokenTypes, SemanticTokenModifiers, SemanticTokens, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext, InlayHintKind, InlayHintLabelPart, InlayHint, WorkspaceFolder, EOL, TextDocument2, FullTextDocument2, Is;
+var DocumentUri, URI, integer, uinteger, Position, Range, Location, LocationLink, Color, ColorInformation, ColorPresentation, FoldingRangeKind, FoldingRange, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, CodeDescription, Diagnostic, Command, TextEdit, ChangeAnnotation, ChangeAnnotationIdentifier, AnnotatedTextEdit, TextDocumentEdit, CreateFile, RenameFile, DeleteFile, WorkspaceEdit, TextEditChangeImpl, ChangeAnnotations, WorkspaceChange, TextDocumentIdentifier, VersionedTextDocumentIdentifier, OptionalVersionedTextDocumentIdentifier, TextDocumentItem, MarkupKind, MarkupContent, CompletionItemKind, InsertTextFormat, CompletionItemTag, InsertReplaceEdit, InsertTextMode, CompletionItemLabelDetails, CompletionItem, CompletionList, MarkedString, Hover, ParameterInformation, SignatureInformation, DocumentHighlightKind, DocumentHighlight, SymbolKind, SymbolTag, SymbolInformation, WorkspaceSymbol, DocumentSymbol, CodeActionKind, CodeActionTriggerKind, CodeActionContext, CodeAction, CodeLens, FormattingOptions, DocumentLink, SelectionRange, SemanticTokenTypes, SemanticTokenModifiers, SemanticTokens, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext, InlayHintKind, InlayHintLabelPart, InlayHint, WorkspaceFolder, EOL, TextDocument2, FullTextDocument2, Is;
 var init_main2 = __esm({
   "node_modules/vscode-languageserver-types/lib/esm/main.js"() {
     "use strict";
@@ -14504,7 +14498,7 @@ var init_main2 = __esm({
       CompletionItemKind4.Event = 23;
       CompletionItemKind4.Operator = 24;
       CompletionItemKind4.TypeParameter = 25;
-    })(CompletionItemKind2 || (CompletionItemKind2 = {}));
+    })(CompletionItemKind || (CompletionItemKind = {}));
     (function(InsertTextFormat3) {
       InsertTextFormat3.PlainText = 1;
       InsertTextFormat3.Snippet = 2;
@@ -23668,6 +23662,13 @@ var require_types = __commonJS({
         return type.specializedTypes && type.specializedTypes.returnType ? type.specializedTypes.returnType : type.details.declaredReturnType;
       }
       FunctionType2.getSpecializedReturnType = getSpecializedReturnType;
+      function getFunctionParameters(type, excludeNameless = true) {
+        if (excludeNameless) {
+          return type.details.parameters.filter((param) => !!param.name);
+        }
+        return type.details.parameters;
+      }
+      FunctionType2.getFunctionParameters = getFunctionParameters;
     })(FunctionType = exports.FunctionType || (exports.FunctionType = {}));
     var OverloadedFunctionType;
     (function(OverloadedFunctionType2) {
@@ -26536,7 +26537,7 @@ var require_typeUtils = __commonJS({
         return true;
       });
       const classListsToMerge = [];
-      filteredBaseClasses.forEach((baseClass, index) => {
+      filteredBaseClasses.forEach((baseClass) => {
         if ((0, types_1.isInstantiableClass)(baseClass)) {
           const typeVarContext2 = buildTypeVarContextFromSpecializedClass(baseClass, false);
           classListsToMerge.push(baseClass.details.mro.map((mroClass) => {
@@ -35609,6 +35610,7 @@ var require_signatureHelpProvider = __commonJS({
     var docStringUtils_1 = require_docStringUtils();
     var ParseTreeUtils = __importStar(require_parseTreeUtils());
     var parseTreeUtils_1 = require_parseTreeUtils();
+    var types_1 = require_types();
     var cancellationUtils_1 = require_cancellationUtils();
     var positionUtils_1 = require_positionUtils();
     var tooltipUtils_1 = require_tooltipUtils();
@@ -35663,7 +35665,7 @@ var require_signatureHelpProvider = __commonJS({
         const parameters = [];
         const functionDocString = (_a = (0, tooltipUtils_1.getFunctionDocStringFromType)(functionType, sourceMapper, evaluator)) !== null && _a !== void 0 ? _a : this._getDocStringFromCallNode(callNode, sourceMapper, evaluator);
         let label = "(";
-        const params = functionType.details.parameters;
+        const params = types_1.FunctionType.getFunctionParameters(functionType);
         stringParts[0].forEach((paramString, paramIndex) => {
           let paramName = "";
           if (paramIndex < params.length) {
@@ -38430,14 +38432,18 @@ var require_binder = __commonJS({
         return this._isKnownAnnotation(typeAnnotation, name, this._dataclassesImportAliases, this._dataclassesSymbolAliases);
       }
       _isKnownAnnotation(typeAnnotation, name, importAliases, symbolAliases) {
-        if (typeAnnotation.nodeType === 38) {
-          const alias = symbolAliases.get(typeAnnotation.value);
+        let annotationNode = typeAnnotation;
+        if (annotationNode.nodeType === 48 && annotationNode.typeAnnotation) {
+          annotationNode = annotationNode.typeAnnotation;
+        }
+        if (annotationNode.nodeType === 38) {
+          const alias = symbolAliases.get(annotationNode.value);
           if (alias === name) {
             return true;
           }
-        } else if (typeAnnotation.nodeType === 35) {
-          if (typeAnnotation.leftExpression.nodeType === 38 && typeAnnotation.memberName.value === name) {
-            const baseName = typeAnnotation.leftExpression.value;
+        } else if (annotationNode.nodeType === 35) {
+          if (annotationNode.leftExpression.nodeType === 38 && annotationNode.memberName.value === name) {
+            const baseName = annotationNode.leftExpression.value;
             return importAliases.some((alias) => alias === baseName);
           }
         }
@@ -45573,7 +45579,10 @@ var require_typeGuards = __commonJS({
                     }
                   ]);
                 }
-                const newClassInstanceType = types_1.ClassType.cloneAsInstance(newClassType);
+                let newClassInstanceType = types_1.ClassType.cloneAsInstance(newClassType);
+                if (varType.condition) {
+                  newClassInstanceType = (0, typeUtils_1.addConditionToType)(newClassInstanceType, varType.condition);
+                }
                 filteredTypes.push(isInstanceCheck ? newClassInstanceType : types_1.ClassType.cloneAsInstantiable(newClassInstanceType));
               }
             }
@@ -46215,7 +46224,7 @@ var require_patternMatching = __commonJS({
               }
             }
           } else {
-            if (!(0, types_1.isNever)(narrowedEntryType) || (0, types_1.isAnyOrUnknown)(entryType)) {
+            if (!(0, types_1.isNever)(narrowedEntryType)) {
               isDefiniteMatch = false;
             }
           }
@@ -46450,7 +46459,13 @@ var require_patternMatching = __commonJS({
                           false
                         );
                         const matchTypeInstance = types_1.ClassType.cloneAsInstance(unspecializedMatchType);
-                        if ((0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluator, matchTypeInstance, subjectSubtypeExpanded, typeVarContext, [])) {
+                        if ((0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(
+                          evaluator,
+                          matchTypeInstance,
+                          subjectSubtypeExpanded,
+                          typeVarContext,
+                          void 0
+                        )) {
                           resultType = (0, typeUtils_1.applySolvedTypeVars)(
                             matchTypeInstance,
                             typeVarContext,
@@ -51487,6 +51502,8 @@ var require_typeEvaluator = __commonJS({
       }
       function getTypeOfClassMember(errorNode, classType, memberName, usage = { method: "get" }, diag = void 0, memberAccessFlags = 0, bindToType) {
         let memberInfo;
+        const classDiag = diag ? new diagnostic_1.DiagnosticAddendum() : void 0;
+        const metaclassDiag = diag ? new diagnostic_1.DiagnosticAddendum() : void 0;
         if (types_1.ClassType.isPartiallyEvaluated(classType)) {
           addDiagnostic(AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.classDefinitionCycle().format({ name: classType.details.name }), errorNode);
           return { type: types_1.UnknownType.create() };
@@ -51498,7 +51515,7 @@ var require_typeEvaluator = __commonJS({
             false,
             memberName,
             usage,
-            diag,
+            classDiag,
             memberAccessFlags | 1,
             bindToType
           );
@@ -51512,6 +51529,7 @@ var require_typeEvaluator = __commonJS({
             }), errorNode);
           }
         }
+        const isMemberPresentOnClass = (memberInfo === null || memberInfo === void 0 ? void 0 : memberInfo.classType) !== void 0;
         if (!memberInfo) {
           const metaclass = classType.details.effectiveMetaclass;
           if (metaclass && (0, types_1.isInstantiableClass)(metaclass) && !types_1.ClassType.isSameGenericClass(metaclass, classType)) {
@@ -51521,7 +51539,7 @@ var require_typeEvaluator = __commonJS({
               true,
               memberName,
               usage,
-              void 0,
+              metaclassDiag,
               memberAccessFlags,
               classType
             );
@@ -51534,6 +51552,10 @@ var require_typeEvaluator = __commonJS({
             isAsymmetricDescriptor: memberInfo.isAsymmetricDescriptor
           };
         }
+        const subDiag = isMemberPresentOnClass ? classDiag : metaclassDiag;
+        if (diag && subDiag) {
+          diag.addAddendum(subDiag);
+        }
         return void 0;
       }
       function getBoundMethod(classType, memberName, recursionCount = 0, treatConstructorAsClassMember = false) {
@@ -58025,8 +58047,9 @@ var require_typeEvaluator = __commonJS({
           const minLambdaParamCount = node.parameters.filter((param) => param.category === 0 && param.defaultValue === void 0).length;
           const maxLambdaParamCount = node.parameters.filter((param) => param.category === 0).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);
+            const params = types_1.FunctionType.getFunctionParameters(functionType2);
+            const functionParamCount = params.filter((param) => !param.hasDefault).length;
+            const hasVarArgs = params.some((param) => param.category !== 0);
             return hasVarArgs || functionParamCount >= minLambdaParamCount && functionParamCount <= maxLambdaParamCount;
           });
         }
@@ -58108,14 +58131,6 @@ var require_typeEvaluator = __commonJS({
       function getTypeOfListComprehension(node, expectedType) {
         let isIncomplete = false;
         let typeErrors = false;
-        const elementTypeResult = getElementTypeFromListComprehension(node);
-        if (elementTypeResult.isIncomplete) {
-          isIncomplete = true;
-        }
-        if (elementTypeResult.typeErrors) {
-          typeErrors = true;
-        }
-        const elementType = elementTypeResult.type;
         let isAsync = node.forIfNodes.some((comp) => {
           return comp.nodeType === 33 && comp.isAsync || comp.nodeType === 34 && comp.testExpression.nodeType === 6;
         });
@@ -58123,6 +58138,18 @@ var require_typeEvaluator = __commonJS({
         if (node.expression.nodeType === 6) {
           isAsync = true;
         }
+        let expectedElementType;
+        if (expectedType) {
+          expectedElementType = getTypeOfIterator(expectedType, isAsync, void 0);
+        }
+        const elementTypeResult = getElementTypeFromListComprehension(node, expectedElementType);
+        if (elementTypeResult.isIncomplete) {
+          isIncomplete = true;
+        }
+        if (elementTypeResult.typeErrors) {
+          typeErrors = true;
+        }
+        const elementType = elementTypeResult.type;
         if (!isAsync && expectedType && (0, types_1.isClassInstance)(expectedType) && types_1.ClassType.isBuiltIn(expectedType, "AsyncGenerator")) {
           isAsync = true;
         }
@@ -59716,11 +59743,11 @@ var require_typeEvaluator = __commonJS({
       }
       function runClassTypeHooks(type) {
         classTypeHooks.forEach((hook) => {
-          if (hook.dependency === type) {
+          if (types_1.ClassType.isSameGenericClass(hook.dependency, type)) {
             hook.callback();
           }
         });
-        classTypeHooks = classTypeHooks.filter((hook) => hook.dependency !== type);
+        classTypeHooks = classTypeHooks.filter((hook) => !types_1.ClassType.isSameGenericClass(hook.dependency, type));
       }
       function completeClassTypeDeferred(type, errorNode) {
         if (!(0, typeUtils_1.computeMroLinearization)(type)) {
@@ -60894,7 +60921,7 @@ var require_typeEvaluator = __commonJS({
         return getInferredTypeOfDeclaration(symbolWithScope.symbol, aliasDecl);
       }
       function evaluateTypesForExpressionInContext(node) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         if (node.nodeType === 38 && node.parent) {
           if (node.parent.nodeType === 28 && node.parent.name === node) {
             getTypeOfFunction(node.parent);
@@ -60943,7 +60970,9 @@ var require_typeEvaluator = __commonJS({
             });
             return;
           }
-          getTypeOfAnnotation(annotationNode);
+          getTypeOfAnnotation(annotationNode, {
+            isVariableAnnotation: ((_a = annotationNode.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 54
+          });
           return;
         }
         const possibleCaseNode = ParseTreeUtils.getParentNodeOfType(node, 64);
@@ -61017,7 +61046,7 @@ var require_typeEvaluator = __commonJS({
             return;
           }
           case 75: {
-            if (nodeToEvaluate === parent.name && ((_a = parent.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 76 && ((_b = parent.parent.parent) === null || _b === void 0 ? void 0 : _b.nodeType) === 77) {
+            if (nodeToEvaluate === parent.name && ((_b = parent.parent) === null || _b === void 0 ? void 0 : _b.nodeType) === 76 && ((_c = parent.parent.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 77) {
               getTypeOfTypeAlias(parent.parent.parent);
               return;
             }
@@ -61028,9 +61057,9 @@ var require_typeEvaluator = __commonJS({
             return;
           }
           case 13: {
-            if (((_c = parent.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 10) {
+            if (((_d = parent.parent) === null || _d === void 0 ? void 0 : _d.nodeType) === 10) {
               getTypeOfClass(parent.parent);
-            } else if (((_d = parent.parent) === null || _d === void 0 ? void 0 : _d.nodeType) === 28) {
+            } else if (((_e = parent.parent) === null || _e === void 0 ? void 0 : _e.nodeType) === 28) {
               getTypeOfFunction(parent.parent);
             }
             return;
@@ -61046,7 +61075,7 @@ var require_typeEvaluator = __commonJS({
             if (nodeToEvaluate === parent.name) {
               return;
             }
-            if (((_e = parent.parent) === null || _e === void 0 ? void 0 : _e.nodeType) === 10) {
+            if (((_f = parent.parent) === null || _f === void 0 ? void 0 : _f.nodeType) === 10) {
               getTypeOfClass(parent.parent);
               return;
             }
@@ -61394,8 +61423,8 @@ var require_typeEvaluator = __commonJS({
                   received: typeArgCount
                 }), typeArgs[typeParameters.length].node);
               }
+              typeArgCount = typeParameters.length;
             }
-            typeArgCount = typeParameters.length;
           } else if (typeArgCount < typeParameters.length) {
             const fileInfo2 = AnalyzerNodeInfo.getFileInfo(errorNode);
             addDiagnostic(fileInfo2.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeArgsTooFew().format({
@@ -61517,6 +61546,9 @@ var require_typeEvaluator = __commonJS({
           }
           return typeArgType;
         });
+        if (typeArgs && classType.details.typeParameters.length === 0 && types_1.ClassType.isPartiallyEvaluated(classType)) {
+          typeArgTypes = typeArgs.map((t) => (0, typeUtils_1.convertToInstance)(t.type));
+        }
         const specializedClass = types_1.ClassType.cloneForSpecialization(classType, typeArgTypes, typeArgs !== void 0);
         return specializedClass;
       }
@@ -62283,6 +62315,17 @@ var require_typeEvaluator = __commonJS({
                 throw e;
               }
             } else {
+              const resolvedDecl = resolveAliasDeclaration(
+                decl,
+                true,
+                AnalyzerNodeInfo.getFileInfo(decl.node).isStubFile
+              );
+              if ((resolvedDecl === null || resolvedDecl === void 0 ? void 0 : resolvedDecl.type) === 6) {
+                const classTypeInfo = getTypeOfClass(resolvedDecl.node);
+                if (classTypeInfo === null || classTypeInfo === void 0 ? void 0 : classTypeInfo.decoratedType) {
+                  typesToCombine.push(classTypeInfo.decoratedType);
+                }
+              }
               isIncomplete = true;
             }
           }
@@ -64208,10 +64251,7 @@ var require_typeEvaluator = __commonJS({
           const effectiveDestType = (flags & 2) === 0 ? destType : srcType;
           const effectiveSrcType = (flags & 2) === 0 ? srcType : destType;
           if (effectiveDestType.details.paramSpec) {
-            const requiredMatchParamCount = effectiveDestType.details.parameters.filter((p) => {
-              if (!p.name) {
-                return false;
-              }
+            const requiredMatchParamCount = types_1.FunctionType.getFunctionParameters(effectiveDestType).filter((p) => {
               if (p.category === 0 && (0, types_1.isParamSpec)(p.type)) {
                 return false;
               }
@@ -64613,6 +64653,9 @@ var require_typeEvaluator = __commonJS({
           }
           effectiveSrcType = makeTopLevelTypeVarsConcrete(srcType);
         }
+        if ((0, types_1.isClass)(effectiveSrcType) && types_1.ClassType.isPartiallyEvaluated(effectiveSrcType)) {
+          return srcType;
+        }
         if (destType.details.boundType) {
           if (!assignType(
             destType.details.boundType,
@@ -65255,7 +65298,7 @@ var require_checker = __commonJS({
               }
             }
           });
-          const paramSpecParams = functionTypeResult.functionType.details.parameters.filter((param) => {
+          const paramSpecParams = types_1.FunctionType.getFunctionParameters(functionTypeResult.functionType).filter((param) => {
             if (param.typeAnnotation && (0, types_1.isTypeVar)(param.type) && (0, types_1.isParamSpec)(param.type)) {
               if (param.category !== 0 && param.name && param.type.paramSpecAccess) {
                 return true;
@@ -65328,7 +65371,7 @@ var require_checker = __commonJS({
           }
           this._validateDunderSignatures(node, functionTypeResult.functionType, containingClassNode !== void 0);
           this._validateStrictTypeGuardFunction(node, functionTypeResult.functionType, containingClassNode !== void 0);
-          this._validateFunctionTypeVarUsage(node, functionTypeResult.functionType);
+          this._validateFunctionTypeVarUsage(node, functionTypeResult);
         }
         if (this._fileInfo.isStubFile && node.name.value === "__getattr__") {
           const scope = (0, scopeUtils_1.getScopeForNode)(node);
@@ -66054,10 +66097,11 @@ var require_checker = __commonJS({
       _isTypeValidForUnusedValueTest(type) {
         return !(0, types_1.isNoneInstance)(type) && !(0, types_1.isNever)(type) && !(0, types_1.isAnyOrUnknown)(type);
       }
-      _validateFunctionTypeVarUsage(node, type) {
+      _validateFunctionTypeVarUsage(node, functionTypeResult) {
         if (this._fileInfo.diagnosticRuleSet.reportInvalidTypeVarUse === "none") {
           return;
         }
+        const type = functionTypeResult.functionType;
         const localTypeVarUsage = /* @__PURE__ */ new Map();
         const classTypeVarUsage = /* @__PURE__ */ new Map();
         let exemptBoundTypeVar = true;
@@ -66164,7 +66208,8 @@ var require_checker = __commonJS({
               isUsedInReturnType = false;
             }
           }
-          if (isUsedInReturnType && usage.paramTypeWithEllipsisUsageCount > 0 && usage.paramTypeUsageCount === usage.paramTypeWithEllipsisUsageCount) {
+          const skipUnsolvableTypeVarCheck = (0, types_1.isOverloadedFunction)(functionTypeResult.decoratedType) && !types_1.FunctionType.isOverloaded(functionTypeResult.functionType);
+          if (isUsedInReturnType && usage.paramTypeWithEllipsisUsageCount > 0 && usage.paramTypeUsageCount === usage.paramTypeWithEllipsisUsageCount && !skipUnsolvableTypeVarCheck) {
             const diag = new diagnostic_1.DiagnosticAddendum();
             diag.addMessage(localize_1.Localizer.DiagnosticAddendum.typeVarUnsolvableRemedy());
             this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportInvalidTypeVarUse, diagnosticRules_1.DiagnosticRule.reportInvalidTypeVarUse, localize_1.Localizer.Diagnostic.typeVarPossiblyUnsolvable().format({
@@ -69956,7 +70001,7 @@ var require_tokenizer = __commonJS({
         if (this._tokens.length === 0 || this._tokens[this._tokens.length - 1].type !== 2) {
           this._tokens.push(tokenizerTypes_1.NewLineToken.create(this._cs.position, 0, 3, this._getComments()));
         }
-        this._setIndent(0, 0, false, false);
+        this._setIndent(this._cs.position, 0, 0, false, false);
         this._tokens.push(tokenizerTypes_1.Token.create(1, this._cs.position, 0, this._getComments()));
         this._addLineRange();
         let predominantEndOfLineSequence = "\n";
@@ -70181,6 +70226,7 @@ var require_tokenizer = __commonJS({
         let tab8Spaces = 0;
         let isTabPresent = false;
         let isSpacePresent = false;
+        const startOffset = this._cs.position;
         while (!this._cs.isEndOfStream()) {
           switch (this._cs.currentChar) {
             case 32:
@@ -70203,7 +70249,7 @@ var require_tokenizer = __commonJS({
               this._cs.moveNext();
               break;
             default:
-              this._setIndent(tab1Spaces, tab8Spaces, isSpacePresent, isTabPresent);
+              this._setIndent(startOffset, tab1Spaces, tab8Spaces, isSpacePresent, isTabPresent);
               return;
             case 35:
             case 10:
@@ -70212,7 +70258,7 @@ var require_tokenizer = __commonJS({
           }
         }
       }
-      _setIndent(tab1Spaces, tab8Spaces, isSpacePresent, isTabPresent) {
+      _setIndent(startOffset, tab1Spaces, tab8Spaces, isSpacePresent, isTabPresent) {
         if (this._parenDepth > 0) {
           return;
         }
@@ -70229,7 +70275,7 @@ var require_tokenizer = __commonJS({
               isSpacePresent,
               isTabPresent
             });
-            this._tokens.push(tokenizerTypes_1.IndentToken.create(this._cs.position, 0, tab8Spaces, false, this._getComments()));
+            this._tokens.push(tokenizerTypes_1.IndentToken.create(startOffset, tab1Spaces, tab8Spaces, false, this._getComments()));
           }
         } else {
           const prevTabInfo = this._indentAmounts[this._indentAmounts.length - 1];
@@ -70246,10 +70292,10 @@ var require_tokenizer = __commonJS({
               isSpacePresent,
               isTabPresent
             });
-            this._tokens.push(tokenizerTypes_1.IndentToken.create(this._cs.position, 0, tab8Spaces, isIndentAmbiguous, this._getComments()));
+            this._tokens.push(tokenizerTypes_1.IndentToken.create(startOffset, tab1Spaces, tab8Spaces, isIndentAmbiguous, this._getComments()));
           } else if (prevTabInfo.tab8Spaces === tab8Spaces) {
             if (prevTabInfo.isSpacePresent && isTabPresent || prevTabInfo.isTabPresent && isSpacePresent) {
-              this._tokens.push(tokenizerTypes_1.IndentToken.create(this._cs.position, 0, tab8Spaces, true, this._getComments()));
+              this._tokens.push(tokenizerTypes_1.IndentToken.create(startOffset, tab1Spaces, tab8Spaces, true, this._getComments()));
             }
           } else {
             let isDedentAmbiguous = prevTabInfo.isSpacePresent && isTabPresent || prevTabInfo.isTabPresent && isSpacePresent;
@@ -71110,50 +71156,53 @@ var require_parser = __commonJS({
           if (this._consumeTokensUntilType([2, 10])) {
             this._getNextToken();
           }
-        } else if (!this._consumeTokenIfType(2)) {
-          this._addError(localize_1.Localizer.Diagnostic.expectedNewline(), nextToken);
         } else {
-          const possibleIndent = this._peekToken();
-          if (!this._consumeTokenIfType(3)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedIndentedBlock(), this._peekToken());
+          (0, parseNodes_1.extendRange)(matchNode, nextToken);
+          if (!this._consumeTokenIfType(2)) {
+            this._addError(localize_1.Localizer.Diagnostic.expectedNewline(), nextToken);
           } else {
-            const indentToken = possibleIndent;
-            if (indentToken.isIndentAmbiguous) {
-              this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), indentToken);
-            }
-          }
-          while (true) {
-            const nextToken2 = this._peekToken();
-            if (nextToken2.type === 3) {
-              this._getNextToken();
-              const indentToken = nextToken2;
+            const possibleIndent = this._peekToken();
+            if (!this._consumeTokenIfType(3)) {
+              this._addError(localize_1.Localizer.Diagnostic.expectedIndentedBlock(), this._peekToken());
+            } else {
+              const indentToken = possibleIndent;
               if (indentToken.isIndentAmbiguous) {
                 this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), indentToken);
-              } else {
-                this._addError(localize_1.Localizer.Diagnostic.unexpectedIndent(), nextToken2);
               }
             }
-            const caseStatement = this._parseCaseStatement();
-            if (!caseStatement) {
-              if (this._consumeTokensUntilType([2, 10])) {
+            while (true) {
+              const possibleUnexpectedIndent = this._peekToken();
+              if (possibleUnexpectedIndent.type === 3) {
                 this._getNextToken();
+                const indentToken = possibleUnexpectedIndent;
+                if (indentToken.isIndentAmbiguous) {
+                  this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), indentToken);
+                } else {
+                  this._addError(localize_1.Localizer.Diagnostic.unexpectedIndent(), possibleUnexpectedIndent);
+                }
               }
-            } else {
-              caseStatement.parent = matchNode;
-              matchNode.cases.push(caseStatement);
-            }
-            const dedentToken = this._peekToken();
-            if (this._consumeTokenIfType(4)) {
-              if (!dedentToken.matchesIndent) {
-                this._addError(localize_1.Localizer.Diagnostic.inconsistentIndent(), dedentToken);
+              const caseStatement = this._parseCaseStatement();
+              if (!caseStatement) {
+                if (this._consumeTokensUntilType([2, 10])) {
+                  this._getNextToken();
+                }
+              } else {
+                caseStatement.parent = matchNode;
+                matchNode.cases.push(caseStatement);
               }
-              if (dedentToken.isDedentAmbiguous) {
-                this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), dedentToken);
+              const dedentToken = this._peekToken();
+              if (this._consumeTokenIfType(4)) {
+                if (!dedentToken.matchesIndent) {
+                  this._addError(localize_1.Localizer.Diagnostic.inconsistentIndent(), dedentToken);
+                }
+                if (dedentToken.isDedentAmbiguous) {
+                  this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), dedentToken);
+                }
+                break;
+              }
+              if (this._peekTokenType() === 1) {
+                break;
               }
-              break;
-            }
-            if (this._peekTokenType() === 1) {
-              break;
             }
           }
           if (matchNode.cases.length > 0) {
@@ -73459,17 +73508,11 @@ var require_parser = __commonJS({
         }
         const exprListResult = this._parseTestListWithComprehension();
         const tupleOrExpression = this._makeExpressionOrTuple(exprListResult, true);
-        const isExpression = exprListResult.list.length === 1 && !exprListResult.trailingComma;
-        if (!isExpression) {
-          (0, parseNodes_1.extendRange)(tupleOrExpression, startParen);
-        }
+        (0, parseNodes_1.extendRange)(tupleOrExpression, startParen);
         if (this._peekTokenType() !== 14) {
           return this._handleExpressionParseError(8, localize_1.Localizer.Diagnostic.expectedCloseParen(), startParen, (_a = exprListResult.parseError) !== null && _a !== void 0 ? _a : tupleOrExpression);
         } else {
-          const nextToken = this._getNextToken();
-          if (!isExpression) {
-            (0, parseNodes_1.extendRange)(tupleOrExpression, nextToken);
-          }
+          (0, parseNodes_1.extendRange)(tupleOrExpression, this._getNextToken());
         }
         return tupleOrExpression;
       }
@@ -91696,7 +91739,7 @@ var ImportCompletionProvider = class {
       return [];
     const items = [];
     for (const o of result.items) {
-      items.push({ label: o.word, sortText: o.sortText, kind: CompletionItemKind.Module, filterText: o.filterText });
+      items.push({ label: o.word, sortText: o.sortText, kind: import_coc10.CompletionItemKind.Module, filterText: o.filterText });
     }
     return items;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-pyright",
-  "version": "1.1.271",
+  "version": "1.1.272",
   "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.20220911",
+    "@zzzen/pyright-internal": "^1.2.0-dev.20220918",
     "coc.nvim": "^0.0.82",
     "diff-match-patch": "^1.0.5",
     "esbuild": "^0.15.6",
@@ -1486,6 +1486,6 @@
     ]
   },
   "dependencies": {
-    "pyright": "^1.1.271"
+    "pyright": "^1.1.272"
   }
 }