Removed experimental support for PEP 736, which was rejected. (#10616)

erictraut · web-flow · commit 5ba9dcf98023 · 2025-06-16T16:45:24.000-07:00
diff --git a/packages/pyright-internal/src/analyzer/parseTreeUtils.ts b/packages/pyright-internal/src/analyzer/parseTreeUtils.ts
@@ -159,15 +159,7 @@ export function isCompliantWithNodeRangeRules(node: ParseNode) {
     // 1. Children are all contained within the parent.
     // 2. Children have non-overlapping ranges.
     // 3. Children are listed in increasing order.
-    if (node.nodeType === ParseNodeType.Assignment || node.nodeType === ParseNodeType.StringList) {
-        return false;
-    }
-
-    if (node.nodeType === ParseNodeType.Argument && node.d.isNameSameAsValue) {
-        return false;
-    }
-
-    return true;
+    return node.nodeType !== ParseNodeType.Assignment && node.nodeType !== ParseNodeType.StringList;
 }
 
 export function getClassFullName(classNode: ParseNode, moduleName: string, className: string): string {
@@ -206,9 +198,7 @@ export function printArg(node: ArgumentNode, flags: PrintExpressionFlags) {
     if (node.d.name) {
         argStr += node.d.name.d.value + '=';
     }
-    if (!node.d.isNameSameAsValue) {
-        argStr += printExpression(node.d.valueExpr, flags);
-    }
+    argStr += printExpression(node.d.valueExpr, flags);
     return argStr;
 }
 
diff --git a/packages/pyright-internal/src/analyzer/testWalker.ts b/packages/pyright-internal/src/analyzer/testWalker.ts
@@ -8,7 +8,7 @@
  */
 
 import { ParseTreeWalker } from '../analyzer/parseTreeWalker';
-import { fail } from '../common/debug';
+import { assertNever, fail } from '../common/debug';
 import { TextRange } from '../common/textRange';
 import { NameNode, ParseNode, ParseNodeArray, ParseNodeType } from '../parser/parseNodes';
 import { isCompliantWithNodeRangeRules } from './parseTreeUtils';
@@ -74,15 +74,8 @@ export class TestWalker extends ParseTreeWalker {
                             }
                             break;
 
-                        case ParseNodeType.Argument: {
-                            if (node.d.isNameSameAsValue) {
-                                skipCheck = true;
-                            }
-                            break;
-                        }
-
                         default:
-                            fail(`node ${node.nodeType} is not marked as not following range rules.`);
+                            assertNever(node);
                     }
                 }
 
