diff --git a/packages/pyright-internal/src/analyzer/cacheManager.ts b/packages/pyright-internal/src/analyzer/cacheManager.ts index d3a8afb1e..7f5318cf2 100644 --- a/packages/pyright-internal/src/analyzer/cacheManager.ts +++ b/packages/pyright-internal/src/analyzer/cacheManager.ts @@ -115,6 +115,10 @@ export class CacheManager { // Returns a ratio of used bytes to total bytes. getUsedHeapRatio(console?: ConsoleInterface) { + if (this._pausedCount > 0) { + return -1; + } + const heapStats = getHeapStatistics(); let usage = this._getTotalHeapUsage(heapStats); diff --git a/packages/pyright-internal/src/common/docStringService.ts b/packages/pyright-internal/src/common/docStringService.ts index e2319a6be..05f08d6b3 100644 --- a/packages/pyright-internal/src/common/docStringService.ts +++ b/packages/pyright-internal/src/common/docStringService.ts @@ -6,6 +6,7 @@ * Interface for service that parses docstrings and converts them to other formats. */ +import { MarkupKind } from 'vscode-languageserver-types'; import { convertDocStringToMarkdown, convertDocStringToPlainText } from '../analyzer/docStringConversion'; import { extractParameterDocumentation } from '../analyzer/docStringUtils'; @@ -15,6 +16,7 @@ export interface DocStringService { extractParameterDocumentation( functionDocString: string, paramName: string, + format?: MarkupKind, forceLiteral?: boolean ): string | undefined; clone(): DocStringService; diff --git a/packages/pyright-internal/src/languageService/autoImporter.ts b/packages/pyright-internal/src/languageService/autoImporter.ts index 5e1b2ff40..b051a3572 100644 --- a/packages/pyright-internal/src/languageService/autoImporter.ts +++ b/packages/pyright-internal/src/languageService/autoImporter.ts @@ -118,8 +118,8 @@ export function addModuleSymbolsMap(files: readonly SourceFileInfo[], moduleSymb const fileName = stripFileExtension(uri.fileName); // Don't offer imports from files that are named with private - // naming semantics like "_ast.py". - if (SymbolNameUtils.isPrivateOrProtectedName(fileName)) { + // naming semantics like "_ast.py" unless they're in the current userfile list. + if (SymbolNameUtils.isPrivateOrProtectedName(fileName) && !isUserCode(file)) { return; } diff --git a/packages/pyright-internal/src/languageService/signatureHelpProvider.ts b/packages/pyright-internal/src/languageService/signatureHelpProvider.ts index 9ce148221..01de1991e 100644 --- a/packages/pyright-internal/src/languageService/signatureHelpProvider.ts +++ b/packages/pyright-internal/src/languageService/signatureHelpProvider.ts @@ -140,12 +140,17 @@ export class SignatureHelpProvider { const signatures = signatureHelpResults.signatures.map((sig) => { let paramInfo: ParameterInformation[] = []; if (sig.parameters) { - paramInfo = sig.parameters.map((param) => - ParameterInformation.create( - this._hasSignatureLabelOffsetCapability ? [param.startOffset, param.endOffset] : param.text, - param.documentation - ) - ); + paramInfo = sig.parameters.map((param) => { + return { + label: this._hasSignatureLabelOffsetCapability + ? [param.startOffset, param.endOffset] + : param.text, + documentation: { + kind: this._format, + value: param.documentation ?? '', + }, + }; + }); } const sigInfo = SignatureInformation.create(sig.label, /* documentation */ undefined, ...paramInfo); @@ -244,7 +249,6 @@ export class SignatureHelpProvider { startOffset: label.length, endOffset: label.length + paramString.length, text: paramString, - documentation: this._docStringService.extractParameterDocumentation(functionDocString || '', paramName), }); // Name match for active parameter. The set of parameters from the function @@ -268,6 +272,18 @@ export class SignatureHelpProvider { } } + // Extract the documentation only for the active parameter. + if (activeParameter !== undefined) { + const activeParam = parameters[activeParameter]; + if (activeParam) { + activeParam.documentation = this._docStringService.extractParameterDocumentation( + functionDocString || '', + params[activeParameter].name || '', + this._format + ); + } + } + const sigInfo: SignatureInfo = { label, parameters, diff --git a/packages/pyright-internal/src/localization/package.nls.cs.json b/packages/pyright-internal/src/localization/package.nls.cs.json index d266c781c..91b52733c 100644 --- a/packages/pyright-internal/src/localization/package.nls.cs.json +++ b/packages/pyright-internal/src/localization/package.nls.cs.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "Metodu „{method}“ nelze volat, protože je abstraktní a neimplementovaná.", + "annotatedMetadataInconsistent": "Annotated metadata type \"{metadataType}\" is not compatible with type \"{type}\"", "annotatedParamCountMismatch": "Počet poznámek parametrů se neshoduje: očekával(o/y) se {expected}, ale přijal(o/y) se {received}.", "annotatedTypeArgMissing": "Byl očekáván jeden argument typu a jedna nebo více poznámek pro Annotated", "annotationBytesString": "Poznámky typu nemůžou používat řetězcové literály bajtů.", @@ -158,6 +159,7 @@ "enumMemberSet": "Člen výčtu {name} se nedá přiřadit.", "enumMemberTypeAnnotation": "Poznámky typu nejsou pro členy výčtu povolené", "exceptionGroupIncompatible": "Syntaxe skupiny výjimek (except*) vyžaduje Python 3.11 nebo novější", + "exceptionGroupTypeIncorrect": "Exception type in except* cannot derive from BaseGroupException", "exceptionTypeIncorrect": "„{type}“ se neodvozuje od BaseException", "exceptionTypeNotClass": "{type} není platná třída výjimky", "exceptionTypeNotInstantiable": "Konstruktor pro výjimku typu {type} vyžaduje jeden nebo více argumentů", diff --git a/packages/pyright-internal/src/localization/package.nls.de.json b/packages/pyright-internal/src/localization/package.nls.de.json index fa38976d3..8b84c87a2 100644 --- a/packages/pyright-internal/src/localization/package.nls.de.json +++ b/packages/pyright-internal/src/localization/package.nls.de.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "Die Methode „{method}“ kann nicht aufgerufen werden, da sie abstrakt und nicht implementiert ist.", + "annotatedMetadataInconsistent": "Annotated metadata type \"{metadataType}\" is not compatible with type \"{type}\"", "annotatedParamCountMismatch": "Nicht übereinstimmende Parameteranmerkungsanzahl: {expected} erwartet, aber {received} empfangen", "annotatedTypeArgMissing": "Es wurde ein Typargument und mindestens eine Anmerkung für \"Annotated\" erwartet.", "annotationBytesString": "Typanmerkungen dürfen keine Bytes-Zeichenfolgenliterale verwenden.", @@ -158,6 +159,7 @@ "enumMemberSet": "Das Enumerationselement \"{name}\" kann nicht zugewiesen werden.", "enumMemberTypeAnnotation": "Typanmerkungen sind für Enumerationsmember nicht zulässig", "exceptionGroupIncompatible": "Die Ausnahmegruppensyntax (\"except*\") erfordert Python 3.11 oder höher.", + "exceptionGroupTypeIncorrect": "Exception type in except* cannot derive from BaseGroupException", "exceptionTypeIncorrect": "\"{type}\" ist nicht von BaseException abgeleitet.", "exceptionTypeNotClass": "\"{type}\" ist keine gültige Ausnahmeklasse.", "exceptionTypeNotInstantiable": "Der Konstruktor für den Ausnahmetyp \"{type}\" erfordert mindestens ein Argument.", diff --git a/packages/pyright-internal/src/localization/package.nls.es.json b/packages/pyright-internal/src/localization/package.nls.es.json index e912b1730..eadff4c92 100644 --- a/packages/pyright-internal/src/localization/package.nls.es.json +++ b/packages/pyright-internal/src/localization/package.nls.es.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "No se puede llamar al método \"{method}\" porque es abstracto y no se ha implementado.", + "annotatedMetadataInconsistent": "Annotated metadata type \"{metadataType}\" is not compatible with type \"{type}\"", "annotatedParamCountMismatch": "El recuento de anotaciones del parámetro no coincide: se esperaba {expected}, pero se recibió {received}", "annotatedTypeArgMissing": "Se espera un argumento de tipo y una o más anotaciones para \"Anotado\".", "annotationBytesString": "Las anotaciones de tipo no pueden utilizar literales de cadena de bytes", @@ -158,6 +159,7 @@ "enumMemberSet": "No se puede asignar el miembro de enumeración \"{name}\"", "enumMemberTypeAnnotation": "No se permiten anotaciones de tipo para miembros de enumeración", "exceptionGroupIncompatible": "La sintaxis de grupo de excepciones (\"except*\") requiere Python 3.11 o posterior.", + "exceptionGroupTypeIncorrect": "Exception type in except* cannot derive from BaseGroupException", "exceptionTypeIncorrect": "\"{type}\" no se deriva de BaseException", "exceptionTypeNotClass": "\"{type}\" no es una clase de excepción válida", "exceptionTypeNotInstantiable": "El constructor para el tipo de excepción \"{type}\" requiere uno o más argumentos", diff --git a/packages/pyright-internal/src/localization/package.nls.fr.json b/packages/pyright-internal/src/localization/package.nls.fr.json index 79c7060fe..86ec0a63f 100644 --- a/packages/pyright-internal/src/localization/package.nls.fr.json +++ b/packages/pyright-internal/src/localization/package.nls.fr.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "Désolé, nous n’avons pas pu appeler la méthode « {method} », car elle est abstraite et non implémentée", + "annotatedMetadataInconsistent": "Annotated metadata type \"{metadataType}\" is not compatible with type \"{type}\"", "annotatedParamCountMismatch": "Non-concordance du nombre d'annotations de paramètre : attendu {expected} mais reçu {received}", "annotatedTypeArgMissing": "Un argument de type et une ou plusieurs annotations sont attendus pour « Annotation »", "annotationBytesString": "Les annotations de type ne peuvent pas utiliser de littéraux de chaîne d’octets", @@ -158,6 +159,7 @@ "enumMemberSet": "Le membre enum « {name} » ne peut pas être affecté", "enumMemberTypeAnnotation": "Les annotations de type ne sont pas autorisées pour les membres enum", "exceptionGroupIncompatible": "La syntaxe du groupe d’exceptions (« except* ») nécessite Python 3.11 ou version ultérieure", + "exceptionGroupTypeIncorrect": "Exception type in except* cannot derive from BaseGroupException", "exceptionTypeIncorrect": "\"{type}\" ne dérive pas de BaseException", "exceptionTypeNotClass": "« {type} » n’est pas une classe d’exception valide", "exceptionTypeNotInstantiable": "Le constructeur pour le type d’exception « {type} » requiert un ou plusieurs arguments", diff --git a/packages/pyright-internal/src/localization/package.nls.it.json b/packages/pyright-internal/src/localization/package.nls.it.json index 85dca4102..84d810fe0 100644 --- a/packages/pyright-internal/src/localization/package.nls.it.json +++ b/packages/pyright-internal/src/localization/package.nls.it.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "Impossibile chiamare il metodo \"{method}\" perché è astratto e non implementato", + "annotatedMetadataInconsistent": "Annotated metadata type \"{metadataType}\" is not compatible with type \"{type}\"", "annotatedParamCountMismatch": "Numero di annotazioni dei parametro non corrispondente: previsto {expected} ma ricevuto {received}", "annotatedTypeArgMissing": "Previsto un argomento di tipo e una o più annotazioni per \"Annotato\"", "annotationBytesString": "Le annotazioni di tipo non possono usare valori letterali stringa byte", @@ -158,6 +159,7 @@ "enumMemberSet": "Non è possibile assegnare il membro di enumerazione \"{name}\"", "enumMemberTypeAnnotation": "Le annotazioni di tipo non sono consentite per i membri di enumerazione", "exceptionGroupIncompatible": "La sintassi del gruppo di eccezioni (\"except*\") richiede Python 3.11 o versione successiva", + "exceptionGroupTypeIncorrect": "Exception type in except* cannot derive from BaseGroupException", "exceptionTypeIncorrect": "\"{type}\" non deriva da BaseException", "exceptionTypeNotClass": "\"{type}\" non è una classe di eccezione valida", "exceptionTypeNotInstantiable": "Il costruttore per il tipo di eccezione \"{type}\" richiede uno o più argomenti", diff --git a/packages/pyright-internal/src/localization/package.nls.ja.json b/packages/pyright-internal/src/localization/package.nls.ja.json index d1edefd0b..0b5c85f59 100644 --- a/packages/pyright-internal/src/localization/package.nls.ja.json +++ b/packages/pyright-internal/src/localization/package.nls.ja.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "メソッド \"{method}\" は抽象メソッドであり、実装されていないため、呼び出すことができません", + "annotatedMetadataInconsistent": "Annotated metadata type \"{metadataType}\" is not compatible with type \"{type}\"", "annotatedParamCountMismatch": "パラメーター注釈数の不一致: {expected} が必要ですが、{received} を受信しました", "annotatedTypeArgMissing": "\"Annotationed\" には 1 つの型引数と 1 つ以上の注釈が必要です", "annotationBytesString": "型注釈では、バイト文字列リテラルは使用できません", @@ -158,6 +159,7 @@ "enumMemberSet": "列挙型メンバー \"{name}\" を割り当てることはできません", "enumMemberTypeAnnotation": "列挙型メンバーには型注釈を使用できません", "exceptionGroupIncompatible": "例外グループの構文 (\"except*\") には Python 3.11 以降が必要です", + "exceptionGroupTypeIncorrect": "Exception type in except* cannot derive from BaseGroupException", "exceptionTypeIncorrect": "\"{type}\" は BaseException から派生していません", "exceptionTypeNotClass": "\"{type}\" は有効な例外クラスではありません", "exceptionTypeNotInstantiable": "例外の種類 \"{type}\" のコンストラクターには 1 つ以上の引数が必要です", diff --git a/packages/pyright-internal/src/localization/package.nls.ko.json b/packages/pyright-internal/src/localization/package.nls.ko.json index 465ced38d..ac216b25d 100644 --- a/packages/pyright-internal/src/localization/package.nls.ko.json +++ b/packages/pyright-internal/src/localization/package.nls.ko.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "메서드 \"{method}\"은(는) 추상적이고 구현되지 않았으므로 호출할 수 없습니다.", + "annotatedMetadataInconsistent": "Annotated metadata type \"{metadataType}\" is not compatible with type \"{type}\"", "annotatedParamCountMismatch": "매개 변수 주석 개수가 일치하지 않습니다. {expected}이)(가) 필요하지만 {received}을(를) 받았습니다.", "annotatedTypeArgMissing": "\"Annotated\"에 대해 하나의 형식 인수와 하나 이상의 주석이 필요합니다.", "annotationBytesString": "형식 주석은 바이트 문자열 리터럴을 사용할 수 없습니다.", @@ -158,6 +159,7 @@ "enumMemberSet": "열거형 멤버 \"{name}\"을(를) 할당할 수 없음", "enumMemberTypeAnnotation": "열거형 멤버에는 형식 주석을 사용할 수 없습니다.", "exceptionGroupIncompatible": "예외 그룹 구문(\"except*\")에는 Python 3.11 이상이 필요합니다.", + "exceptionGroupTypeIncorrect": "Exception type in except* cannot derive from BaseGroupException", "exceptionTypeIncorrect": "‘{type}’은 BaseException에서 파생되지 않습니다.", "exceptionTypeNotClass": "\"{type}\"은(는) 올바른 예외 클래스가 아닙니다.", "exceptionTypeNotInstantiable": "예외 형식 \"{type}\"에 대한 생성자에는 하나 이상의 인수가 필요합니다.", diff --git a/packages/pyright-internal/src/localization/package.nls.pl.json b/packages/pyright-internal/src/localization/package.nls.pl.json index 824287a2a..4d791f621 100644 --- a/packages/pyright-internal/src/localization/package.nls.pl.json +++ b/packages/pyright-internal/src/localization/package.nls.pl.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "Nie można wywołać metody „{method}”, ponieważ jest abstrakcyjna i niezaimplementowana", + "annotatedMetadataInconsistent": "Annotated metadata type \"{metadataType}\" is not compatible with type \"{type}\"", "annotatedParamCountMismatch": "Niezgodność liczby adnotacji parametru; oczekiwano {expected}, a uzyskano {received}", "annotatedTypeArgMissing": "Oczekiwano jednego argumentu typu i co najmniej jednej adnotacji dla wartości „Annotated”", "annotationBytesString": "Adnotacje typu nie mogą używać literałów ciągu bajtów", @@ -158,6 +159,7 @@ "enumMemberSet": "Nie można przypisać składowej wyliczenia „{name}”", "enumMemberTypeAnnotation": "Adnotacje typu nie są dozwolone dla elementów członkowskich wyliczenia", "exceptionGroupIncompatible": "Składnia grupy wyjątków („except*”) wymaga języka Python w wersji 3.11 lub nowszej", + "exceptionGroupTypeIncorrect": "Exception type in except* cannot derive from BaseGroupException", "exceptionTypeIncorrect": "Typ „{type}” nie pochodzi od parametru BaseException", "exceptionTypeNotClass": "Typ „{type}” nie jest prawidłową klasą wyjątku", "exceptionTypeNotInstantiable": "Konstruktor typu wyjątku „{type}” wymaga co najmniej jednego argumentu", diff --git a/packages/pyright-internal/src/localization/package.nls.pt-br.json b/packages/pyright-internal/src/localization/package.nls.pt-br.json index 65acfa7af..625d1cdef 100644 --- a/packages/pyright-internal/src/localization/package.nls.pt-br.json +++ b/packages/pyright-internal/src/localization/package.nls.pt-br.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "O método \"{method}\" não pode ser chamado porque é abstrato e não está implementado", + "annotatedMetadataInconsistent": "Annotated metadata type \"{metadataType}\" is not compatible with type \"{type}\"", "annotatedParamCountMismatch": "Incompatibilidade de contagem de anotações de parâmetro: esperado {expected}, mas recebido {received}", "annotatedTypeArgMissing": "Esperava-se um argumento de tipo e uma ou mais anotações para \"Annotated\"", "annotationBytesString": "Anotações de tipo não podem usar literais de cadeia de caracteres de bytes", @@ -158,6 +159,7 @@ "enumMemberSet": "O membro enumerado \"{name}\" não pode ser atribuído", "enumMemberTypeAnnotation": "Anotações de tipo não são permitidas para membros de enumeração", "exceptionGroupIncompatible": "A sintaxe do grupo de exceção (\"exceto*\") requer o Python 3.11 ou mais recente", + "exceptionGroupTypeIncorrect": "Exception type in except* cannot derive from BaseGroupException", "exceptionTypeIncorrect": "\"{type}\" não deriva de BaseException", "exceptionTypeNotClass": "\"{type}\" não é uma classe de exceção válida", "exceptionTypeNotInstantiable": "O construtor para o tipo de exceção \"{type}\" requer um ou mais argumentos", diff --git a/packages/pyright-internal/src/localization/package.nls.qps-ploc.json b/packages/pyright-internal/src/localization/package.nls.qps-ploc.json index f9a83b064..74fe8ff18 100644 --- a/packages/pyright-internal/src/localization/package.nls.qps-ploc.json +++ b/packages/pyright-internal/src/localization/package.nls.qps-ploc.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "[fE8MD][นั้Mëthøð \"{mëthøð}\" çæññøt þë çællëð þëçæµsë ït ïs æþstræçt æñð µñïmplëmëñtëðẤğ倪İЂҰक्र्तिृまẤğ倪İЂҰक्र्तिृまẤğนั้ढूँ]", + "annotatedMetadataInconsistent": "[iOP70][นั้Æññøtætëð mëtæðætæ tÿpë \"{mëtæðætæTÿpë}\" ïs ñøt çømpætïþlë wïth tÿpë \"{tÿpë}\"Ấğ倪İЂҰक्र्तिृまẤğ倪İЂҰक्र्तिृまẤğ倪นั้ढूँ]", "annotatedParamCountMismatch": "[VZvZc][นั้Pæræmëtër æññøtætïøñ çøµñt mïsmætçh: ëxpëçtëð {ëxpëçtëð} þµt rëçëïvëð {rëçëïvëð}Ấğ倪İЂҰक्र्तिृまẤğ倪İЂҰक्र्तिृまẤğ倪İนั้ढूँ]", "annotatedTypeArgMissing": "[mTgtG][นั้Ëxpëçtëð øñë tÿpë ærgµmëñt æñð øñë ør mørë æññøtætïøñs før \"Æññøtætëð\"Ấğ倪İЂҰक्र्तिृまẤğ倪İЂҰक्र्तिृまนั้ढूँ]", "annotationBytesString": "[W1g86][นั้Tÿpë æññøtætïøñs çæññøt µsë þÿtës strïñg lïtërælsẤğ倪İЂҰक्र्तिृまẤğ倪İЂҰนั้ढूँ]", @@ -158,6 +159,7 @@ "enumMemberSet": "[mBLro][นั้Ëñµm mëmþër \"{ñæmë}\" çæññøt þë æssïgñëðẤğ倪İЂҰक्र्तिृまẤğนั้ढूँ]", "enumMemberTypeAnnotation": "[z8FaL][นั้Tÿpë æññøtætïøñs ærë ñøt ælløwëð før ëñµm mëmþërsẤğ倪İЂҰक्र्तिृまẤğ倪İЂҰนั้ढूँ]", "exceptionGroupIncompatible": "[d0SLP][นั้Ëxçëptïøñ grøµp sÿñtæx (\"ëxçëpt*\") rëqµïrës Pÿthøñ 3.11 ør ñëwërẤğ倪İЂҰक्र्तिृまẤğ倪İЂҰक्र्तिृนั้ढूँ]", + "exceptionGroupTypeIncorrect": "[Kanvz][นั้Ëxçëptïøñ tÿpë ïñ ëxçëpt* çæññøt ðërïvë frøm ßæsëGrøµpËxçëptïøñẤğ倪İЂҰक्र्तिृまẤğ倪İЂҰक्र्तिृนั้ढूँ]", "exceptionTypeIncorrect": "[G7AZt][นั้\"{tÿpë}\" ðøës ñøt ðërïvë frøm ßæsëËxçëptïøñẤğ倪İЂҰक्र्तिृまẤğ倪นั้ढूँ]", "exceptionTypeNotClass": "[v1FmY][นั้\"{tÿpë}\" ïs ñøt æ vælïð ëxçëptïøñ çlæssẤğ倪İЂҰक्र्तिृまẤğนั้ढूँ]", "exceptionTypeNotInstantiable": "[PfdeG][นั้Çøñstrµçtør før ëxçëptïøñ tÿpë \"{tÿpë}\" rëqµïrës øñë ør mørë ærgµmëñtsẤğ倪İЂҰक्र्तिृまẤğ倪İЂҰक्र्तिृまนั้ढूँ]", diff --git a/packages/pyright-internal/src/localization/package.nls.ru.json b/packages/pyright-internal/src/localization/package.nls.ru.json index 29a5a5a11..d4641665e 100644 --- a/packages/pyright-internal/src/localization/package.nls.ru.json +++ b/packages/pyright-internal/src/localization/package.nls.ru.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "Невозможно вызвать метод \"{method}\", так как он является абстрактным и нереализованным", + "annotatedMetadataInconsistent": "Annotated metadata type \"{metadataType}\" is not compatible with type \"{type}\"", "annotatedParamCountMismatch": "Несоответствие числа аннотаций параметра: ожидается {expected}, но получено {received}", "annotatedTypeArgMissing": "Для \"Annotated\" ожидается один аргумент типа и одна или несколько заметок типа", "annotationBytesString": "Заметки с типом не могут использовать строковые литералы байтов", @@ -158,6 +159,7 @@ "enumMemberSet": "Не удается назначить элемент перечисления \"{name}\"", "enumMemberTypeAnnotation": "Аннотации типов не разрешены для элементов перечисления", "exceptionGroupIncompatible": "Синтаксис группы исключений (\"except*\") можно использовать в Python версии не ранее 3.11", + "exceptionGroupTypeIncorrect": "Exception type in except* cannot derive from BaseGroupException", "exceptionTypeIncorrect": "\"{type}\" не является производным от BaseException", "exceptionTypeNotClass": "\"{type}\" не является допустимым классом исключений", "exceptionTypeNotInstantiable": "Конструктору типа исключения \"{type}\" требуется один или несколько аргументов", diff --git a/packages/pyright-internal/src/localization/package.nls.tr.json b/packages/pyright-internal/src/localization/package.nls.tr.json index 0c8707c85..11b5a1a22 100644 --- a/packages/pyright-internal/src/localization/package.nls.tr.json +++ b/packages/pyright-internal/src/localization/package.nls.tr.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "\"{method}\" metodu soyut veya uygulanmamış olduğundan çağrılamaz", + "annotatedMetadataInconsistent": "Annotated metadata type \"{metadataType}\" is not compatible with type \"{type}\"", "annotatedParamCountMismatch": "Parametre ek açıklama sayısı uyuşmazlığı: {expected} bekleniyordu ancak {received} alındı", "annotatedTypeArgMissing": "\"Annotated\" için bir tür bağımsız değişkeni ve bir veya daha fazla ek açıklama bekleniyordu", "annotationBytesString": "Tür ek açıklamaları bayt sabit değerli dizeleri kullanamaz", @@ -158,6 +159,7 @@ "enumMemberSet": "Sabit liste üyesi \"{name}\" atanamıyor", "enumMemberTypeAnnotation": "Sabit listesi üyeleri için tür ek açıklamalarına izin verilmiyor", "exceptionGroupIncompatible": "Özel durum grubu söz dizimi (\"except*\") için Python 3.11 veya daha yeni bir sürümü gerekiyor", + "exceptionGroupTypeIncorrect": "Exception type in except* cannot derive from BaseGroupException", "exceptionTypeIncorrect": "\"{type}\", BaseException türevi değil", "exceptionTypeNotClass": "\"{type}\" geçerli bir özel durum sınıfı değil", "exceptionTypeNotInstantiable": "\"{type}\" özel durum türü oluşturucusu bir veya daha fazla bağımsız değişken gerektiriyor", diff --git a/packages/pyright-internal/src/localization/package.nls.zh-cn.json b/packages/pyright-internal/src/localization/package.nls.zh-cn.json index 13b573002..e6b11edb5 100644 --- a/packages/pyright-internal/src/localization/package.nls.zh-cn.json +++ b/packages/pyright-internal/src/localization/package.nls.zh-cn.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "无法调用方法“{method}”,因为它是抽象的且未实施", + "annotatedMetadataInconsistent": "Annotated metadata type \"{metadataType}\" is not compatible with type \"{type}\"", "annotatedParamCountMismatch": "参数批注计数不匹配: 应为 {expected},但收到 {received}", "annotatedTypeArgMissing": "“Annotated”应为一个类型参数和一个或多个批注", "annotationBytesString": "类型批注不能使用字节字符串文本", @@ -158,6 +159,7 @@ "enumMemberSet": "无法分配枚举成员“{name}”", "enumMemberTypeAnnotation": "枚举成员不允许使用类型注释", "exceptionGroupIncompatible": "异常组语法 (\"except*\") 需要 Python 3.11 或更高版本", + "exceptionGroupTypeIncorrect": "Exception type in except* cannot derive from BaseGroupException", "exceptionTypeIncorrect": "\"{type}\" 不是派生自 BaseException", "exceptionTypeNotClass": "“{type}”不是有效的异常类", "exceptionTypeNotInstantiable": "异常类型\"{type}\"的构造函数需要一个或多个参数", diff --git a/packages/pyright-internal/src/localization/package.nls.zh-tw.json b/packages/pyright-internal/src/localization/package.nls.zh-tw.json index 5b42218ba..76be0e889 100644 --- a/packages/pyright-internal/src/localization/package.nls.zh-tw.json +++ b/packages/pyright-internal/src/localization/package.nls.zh-tw.json @@ -15,6 +15,7 @@ }, "Diagnostic": { "abstractMethodInvocation": "無法呼叫方法 \"{method}\",因為它是抽象且未執行", + "annotatedMetadataInconsistent": "Annotated metadata type \"{metadataType}\" is not compatible with type \"{type}\"", "annotatedParamCountMismatch": "參數註釋計數不符: 應為 {expected},但收到 {received}", "annotatedTypeArgMissing": "預期 \"Annotated\" 有一個類型引數和一或多個註釋", "annotationBytesString": "類型註釋無法使用位元組字串常值", @@ -158,6 +159,7 @@ "enumMemberSet": "無法指派列舉成員 \"{name}\"", "enumMemberTypeAnnotation": "列舉成員不允許類型註釋", "exceptionGroupIncompatible": "例外群組語法 (\"except*\") 需要 Python 3.11 或更新版本", + "exceptionGroupTypeIncorrect": "Exception type in except* cannot derive from BaseGroupException", "exceptionTypeIncorrect": "\"{type}\" 不是衍生自 BaseException", "exceptionTypeNotClass": "\"{type}\" 不是有效的例外類別", "exceptionTypeNotInstantiable": "例外類型 \"{type}\" 的建構函式需要一或多個引數",