coc-pyright 1.1.393 → 1.1.394

package/lib/index.js

@@ -18909,6 +18909,10 @@ var require_package_nls_en_us = __commonJS({
           message: '"{name}" was already declared nonlocal',
           comment: "{Locked='nonlocal'}"
         },
+        nonlocalTypeParam: {
+          message: 'Nonlocal binding is not allowed for type parameter "{name}"',
+          comment: ["{StrContains=i'nonlocal'}", "'nonlocal' is a keyword and should not be localized. It is only capitalized here because it is the first word in the sentence"]
+        },
         noneNotCallable: {
           message: 'Object of type "None" cannot be called',
           comment: "{Locked='None'}"
@@ -19537,7 +19541,7 @@ var require_package_nls_en_us = __commonJS({
           comment: "{Locked='True','False'}"
         },
         typedDictClosedExtras: {
-          message: 'Base class "{name}" is a closed TypedDict; extra items must be type "{type}"',
+          message: 'Base class "{name}" is a TypedDict that limits the type of extra items to type "{type}"',
           comment: "{Locked='closed','TypedDict'}"
         },
         typedDictClosedNoExtras: {
@@ -19559,8 +19563,8 @@ var require_package_nls_en_us = __commonJS({
           comment: "{Locked='TypedDict'}"
         },
         typedDictExtraItemsClosed: {
-          message: "A TypedDict cannot be closed if it supports extra items",
-          comment: "{Locked='TypedDict','closed'}"
+          message: 'TypedDict can use either "closed" or "extra_items" but not both',
+          comment: "{Locked='TypedDict','closed','extra_items'}"
         },
         typedDictFieldNotRequiredRedefinition: {
           message: 'TypedDict item "{name}" cannot be redefined as NotRequired',
@@ -30724,11 +30728,12 @@ var require_localize = __commonJS({
         Diagnostic4.noneNotUsableWithAsync = () => getRawString("Diagnostic.noneNotUsableWithAsync");
         Diagnostic4.noneOperator = () => new ParameterizedString(getRawString("Diagnostic.noneOperator"));
         Diagnostic4.noneUnknownMember = () => new ParameterizedString(getRawString("Diagnostic.noneUnknownMember"));
+        Diagnostic4.nonLocalInModule = () => getRawString("Diagnostic.nonLocalInModule");
         Diagnostic4.nonLocalNoBinding = () => new ParameterizedString(getRawString("Diagnostic.nonLocalNoBinding"));
         Diagnostic4.nonLocalReassignment = () => new ParameterizedString(getRawString("Diagnostic.nonLocalReassignment"));
         Diagnostic4.nonLocalRedefinition = () => new ParameterizedString(getRawString("Diagnostic.nonLocalRedefinition"));
-        Diagnostic4.nonLocalInModule = () => getRawString("Diagnostic.nonLocalInModule");
         Diagnostic4.noOverload = () => new ParameterizedString(getRawString("Diagnostic.noOverload"));
+        Diagnostic4.nonlocalTypeParam = () => new ParameterizedString(getRawString("Diagnostic.nonlocalTypeParam"));
         Diagnostic4.noReturnContainsReturn = () => getRawString("Diagnostic.noReturnContainsReturn");
         Diagnostic4.noReturnContainsYield = () => getRawString("Diagnostic.noReturnContainsYield");
         Diagnostic4.noReturnReturnsNone = () => getRawString("Diagnostic.noReturnReturnsNone");
@@ -42655,6 +42660,7 @@ var require_tokenizer = __commonJS({
         }
       }
       _skipToEndOfStringLiteral(flags, inFormatSpecifier = false) {
+        var _a;
         const quoteChar = flags & 1 ? 39 : 34;
         const isTriplicate = (flags & 4) !== 0;
         const isFString = (flags & 64) !== 0;
@@ -42696,12 +42702,14 @@ var require_tokenizer = __commonJS({
               }
             }
           } else if (this._cs.currentChar === 10 || this._cs.currentChar === 13) {
-            if (!isTriplicate && !isFString) {
-              flags |= 65536;
-              return {
-                escapedValue: getEscapedValue(),
-                flags
-              };
+            if (!isTriplicate) {
+              if (!isFString || !((_a = this._activeFString) == null ? void 0 : _a.activeReplacementField)) {
+                flags |= 65536;
+                return {
+                  escapedValue: getEscapedValue(),
+                  flags
+                };
+              }
             }
             if (this._cs.currentChar === 13 && this._cs.nextChar === 10) {
               escapedValueLength++;
@@ -44325,6 +44333,7 @@ var require_binder = __commonJS({
           /* unbound */
           false
         );
+        this._addInferredTypeAssignmentForVariable(node.d.destExpr, node.d.rightExpr);
         if (node.d.operator === 1 && this._currentScope.type === 4 && node.d.leftExpr.nodeType === 38 && node.d.leftExpr.d.value === "__all__") {
           const expr = node.d.rightExpr;
           let emitDunderAllWarning = true;
@@ -49728,6 +49737,7 @@ var require_typeUtils = __commonJS({
       MemberAccessFlags2[MemberAccessFlags2["SkipAttributeAccessOverride"] = 512] = "SkipAttributeAccessOverride";
       MemberAccessFlags2[MemberAccessFlags2["DisallowGenericInstanceVariableAccess"] = 1024] = "DisallowGenericInstanceVariableAccess";
       MemberAccessFlags2[MemberAccessFlags2["TypeExpression"] = 2048] = "TypeExpression";
+      MemberAccessFlags2[MemberAccessFlags2["SkipTypedDictEntries"] = 4096] = "SkipTypedDictEntries";
     })(MemberAccessFlags || (exports2.MemberAccessFlags = MemberAccessFlags = {}));
     var ClassIteratorFlags;
     (function(ClassIteratorFlags2) {
@@ -50762,6 +50772,7 @@ var require_typeUtils = __commonJS({
       return (_b = memberItr.next()) == null ? void 0 : _b.value;
     }
     function* getClassMemberIterator(classType, memberName, flags = 0, skipMroClass) {
+      var _a;
       const declaredTypesOnly = (flags & 64) !== 0;
       let skippedUndeclaredType = false;
       if ((0, types_1.isClass)(classType)) {
@@ -50804,9 +50815,10 @@ var require_typeUtils = __commonJS({
             continue;
           }
           const memberFields = types_1.ClassType.getSymbolTable(specializedMroClass);
+          const skipTdEntry = (flags & 4096) !== 0 && ((_a = specializedMroClass.shared.typedDictEntries) == null ? void 0 : _a.knownItems.has(memberName));
           if ((flags & 16) === 0) {
             const symbol = memberFields.get(memberName);
-            if (symbol && symbol.isInstanceMember()) {
+            if (symbol && symbol.isInstanceMember() && !skipTdEntry) {
               const hasDeclaredType = symbol.hasTypedDeclarations();
               if (!declaredTypesOnly || hasDeclaredType) {
                 const cm = {
@@ -50828,7 +50840,7 @@ var require_typeUtils = __commonJS({
           }
           if ((flags & 32) === 0) {
             let symbol = memberFields.get(memberName);
-            if (symbol && symbol.isClassMember()) {
+            if (symbol && symbol.isClassMember() && !skipTdEntry) {
               const hasDeclaredType = symbol.hasTypedDeclarations();
               if (!declaredTypesOnly || hasDeclaredType) {
                 let isInstanceMember = symbol.isInstanceMember();
@@ -55002,7 +55014,7 @@ var require_parameterUtils = __commonJS({
       ParamKind2[ParamKind2["Keyword"] = 2] = "Keyword";
       ParamKind2[ParamKind2["ExpandedArgs"] = 3] = "ExpandedArgs";
     })(ParamKind || (exports2.ParamKind = ParamKind = {}));
-    function getParamListDetails(type) {
+    function getParamListDetails(type, options) {
       const result = {
         firstPositionOrKeywordIndex: 0,
         positionParamCount: 0,
@@ -55062,7 +55074,7 @@ var require_parameterUtils = __commonJS({
         }
       };
       type.shared.parameters.forEach((param, index) => {
-        var _a, _b;
+        var _a, _b, _c;
         if (param.category === 1) {
           const paramType = types_1.FunctionType.getParamType(type, index);
           if (param.name && (0, types_1.isUnpackedClass)(paramType) && paramType.priv.tupleTypeArgs) {
@@ -55130,8 +55142,9 @@ var require_parameterUtils = __commonJS({
               const defaultParamType = !entry.isRequired ? specializedParamType : void 0;
               addVirtualParam(types_1.FunctionParam.create(0, specializedParamType, types_1.FunctionParamFlags.TypeDeclared, name, defaultParamType), index, specializedParamType, defaultParamType);
             });
-            if (paramType.shared.typedDictEntries.extraItems) {
-              addVirtualParam(types_1.FunctionParam.create(2, paramType.shared.typedDictEntries.extraItems.valueType, types_1.FunctionParamFlags.TypeDeclared, "kwargs"), index, paramType.shared.typedDictEntries.extraItems.valueType);
+            const extraItemsType = ((_a = paramType.shared.typedDictEntries.extraItems) == null ? void 0 : _a.valueType) ?? types_1.AnyType.create();
+            if (!(0, types_1.isNever)(extraItemsType) && !(options == null ? void 0 : options.disallowExtraKwargsForTd)) {
+              addVirtualParam(types_1.FunctionParam.create(2, extraItemsType, types_1.FunctionParamFlags.TypeDeclared, "kwargs"), index, extraItemsType);
               result.kwargsIndex = result.params.length - 1;
             }
             result.hasUnpackedTypedDict = true;
@@ -55154,7 +55167,7 @@ var require_parameterUtils = __commonJS({
             index,
             /* typeOverride */
             void 0,
-            ((_a = type.priv.specializedTypes) == null ? void 0 : _a.parameterDefaultTypes) ? (_b = type.priv.specializedTypes) == null ? void 0 : _b.parameterDefaultTypes[index] : void 0
+            ((_b = type.priv.specializedTypes) == null ? void 0 : _b.parameterDefaultTypes) ? (_c = type.priv.specializedTypes) == null ? void 0 : _c.parameterDefaultTypes[index] : void 0
           );
         }
       });
@@ -55336,31 +55349,35 @@ var require_typedDicts = __commonJS({
       }
       if (usingDictSyntax) {
         const argsToConsider = argList.slice(2);
+        let sawClosedOrExtraItems = false;
         for (const arg of argsToConsider) {
           if (((_a = arg.name) == null ? void 0 : _a.d.value) === "total" || ((_b = arg.name) == null ? void 0 : _b.d.value) === "closed") {
             if (!arg.valueExpression || arg.valueExpression.nodeType !== 14 || !(arg.valueExpression.d.constType === 15 || arg.valueExpression.d.constType === 33)) {
               evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typedDictBoolParam().format({ name: arg.name.d.value }), arg.valueExpression || errorNode);
             } else if (arg.name.d.value === "total" && arg.valueExpression.d.constType === 15) {
               classType.shared.flags |= 32;
-            } else if (arg.name.d.value === "closed" && arg.valueExpression.d.constType === 33) {
-              if (AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.enableExperimentalFeatures) {
-                classType.shared.flags |= 8 | 16;
+            } else if (arg.name.d.value === "closed") {
+              if (arg.valueExpression.d.constType === 33) {
+                if (AnalyzerNodeInfo.getFileInfo(errorNode).diagnosticRuleSet.enableExperimentalFeatures) {
+                  classType.shared.flags |= 8 | 16;
+                }
+              }
+              if (sawClosedOrExtraItems) {
+                evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typedDictExtraItemsClosed(), arg.valueExpression || errorNode);
               }
+              sawClosedOrExtraItems = true;
             }
           } else if (((_c = arg.name) == null ? void 0 : _c.d.value) === "extra_items") {
             classType.shared.typedDictExtraItemsExpr = arg.valueExpression;
             classType.shared.flags |= 16;
+            if (sawClosedOrExtraItems) {
+              evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typedDictExtraItemsClosed(), arg.valueExpression || errorNode);
+            }
+            sawClosedOrExtraItems = true;
           } else {
             evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportCallIssue, localize_1.LocMessage.typedDictExtraArgs(), arg.valueExpression || errorNode);
           }
         }
-        if (types_1.ClassType.isTypedDictMarkedClosed(classType) && classType.shared.typedDictExtraItemsExpr) {
-          const arg = argsToConsider.find((arg2) => {
-            var _a2;
-            return ((_a2 = arg2.name) == null ? void 0 : _a2.d.value) === "extra_items";
-          });
-          evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typedDictExtraItemsClosed(), (arg == null ? void 0 : arg.valueExpression) ?? errorNode);
-        }
       }
       synthesizeTypedDictClassMethods(evaluator, errorNode, classType);
       if (((_d = errorNode.parent) == null ? void 0 : _d.nodeType) === 3 && className) {
@@ -55666,6 +55683,23 @@ var require_typedDicts = __commonJS({
             true
           ));
         }
+        if (types_1.ClassType.isTypedDictEffectivelyClosed(classType)) {
+          if (!(0, types_1.isNever)(extraEntriesInfo.valueType)) {
+            popOverloads.push(...createPopMethods(
+              strType,
+              extraEntriesInfo.valueType,
+              /* isEntryRequired */
+              false
+            ));
+          }
+        } else {
+          popOverloads.push(...createPopMethods(
+            strType,
+            evaluator.getObjectType(),
+            /* isEntryRequired */
+            false
+          ));
+        }
         symbolTable.set("get", symbol_1.Symbol.createWithType(4, types_1.OverloadedType.create(getOverloads)));
         if (popOverloads.length > 0) {
           symbolTable.set("pop", symbol_1.Symbol.createWithType(4, types_1.OverloadedType.create(popOverloads)));
@@ -67352,7 +67386,7 @@ var require_codeFlowEngine = __commonJS({
           false
         );
         if (returnType) {
-          if ((0, types_1.isClassInstance)(returnType) && types_1.ClassType.isBuiltIn(returnType, "Coroutine") && returnType.priv.typeArgs && returnType.priv.typeArgs.length >= 3) {
+          if ((0, types_1.isClassInstance)(returnType) && types_1.ClassType.isBuiltIn(returnType, ["Coroutine", "CoroutineType"]) && returnType.priv.typeArgs && returnType.priv.typeArgs.length >= 3) {
             if ((0, types_1.isNever)(returnType.priv.typeArgs[2]) && isCallAwaited) {
               return true;
             }
@@ -67411,7 +67445,7 @@ var require_codeFlowEngine = __commonJS({
             if (exitType && (0, types_1.isFunction)(exitType) && exitType.shared.declaredReturnType) {
               let returnType = exitType.shared.declaredReturnType;
               if (isAsync) {
-                if ((0, types_1.isClassInstance)(returnType) && types_1.ClassType.isBuiltIn(returnType, "Coroutine") && returnType.priv.typeArgs && returnType.priv.typeArgs.length >= 3) {
+                if ((0, types_1.isClassInstance)(returnType) && types_1.ClassType.isBuiltIn(returnType, ["Coroutine", "CoroutineType"]) && returnType.priv.typeArgs && returnType.priv.typeArgs.length >= 3) {
                   returnType = returnType.priv.typeArgs[2];
                 }
               }
@@ -70465,6 +70499,7 @@ var require_typeEvaluator = __commonJS({
     var constraintTracker_1 = require_constraintTracker();
     var constructors_1 = require_constructors();
     var dataClasses_1 = require_dataClasses();
+    var declaration_1 = require_declaration();
     var declarationUtils_1 = require_declarationUtils();
     var decorators_1 = require_decorators();
     var enums_1 = require_enums();
@@ -70519,7 +70554,8 @@ var require_typeEvaluator = __commonJS({
     var maxEntriesToUseForInference = 64;
     var maxDeclarationsToUseForInference = 64;
     var maxEffectiveTypeEvaluationAttempts = 16;
-    var maxOverloadArgTypeExpansionCount = 64;
+    var maxTotalOverloadArgTypeExpansionCount = 256;
+    var maxSingleOverloadArgTypeExpansionCount = 64;
     var maxInferFunctionReturnRecursionCount = 12;
     var maxRecursiveTypeAliasRecursionCount = 10;
     var maxTypedDeclsPerSymbol = 16;
@@ -71680,7 +71716,7 @@ var require_typeEvaluator = __commonJS({
             usage,
             /* diag */
             void 0,
-            flags | 512,
+            flags | 512 | 4096,
             objectType,
             recursionCount
           );
@@ -71697,7 +71733,7 @@ var require_typeEvaluator = __commonJS({
         }
         let subDiag;
         if (!skipObjectTypeLookup) {
-          let effectiveFlags = flags;
+          let effectiveFlags = flags | 4096;
           if (objectTypeIsInstantiable) {
             effectiveFlags |= 16 | 512 | 1024;
             effectiveFlags &= ~32;
@@ -73159,12 +73195,10 @@ var require_typeEvaluator = __commonJS({
             break;
           }
           case 56: {
-            if (target.d.expr.nodeType === 38) {
-              assignTypeToNameNode(target.d.expr, {
-                type: getBuiltInObject(target.d.expr, "list", [typeResult.type]),
-                isIncomplete: typeResult.isIncomplete
-              }, ignoreEmptyContainers, srcExpr);
-            }
+            assignTypeToExpression(target.d.expr, {
+              type: getBuiltInObject(target.d.expr, "list", [typeResult.type]),
+              isIncomplete: typeResult.isIncomplete
+            }, srcExpr, ignoreEmptyContainers, allowAssignmentToFinalVar, expectedTypeDiagAddendum);
             break;
           }
           case 0: {
@@ -76683,7 +76717,7 @@ var require_typeEvaluator = __commonJS({
             });
           }
           expandedArgTypes = expandArgTypes(contextFreeArgTypes, expandedArgTypes);
-          if (!expandedArgTypes || expandedArgTypes.length > maxOverloadArgTypeExpansionCount) {
+          if (!expandedArgTypes || expandedArgTypes.length > maxTotalOverloadArgTypeExpansionCount) {
             break;
           }
         }
@@ -76736,11 +76770,11 @@ var require_typeEvaluator = __commonJS({
         (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
           if ((0, types_1.isClassInstance)(subtype)) {
             const expandedLiteralTypes = (0, typeGuards_1.enumerateLiteralsForType)(evaluatorInterface, subtype);
-            if (expandedLiteralTypes) {
+            if (expandedLiteralTypes && expandedLiteralTypes.length <= maxSingleOverloadArgTypeExpansionCount) {
               (0, collectionUtils_1.appendArray)(expandedTypes, expandedLiteralTypes);
               return;
             }
-            const expandedTuples = (0, tuples_1.expandTuple)(subtype, maxOverloadArgTypeExpansionCount);
+            const expandedTuples = (0, tuples_1.expandTuple)(subtype, maxSingleOverloadArgTypeExpansionCount);
             if (expandedTuples) {
               (0, collectionUtils_1.appendArray)(expandedTypes, expandedTuples);
               return;
@@ -77277,7 +77311,7 @@ var require_typeEvaluator = __commonJS({
       function matchArgsToParams(errorNode, argList, typeResult, overloadIndex) {
         var _a, _b;
         const overload = typeResult.type;
-        const paramDetails = (0, parameterUtils_1.getParamListDetails)(overload);
+        const paramDetails = (0, parameterUtils_1.getParamListDetails)(overload, { disallowExtraKwargsForTd: true });
         const paramSpec = types_1.FunctionType.getParamSpecFromArgsKwargs(overload);
         let argIndex = 0;
         let matchedUnpackedListOfUnknownLength = false;
@@ -77657,8 +77691,8 @@ var require_typeEvaluator = __commonJS({
                     const kwargsParam = paramDetails.params[paramDetails.kwargsIndex];
                     validateArgTypeParams.push({
                       paramCategory: 2,
-                      paramType: kwargsParam.declaredType,
-                      requiresTypeVarMatching: (0, typeUtils_1.requiresSpecialization)(kwargsParam.declaredType),
+                      paramType: kwargsParam.type,
+                      requiresTypeVarMatching: (0, typeUtils_1.requiresSpecialization)(kwargsParam.type),
                       argument: {
                         argCategory: 2,
                         typeResult: { type: extraItemsType }
@@ -79951,7 +79985,7 @@ var require_typeEvaluator = __commonJS({
           if (generatorTypeArgs) {
             return generatorTypeArgs.length >= 2 ? generatorTypeArgs[2] : types_1.UnknownType.create();
           }
-          if ((0, types_1.isClassInstance)(yieldFromSubtype) && types_1.ClassType.isBuiltIn(yieldFromSubtype, "Coroutine")) {
+          if ((0, types_1.isClassInstance)(yieldFromSubtype) && types_1.ClassType.isBuiltIn(yieldFromSubtype, ["Coroutine", "CoroutineType"])) {
             return types_1.UnknownType.create();
           }
           const iterableType = ((_a = getTypeOfIterable(
@@ -81759,6 +81793,7 @@ var require_typeEvaluator = __commonJS({
           if (fileInfo.isStubFile) {
             exprFlags |= 4;
           }
+          let sawClosedOrExtraItems = false;
           node.d.arguments.forEach((arg) => {
             var _a, _b, _c;
             if (arg.d.argCategory === 2) {
@@ -81891,13 +81926,19 @@ var require_typeEvaluator = __commonJS({
                   addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typedDictBoolParam().format({ name: arg.d.name.d.value }), arg.d.valueExpr);
                 } else if (arg.d.name.d.value === "total" && !constArgValue) {
                   classType.shared.flags |= 32;
-                } else if (arg.d.name.d.value === "closed" && constArgValue) {
-                  if (AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.enableExperimentalFeatures) {
-                    classType.shared.flags |= 8 | 16;
-                    if (classType.shared.typedDictExtraItemsExpr) {
-                      addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typedDictExtraItemsClosed(), classType.shared.typedDictExtraItemsExpr);
+                } else if (arg.d.name.d.value === "closed") {
+                  if (constArgValue) {
+                    if (AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.enableExperimentalFeatures) {
+                      classType.shared.flags |= 8 | 16;
+                      if (classType.shared.typedDictExtraItemsExpr) {
+                        addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typedDictExtraItemsClosed(), classType.shared.typedDictExtraItemsExpr);
+                      }
                     }
                   }
+                  if (sawClosedOrExtraItems) {
+                    addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typedDictExtraItemsClosed(), arg.d.valueExpr);
+                  }
+                  sawClosedOrExtraItems = true;
                 }
               } else if (arg.d.name.d.value === "extra_items") {
                 if (AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.enableExperimentalFeatures) {
@@ -81907,6 +81948,10 @@ var require_typeEvaluator = __commonJS({
                     addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typedDictExtraItemsClosed(), classType.shared.typedDictExtraItemsExpr);
                   }
                 }
+                if (sawClosedOrExtraItems) {
+                  addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typedDictExtraItemsClosed(), arg.d.valueExpr);
+                }
+                sawClosedOrExtraItems = true;
               } else {
                 addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typedDictInitsubclassParameter().format({ name: arg.d.name.d.value }), arg);
               }
@@ -83017,7 +83062,7 @@ var require_typeEvaluator = __commonJS({
           }
         }
         if (!awaitableReturnType || !isGenerator) {
-          const awaitableType = getTypingType(node, useCoroutine ? "Coroutine" : "Awaitable");
+          const awaitableType = useCoroutine ? getTypesType(node, "CoroutineType") : getTypingType(node, "Awaitable");
           if (awaitableType && (0, types_1.isInstantiableClass)(awaitableType)) {
             awaitableReturnType = types_1.ClassType.cloneAsInstance(types_1.ClassType.specialize(awaitableType, useCoroutine ? [types_1.AnyType.create(), types_1.AnyType.create(), returnType] : [returnType]));
           } else {
@@ -83122,7 +83167,7 @@ var require_typeEvaluator = __commonJS({
                       if (yieldNode.nodeType === 61) {
                         isYieldResultUsed = true;
                         const iteratorTypeResult = getTypeOfExpression(yieldNode.d.expr);
-                        if ((0, types_1.isClassInstance)(iteratorTypeResult.type) && types_1.ClassType.isBuiltIn(iteratorTypeResult.type, "Coroutine")) {
+                        if ((0, types_1.isClassInstance)(iteratorTypeResult.type) && types_1.ClassType.isBuiltIn(iteratorTypeResult.type, ["Coroutine", "CoroutineType"])) {
                           const yieldType = iteratorTypeResult.type.priv.typeArgs && iteratorTypeResult.type.priv.typeArgs.length > 0 ? iteratorTypeResult.type.priv.typeArgs[0] : types_1.UnknownType.create();
                           inferredYieldTypes.push(yieldType);
                           useAwaitableGenerator = true;
@@ -85662,6 +85707,13 @@ var require_typeEvaluator = __commonJS({
           }
           declsToConsider.push(resolvedDecl);
         });
+        if (declsToConsider.every((decl) => (0, declaration_1.isVariableDeclaration)(decl) && ParseTreeUtils.isNodeContainedWithinNodeType(
+          decl.node,
+          5
+          /* ParseNodeType.AugmentedAssignment */
+        ))) {
+          declsToConsider.splice(0);
+        }
         const result = getTypeOfSymbolForDecls(symbol, declsToConsider, effectiveTypeCacheKey);
         result.includesVariableDecl = includesVariableDecl;
         result.includesIllegalTypeAliasDecl = includesIllegalTypeAliasDecl;
@@ -87789,63 +87841,71 @@ var require_typeEvaluator = __commonJS({
           }
           if (srcStartOfNamed >= 0) {
             srcParamDetails.params.forEach((srcParamInfo, index) => {
-              if (index >= srcStartOfNamed) {
-                if (srcParamInfo.param.name && srcParamInfo.param.category === 0 && srcParamInfo.kind !== parameterUtils_1.ParamKind.Positional) {
-                  const destParamInfo = destParamMap.get(srcParamInfo.param.name);
-                  const paramDiag = diag == null ? void 0 : diag.createAddendum();
-                  const srcParamType = srcParamInfo.type;
-                  if (!destParamInfo) {
-                    if (destParamDetails.kwargsIndex === void 0 && !srcParamInfo.defaultType) {
-                      if (paramDiag) {
-                        paramDiag.addMessage(localize_1.LocAddendum.namedParamMissingInDest().format({
-                          name: srcParamInfo.param.name
-                        }));
-                      }
-                      canAssign = false;
-                    } else if (destParamDetails.kwargsIndex !== void 0) {
-                      if (!assignParam(destParamDetails.params[destParamDetails.kwargsIndex].type, srcParamType, destParamDetails.params[destParamDetails.kwargsIndex].index, diag == null ? void 0 : diag.createAddendum(), constraints, flags, recursionCount)) {
-                        canAssign = false;
-                      }
-                    } else if (srcParamInfo.defaultType) {
-                      const defaultArgType = srcParamInfo.defaultType ?? srcParamInfo.defaultType;
-                      if (defaultArgType && !assignType(srcParamInfo.type, defaultArgType, diag == null ? void 0 : diag.createAddendum(), constraints, flags, recursionCount)) {
-                        if ((flags & 32) === 0) {
-                          canAssign = false;
-                        }
-                      }
-                    }
-                  } else {
-                    const destParamType = destParamInfo.type;
-                    const specializedDestParamType = constraints ? solveAndApplyConstraints(destParamType, constraints) : destParamType;
-                    if (!assignParam(
-                      destParamInfo.type,
-                      srcParamType,
-                      /* paramIndex */
-                      void 0,
-                      paramDiag == null ? void 0 : paramDiag.createAddendum(),
-                      constraints,
-                      flags,
-                      recursionCount
-                    )) {
-                      if (paramDiag) {
-                        paramDiag.addMessage(localize_1.LocAddendum.namedParamTypeMismatch().format({
-                          name: srcParamInfo.param.name,
-                          sourceType: printType(specializedDestParamType),
-                          destType: printType(srcParamType)
-                        }));
-                      }
-                      canAssign = false;
-                    }
-                    if (destParamInfo.defaultType && !srcParamInfo.defaultType) {
-                      diag == null ? void 0 : diag.createAddendum().addMessage(localize_1.LocAddendum.functionParamDefaultMissing().format({
-                        name: srcParamInfo.param.name
-                      }));
+              if (index < srcStartOfNamed) {
+                return;
+              }
+              if (!srcParamInfo.param.name || srcParamInfo.param.category !== 0 || srcParamInfo.kind === parameterUtils_1.ParamKind.Positional) {
+                return;
+              }
+              const destParamInfo = destParamMap.get(srcParamInfo.param.name);
+              const paramDiag = diag == null ? void 0 : diag.createAddendum();
+              const srcParamType = srcParamInfo.type;
+              if (!destParamInfo) {
+                if (destParamDetails.kwargsIndex === void 0 && !srcParamInfo.defaultType) {
+                  if (paramDiag) {
+                    paramDiag.addMessage(localize_1.LocAddendum.namedParamMissingInDest().format({
+                      name: srcParamInfo.param.name
+                    }));
+                  }
+                  canAssign = false;
+                } else if (destParamDetails.kwargsIndex !== void 0) {
+                  if (!assignParam(destParamDetails.params[destParamDetails.kwargsIndex].type, srcParamType, destParamDetails.params[destParamDetails.kwargsIndex].index, diag == null ? void 0 : diag.createAddendum(), constraints, flags, recursionCount)) {
+                    canAssign = false;
+                  }
+                } else if (srcParamInfo.defaultType) {
+                  const defaultArgType = srcParamInfo.defaultType ?? srcParamInfo.defaultType;
+                  if (defaultArgType && !assignType(srcParamInfo.type, defaultArgType, diag == null ? void 0 : diag.createAddendum(), constraints, flags, recursionCount)) {
+                    if ((flags & 32) === 0) {
                       canAssign = false;
                     }
-                    destParamMap.delete(srcParamInfo.param.name);
                   }
                 }
+                return;
               }
+              if (srcParamInfo.defaultType && destParamInfo.defaultType) {
+                if ((flags & 32) !== 0) {
+                  destParamMap.delete(srcParamInfo.param.name);
+                  return;
+                }
+              }
+              const destParamType = destParamInfo.type;
+              const specializedDestParamType = constraints ? solveAndApplyConstraints(destParamType, constraints) : destParamType;
+              if (!assignParam(
+                destParamInfo.type,
+                srcParamType,
+                /* paramIndex */
+                void 0,
+                paramDiag == null ? void 0 : paramDiag.createAddendum(),
+                constraints,
+                flags,
+                recursionCount
+              )) {
+                if (paramDiag) {
+                  paramDiag.addMessage(localize_1.LocAddendum.namedParamTypeMismatch().format({
+                    name: srcParamInfo.param.name,
+                    sourceType: printType(specializedDestParamType),
+                    destType: printType(srcParamType)
+                  }));
+                }
+                canAssign = false;
+              }
+              if (destParamInfo.defaultType && !srcParamInfo.defaultType) {
+                diag == null ? void 0 : diag.createAddendum().addMessage(localize_1.LocAddendum.functionParamDefaultMissing().format({
+                  name: srcParamInfo.param.name
+                }));
+                canAssign = false;
+              }
+              destParamMap.delete(srcParamInfo.param.name);
             });
           }
           destParamMap.forEach((destParamInfo, paramName) => {
@@ -89390,7 +89450,7 @@ var require_checker = __commonJS({
               this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportUnusedCallResult, localize_1.LocMessage.unusedCallResult().format({
                 type: this._evaluator.printType(returnType)
               }), node);
-              if ((0, types_1.isClassInstance)(returnType) && types_1.ClassType.isBuiltIn(returnType, "Coroutine")) {
+              if ((0, types_1.isClassInstance)(returnType) && types_1.ClassType.isBuiltIn(returnType, ["Coroutine", "CoroutineType"])) {
                 this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportUnusedCoroutine, localize_1.LocMessage.unusedCoroutine(), node);
               }
             }
@@ -89548,7 +89608,7 @@ var require_checker = __commonJS({
         const yieldFromType = this._evaluator.getType(node.d.expr) || types_1.UnknownType.create();
         let yieldType;
         let sendType;
-        if ((0, types_1.isClassInstance)(yieldFromType) && types_1.ClassType.isBuiltIn(yieldFromType, "Coroutine")) {
+        if ((0, types_1.isClassInstance)(yieldFromType) && types_1.ClassType.isBuiltIn(yieldFromType, ["Coroutine", "CoroutineType"])) {
           yieldType = types_1.UnknownType.create();
         } else {
           yieldType = ((_a = this._evaluator.getTypeOfIterable(
@@ -89802,6 +89862,7 @@ var require_checker = __commonJS({
           node.d.targets.forEach((name) => {
             this._evaluator.getType(name);
             this.walk(name);
+            this._validateNonlocalTypeParam(name);
           });
         });
         return false;
@@ -90067,7 +90128,7 @@ var require_checker = __commonJS({
           if (!(0, types_1.isFunction)(subtype) && !(0, types_1.isOverloaded)(subtype)) {
             isExprFunction = false;
           }
-          if (!(0, types_1.isClassInstance)(subtype) || !types_1.ClassType.isBuiltIn(subtype, "Coroutine")) {
+          if (!(0, types_1.isClassInstance)(subtype) || !types_1.ClassType.isBuiltIn(subtype, ["Coroutine", "CoroutineType"])) {
             isCoroutine = false;
           }
         });
@@ -90109,6 +90170,20 @@ var require_checker = __commonJS({
           this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportUnusedExpression, localize_1.LocMessage.unusedExpression(), node);
         }
       }
+      // Verifies that the target of a nonlocal statement is not a PEP 695-style
+      // TypeParameter. This situation results in a runtime exception.
+      _validateNonlocalTypeParam(node) {
+        const symbolWithScope = this._evaluator.lookUpSymbolRecursive(
+          node,
+          node.d.value,
+          /* honorCodeFlow */
+          false
+        );
+        if (!symbolWithScope || symbolWithScope.scope.type !== 0) {
+          return;
+        }
+        this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.nonlocalTypeParam().format({ name: node.d.value }), node);
+      }
       _validateExhaustiveMatch(node) {
         if (this._fileInfo.diagnosticRuleSet.reportMatchNotExhaustive === "none") {
           return;
@@ -90977,6 +91052,9 @@ var require_checker = __commonJS({
               }
             }
           }
+          if (!overloads.find((overload) => overload.shared.declaration === primaryDecl)) {
+            return;
+          }
           this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportNoOverloadImplementation, localize_1.LocMessage.overloadWithoutImplementation().format({
             name: primaryDecl.node.d.name.d.value
           }), primaryDecl.node.d.name);
@@ -99450,11 +99528,13 @@ var require_parser = __commonJS({
             }
             continue;
           }
-          if (this._consumeTokensUntilType([
-            26
-            /* TokenType.FStringEnd */
-          ])) {
-            this._getNextToken();
+          if (nextToken.type !== 2) {
+            if (this._consumeTokensUntilType([
+              26
+              /* TokenType.FStringEnd */
+            ])) {
+              this._getNextToken();
+            }
           }
           this._addSyntaxError(nextToken.type === 18 ? localize_1.LocMessage.formatStringBrace() : localize_1.LocMessage.stringUnterminated(), nextToken);
           break;
@@ -115554,8 +115634,10 @@ var TestFrameworkWalker = class extends import_parseTreeWalker3.ParseTreeWalker
   visitFunction(node) {
     if (node.d.name.d.value.startsWith("test_")) {
       if (node.parent && (0, import_parseTreeUtils2.printParseNodeType)(node.parent.nodeType) === "Suite") {
-        const parentSuiteNode = node.parent;
-        if (parentSuiteNode.parent && (0, import_parseTreeUtils2.printParseNodeType)(parentSuiteNode.parent.nodeType) === "Class") {
+        let fullyQualifiedTestName = "";
+        let currentNode = node;
+        let parentSuiteNode = currentNode.parent;
+        while (parentSuiteNode.parent && (0, import_parseTreeUtils2.printParseNodeType)(parentSuiteNode.parent.nodeType) === "Class") {
           const classNode = parentSuiteNode.parent;
           let combineString = void 0;
           if (this.testFramework === "unittest") {
@@ -115563,12 +115645,15 @@ var TestFrameworkWalker = class extends import_parseTreeWalker3.ParseTreeWalker
           } else if (this.testFramework === "pytest") {
             combineString = "::";
           }
-          this.featureItems.push({
-            value: classNode.d.name.d.value + combineString + node.d.name.d.value,
-            startOffset: node.start,
-            endOffset: node.start + node.length - 1
-          });
+          fullyQualifiedTestName = classNode.d.name.d.value + combineString + fullyQualifiedTestName;
+          currentNode = currentNode.parent.parent;
+          parentSuiteNode = currentNode.parent;
         }
+        this.featureItems.push({
+          value: fullyQualifiedTestName + node.d.name.d.value,
+          startOffset: node.start,
+          endOffset: node.start + node.length - 1
+        });
       } else {
         if (this.testFramework === "pytest") {
           this.featureItems.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-pyright",
-  "version": "1.1.393",
+  "version": "1.1.394",
   "description": "Pyright extension for coc.nvim, static type checker for Python",
   "author": "Heyward Fann <fannheyward@gmail.com>",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "@types/minimatch": "^5.1.2",
     "@types/node": "16",
     "@types/which": "^3.0.4",
-    "@zzzen/pyright-internal": "^1.2.0-dev.20250202",
+    "@zzzen/pyright-internal": "^1.2.0-dev.20250209",
     "coc.nvim": "^0.0.83-next.18",
     "diff-match-patch": "^1.0.5",
     "esbuild": "^0.24.0",