@@ -96,13 +89,7 @@ export class TestWalker extends ParseTreeWalker {
                         // Make sure the child is after the previous child.
                         if (child.start < TextRange.getEnd(prevNode)) {
                             // Special-case the function annotation which can "bleed" into the suite.
-                            let exempted = prevNode.nodeType === ParseNodeType.FunctionAnnotation;
-
-                            // Special-case name nodes that are part of an argument node that's
-                            // using a keyword argument shortcut.
-                            if (node.nodeType === ParseNodeType.Argument && node.d.isNameSameAsValue) {
-                                exempted = true;
-                            }
+                            const exempted = prevNode.nodeType === ParseNodeType.FunctionAnnotation;
 
                             if (!exempted) {
                                 fail(`Child node is not after previous child node`);
diff --git a/packages/pyright-internal/src/languageService/hoverProvider.ts b/packages/pyright-internal/src/languageService/hoverProvider.ts
@@ -270,7 +270,7 @@ export class HoverProvider {
             return null;
         }
 
-        let node = ParseTreeUtils.findNodeByOffset(this._parseResults.parserOutput.parseTree, offset);
+        const node = ParseTreeUtils.findNodeByOffset(this._parseResults.parserOutput.parseTree, offset);
         if (node === undefined) {
             return null;
         }
@@ -284,17 +284,6 @@ export class HoverProvider {
         };
 
         if (node.nodeType === ParseNodeType.Name) {
-            // Handle the case where we're pointing to a "fused" keyword argument.
-            // We want to display the hover information for the value expression.
-            if (
-                node.parent?.nodeType === ParseNodeType.Argument &&
-                node.parent.d.isNameSameAsValue &&
-                node.parent.d.name === node &&
-                node.parent.d.valueExpr.nodeType === ParseNodeType.Name
-            ) {
-                node = node.parent.d.valueExpr;
-            }
-
             const declInfo = this._evaluator.getDeclInfoForNameNode(node);
             const declarations = declInfo?.decls;
 
diff --git a/packages/pyright-internal/src/languageService/renameProvider.ts b/packages/pyright-internal/src/languageService/renameProvider.ts
@@ -19,7 +19,6 @@ import { Position, Range } from '../common/textRange';
 import { Uri } from '../common/uri/uri';
 import { convertToWorkspaceEdit } from '../common/workspaceEditUtils';
 import { ReferencesProvider, ReferencesResult } from '../languageService/referencesProvider';
-import { ParseNodeType } from '../parser/parseNodes';
 import { ParseFileResults } from '../parser/parser';
 
 export class RenameProvider {
@@ -122,28 +121,10 @@ export class RenameProvider {
         const edits: FileEditAction[] = [];
         referencesResult.results.forEach((result) => {
             // Special case the renames of keyword arguments.
-            const node = result.node;
-            let range = result.location.range;
-            let replacementText = newName;
-
-            if (
-                node.nodeType === ParseNodeType.Name &&
-                node.parent?.nodeType === ParseNodeType.Argument &&
-                node.parent.d.isNameSameAsValue &&
-                result.parentRange
-            ) {
-                range = result.parentRange;
-                if (node === node.parent.d.valueExpr) {
-                    replacementText = `${node.d.value}=${newName}`;
-                } else {
-                    replacementText = `${newName}=${node.d.value}`;
-                }
-            }
-
             edits.push({
                 fileUri: result.location.uri,
-                range,
-                replacementText,
+                range: result.location.range,
+                replacementText: newName,
             });
         });
 
diff --git a/packages/pyright-internal/src/localization/localize.ts b/packages/pyright-internal/src/localization/localize.ts
@@ -630,7 +630,6 @@ export namespace Localizer {
             new ParameterizedString<{ type: string }>(getRawString('Diagnostic.isSubclassInvalidType'));
         export const keyValueInSet = () => getRawString('Diagnostic.keyValueInSet');
         export const keywordArgInTypeArgument = () => getRawString('Diagnostic.keywordArgInTypeArgument');
-        export const keywordArgShortcutIllegal = () => getRawString('Diagnostic.keywordArgShortcutIllegal');
         export const keywordOnlyAfterArgs = () => getRawString('Diagnostic.keywordOnlyAfterArgs');
         export const keywordParameterMissing = () => getRawString('Diagnostic.keywordParameterMissing');
         export const keywordSubscriptIllegal = () => getRawString('Diagnostic.keywordSubscriptIllegal');
diff --git a/packages/pyright-internal/src/localization/package.nls.cs.json b/packages/pyright-internal/src/localization/package.nls.cs.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "Druhý argument pro issubclass musí být třída nebo řazená kolekce členů (tuple) tříd.",
         "keyValueInSet": "Páry klíč-hodnota nejsou v rámci sady (set) povoleny.",
         "keywordArgInTypeArgument": "Argumenty klíčových slov nelze použít v seznamech argumentů typu",
-        "keywordArgShortcutIllegal": "Zástupce argumentu klíčového slova vyžaduje Python 3.14 nebo novější.",
         "keywordOnlyAfterArgs": "Oddělovač argumentů jen pro klíčová slova není povolený za parametrem *",
         "keywordParameterMissing": "Jeden nebo více parametrů klíčového slova musí následovat za parametrem „*“",
         "keywordSubscriptIllegal": "Argumenty klíčových slov v dolních indexech nejsou podporovány",
diff --git a/packages/pyright-internal/src/localization/package.nls.de.json b/packages/pyright-internal/src/localization/package.nls.de.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "Das zweite Argument für \"issubclass\" muss eine Klasse oder tuple von Klassen sein.",
         "keyValueInSet": "Schlüssel-Wert-Paare sind innerhalb einer Menge „set“ nicht zulässig.",
         "keywordArgInTypeArgument": "Schlüsselwortargumente können nicht in Typargumentlisten verwendet werden.",
-        "keywordArgShortcutIllegal": "Die Tastenkombination für Schlüsselwortargumente erfordert Python 3.14 oder höher.",
         "keywordOnlyAfterArgs": "Schlüsselworttrennzeichen ist nach dem Parameter \"*\" nicht zulässig.",
         "keywordParameterMissing": "Mindestens ein Schlüsselwortparameter muss dem Parameter \"*\" folgen.",
         "keywordSubscriptIllegal": "Schlüsselwortargumente innerhalb von Tiefskripts werden nicht unterstützt.",
diff --git a/packages/pyright-internal/src/localization/package.nls.en-us.json b/packages/pyright-internal/src/localization/package.nls.en-us.json
@@ -699,7 +699,6 @@
             "comment": "{Locked='set'}"
         },
         "keywordArgInTypeArgument": "Keyword arguments cannot be used in type argument lists",
-        "keywordArgShortcutIllegal": "Keyword argument shortcut requires Python 3.14 or newer",
         "keywordOnlyAfterArgs": "Keyword-only argument separator not allowed after \"*\" parameter",
         "keywordParameterMissing": "One or more keyword parameters must follow \"*\" parameter",
         "keywordSubscriptIllegal": "Keyword arguments within subscripts are not supported",
diff --git a/packages/pyright-internal/src/localization/package.nls.es.json b/packages/pyright-internal/src/localization/package.nls.es.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "El segundo argumento de \"issubclass\" debe ser una clase o tuple de clases",
         "keyValueInSet": "No se permiten pares de clave/valor dentro de un set",
         "keywordArgInTypeArgument": "No se pueden usar argumentos de palabra clave en listas de argumentos de tipo",
-        "keywordArgShortcutIllegal": "El acceso directo del argumento de palabra clave requiere Python 3.14 o posterior",
         "keywordOnlyAfterArgs": "No se permite el separador de argumentos por palabra clave después del parámetro \"*\".",
         "keywordParameterMissing": "Uno o varios parámetros de palabra clave deben seguir el parámetro \"*\"",
         "keywordSubscriptIllegal": "No se admiten argumentos de palabra clave dentro de subíndices",
diff --git a/packages/pyright-internal/src/localization/package.nls.fr.json b/packages/pyright-internal/src/localization/package.nls.fr.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "Le deuxième argument de « issubclass » doit être une classe ou un tuple de classes",
         "keyValueInSet": "Les paires clé/valeur ne sont pas autorisées dans un set",
         "keywordArgInTypeArgument": "Les arguments de mot-clé ne peuvent pas être utilisés dans les listes d'arguments de type",
-        "keywordArgShortcutIllegal": "Le raccourci d’argument de mot clé nécessite Python 3.14 ou une version plus récente",
         "keywordOnlyAfterArgs": "Séparateur d’arguments mot clé uniquement non autorisé après le paramètre « * »",
         "keywordParameterMissing": "Un ou plusieurs paramètres de mot-clé doivent suivre le paramètre \"*\"",
         "keywordSubscriptIllegal": "Les arguments de mot-clé dans les indices ne sont pas pris en charge",
diff --git a/packages/pyright-internal/src/localization/package.nls.it.json b/packages/pyright-internal/src/localization/package.nls.it.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "Il secondo argomento di \"issubclass\" deve essere una classe o una tuple di classi",
         "keyValueInSet": "Le coppie chiave-valore non sono consentite all'interno di un set",
         "keywordArgInTypeArgument": "Gli argomenti delle parole chiave non possono essere usati negli elenchi di argomenti tipo",
-        "keywordArgShortcutIllegal": "Il collegamento all'argomento della parola chiave richiede Python 3.14 o versione successiva",
         "keywordOnlyAfterArgs": "Separatore di argomenti solo parola chiave non consentito dopo il parametro \"*\"",
         "keywordParameterMissing": "Uno o più parametri di parole chiave devono seguire il parametro \"*\"",
         "keywordSubscriptIllegal": "Gli argomenti delle parole chiave all'interno di pedici non sono supportati",
diff --git a/packages/pyright-internal/src/localization/package.nls.ja.json b/packages/pyright-internal/src/localization/package.nls.ja.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "\"issubclass\" の 2 番目の引数は、クラスまたはクラスの tuple である必要があります",
         "keyValueInSet": "キーと値のペアは set 内では使用できません",
         "keywordArgInTypeArgument": "キーワード引数は型引数リストでは使用できません",
-        "keywordArgShortcutIllegal": "キーワード引数のショートカットには Python 3.14 以降が必要です",
         "keywordOnlyAfterArgs": "キーワードのみの引数の区切り記号は、\"*\" パラメーターの後には使用できません",
         "keywordParameterMissing": "1 つ以上のキーワード パラメーターが \"*\" パラメーターの後に続く必要があります",
         "keywordSubscriptIllegal": "添字内のキーワード引数はサポートされていません",
diff --git a/packages/pyright-internal/src/localization/package.nls.ko.json b/packages/pyright-internal/src/localization/package.nls.ko.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "\"issubclass\"에 대한 두 번째 인수는 클래스 또는 클래스의 tuple이어야 합니다.",
         "keyValueInSet": "set 내에서 키/값 쌍을 사용할 수 없습니다.",
         "keywordArgInTypeArgument": "키워드 인수는 형식 인수 목록에서 사용할 수 없습니다.",
-        "keywordArgShortcutIllegal": "키워드 인수 바로 가기에는 Python 3.14 이상 필요",
         "keywordOnlyAfterArgs": "키워드 전용 인수 구분 기호는 \"*\" 매개 변수 뒤에 사용할 수 없습니다.",
         "keywordParameterMissing": "하나 이상의 키워드 매개 변수는 ’*‘ 매개 변수 뒤에 와야 합니다.",
         "keywordSubscriptIllegal": "아래 첨자 내의 키워드 인수는 지원되지 않습니다.",
diff --git a/packages/pyright-internal/src/localization/package.nls.pl.json b/packages/pyright-internal/src/localization/package.nls.pl.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "Drugi argument „issubclass” musi być klasą lub tuple",
         "keyValueInSet": "Pary klucz/wartość nie są dozwolone w set",
         "keywordArgInTypeArgument": "Argumentów słów kluczowych nie można używać na listach argumentów typu",
-        "keywordArgShortcutIllegal": "Skrót do argumentu słowa kluczowego wymaga języka Python 3.14 lub nowszego",
         "keywordOnlyAfterArgs": "Separator argumentów tylko ze słowami kluczowymi jest niedozwolony po parametrze „*”",
         "keywordParameterMissing": "Co najmniej jeden parametr słowa kluczowego musi występować po parametrze „*”",
         "keywordSubscriptIllegal": "Argumenty słów kluczowych w indeksach podrzędnych nie są obsługiwane",
diff --git a/packages/pyright-internal/src/localization/package.nls.pt-br.json b/packages/pyright-internal/src/localization/package.nls.pt-br.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "O segundo argumento para \"issubclass\" deve ser uma classe ou tuple de classes",
         "keyValueInSet": "Pares chave/valor não são permitidos em um set",
         "keywordArgInTypeArgument": "Argumentos de palavra-chave não podem ser usados em listas de argumentos de tipo",
-        "keywordArgShortcutIllegal": "O atalho do argumento de palavra-chave requer Python 3.14 ou mais recente",
         "keywordOnlyAfterArgs": "Separador de argumento somente palavra-chave não permitido após o parâmetro \"*\"",
         "keywordParameterMissing": "Um ou mais parâmetros de palavra-chave devem seguir o parâmetro \"*\"",
         "keywordSubscriptIllegal": "Não há suporte para argumentos de palavra-chave em subscritos",
diff --git a/packages/pyright-internal/src/localization/package.nls.qps-ploc.json b/packages/pyright-internal/src/localization/package.nls.qps-ploc.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "[6Q7qf][นั้§ëçøñð ærgµmëñt tø \"issubclass\" mµst þë æ çlæss ør tuple øf çlæssësẤğ倪İЂҰक्र्तिृまẤğ倪İЂҰक्र्तिृนั้ढूँ]",
         "keyValueInSet": "[tmmyt][นั้Këÿ/vælµë pæïrs ærë ñøt ælløwëð wïthïñ æ setẤğ倪İЂҰक्र्तिृまẤğ倪İนั้ढूँ]",
         "keywordArgInTypeArgument": "[BzcKx][นั้Këÿwørð ærgµmëñts çæññøt þë µsëð ïñ tÿpë ærgµmëñt lïstsẤğ倪İЂҰक्र्तिृまẤğ倪İЂҰक्นั้ढूँ]",
-        "keywordArgShortcutIllegal": "[KU0tn][นั้Këÿwørð ærgµmëñt shørtçµt rëqµïrës Pÿthøñ 3.14 ør ñëwërẤğ倪İЂҰक्र्तिृまẤğ倪İЂҰक्นั้ढूँ]",
         "keywordOnlyAfterArgs": "[RLvT4][นั้Këÿwørð-øñlÿ ærgµmëñt sëpærætør ñøt ælløwëð æftër \"*\" pæræmëtërẤğ倪İЂҰक्र्तिृまẤğ倪İЂҰक्र्तिृนั้ढूँ]",
         "keywordParameterMissing": "[gTcAl][นั้Øñë ør mørë këÿwørð pæræmëtërs mµst følløw \"*\" pæræmëtërẤğ倪İЂҰक्र्तिृまẤğ倪İЂҰक्นั้ढूँ]",
         "keywordSubscriptIllegal": "[khu47][นั้Këÿwørð ærgµmëñts wïthïñ sµþsçrïpts ærë ñøt sµppørtëðẤğ倪İЂҰक्र्तिृまẤğ倪İЂҰक्นั้ढूँ]",
diff --git a/packages/pyright-internal/src/localization/package.nls.ru.json b/packages/pyright-internal/src/localization/package.nls.ru.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "Второй аргумент в \"issubclass\" должен быть классом или tuple классов",
         "keyValueInSet": "Пары \"ключ-значение\" не допускаются в set",
         "keywordArgInTypeArgument": "Аргументы ключевых слов нельзя использовать в списках аргументов типа",
-        "keywordArgShortcutIllegal": "Ярлык аргумента ключевого слова требует Python 3.14 или более поздней версии",
         "keywordOnlyAfterArgs": "Разделитель аргументов типа \"только ключевое слово\" не разрешен после параметра \"*\"",
         "keywordParameterMissing": "За параметром \"*\" должен следовать один или несколько параметров ключевого слова.",
         "keywordSubscriptIllegal": "Аргументы ключевых слов в нижних индексах не поддерживаются",
diff --git a/packages/pyright-internal/src/localization/package.nls.tr.json b/packages/pyright-internal/src/localization/package.nls.tr.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "Second argument to \"issubclass\" must be a class or tuple of classes",
         "keyValueInSet": "Key/value pairs are not allowed within a set",
         "keywordArgInTypeArgument": "Anahtar sözcük bağımsız değişkenleri tür bağımsız değişken listelerinde kullanılamaz",
-        "keywordArgShortcutIllegal": "Anahtar sözcük bağımsız değişkeni kısayolu için Python 3.14 veya daha yenisini gereklidir.",
         "keywordOnlyAfterArgs": "\"*\" parametresinden sonra keyword-only bağımsız değişken ayırıcısı kullanılamaz",
         "keywordParameterMissing": "Bir veya daha fazla anahtar sözcük parametresi \"*\" parametresini izlemeli",
         "keywordSubscriptIllegal": "Alt simge içindeki anahtar sözcük bağımsız değişkenleri desteklenmiyor",
diff --git a/packages/pyright-internal/src/localization/package.nls.zh-cn.json b/packages/pyright-internal/src/localization/package.nls.zh-cn.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "\"issubclass\" 的第二个参数必须是类或类的 tuple",
         "keyValueInSet": "不允许在 set 内使用键/值对",
         "keywordArgInTypeArgument": "关键字参数不能在类型参数列表中使用",
-        "keywordArgShortcutIllegal": "关键字参数快捷方式需要 Python 3.14 或更高版本",
         "keywordOnlyAfterArgs": "“*”参数后不允许使用仅限关键字的参数分隔符",
         "keywordParameterMissing": "一个或多个关键字参数必须遵循 \"*\"参数",
         "keywordSubscriptIllegal": "不支持下标中的关键字参数",
diff --git a/packages/pyright-internal/src/localization/package.nls.zh-tw.json b/packages/pyright-internal/src/localization/package.nls.zh-tw.json
@@ -284,7 +284,6 @@
         "isSubclassInvalidType": "\"issubclass\" 的第二個引數必須是類別的類別或 tuple",
         "keyValueInSet": "set 內不允許金鑰/值組",
         "keywordArgInTypeArgument": "關鍵字引數無法用於型別引數清單",
-        "keywordArgShortcutIllegal": "關鍵字引數快速鍵需要 Python 3.14 或更新版本",
         "keywordOnlyAfterArgs": "\"*\" 參數之後不允許僅限關鍵字的引數分隔符號",
         "keywordParameterMissing": "一或多個關鍵字參數必須接在 \"*\" 參數後面",
         "keywordSubscriptIllegal": "不支援下標內的關鍵字引數",
diff --git a/packages/pyright-internal/src/parser/parseNodes.ts b/packages/pyright-internal/src/parser/parseNodes.ts
@@ -2003,9 +2003,6 @@ export interface ArgumentNode extends ParseNodeBase<ParseNodeType.Argument> {
         argCategory: ArgCategory;
         name: NameNode | undefined;
         valueExpr: ExpressionNode;
-
-        // Is this an argument of the form "x=" as introduced in PEP 736?
-        isNameSameAsValue: boolean;
     };
 }
 
@@ -2022,7 +2019,6 @@ export namespace ArgumentNode {
                 argCategory,
                 name: undefined,
                 valueExpr,
-                isNameSameAsValue: false,
             },
         };
 
diff --git a/packages/pyright-internal/src/parser/parser.ts b/packages/pyright-internal/src/parser/parser.ts
diff --git a/packages/pyright-internal/src/tests/fourslash/rename.args.fourslash.ts b/packages/pyright-internal/src/tests/fourslash/rename.args.fourslash.ts
diff --git a/packages/pyright-internal/src/tests/samples/call18.py b/packages/pyright-internal/src/tests/samples/call18.py
diff --git a/packages/pyright-internal/src/tests/typeEvaluator1.test.ts b/packages/pyright-internal/src/tests/typeEvaluator1.test.ts
