focus on keyword suggestion

Author: zang-langyan

Grammar/python.gram

@@ -1287,12 +1287,6 @@ invalid_named_expression(memo):
     | a=expression ':=' expression {
         RAISE_SYNTAX_ERROR_KNOWN_LOCATION(
             a, "cannot use assignment expressions with %s", _PyPegen_get_expr_name(a)) }
-    | a=expression '&''&' b=expression {
-        RAISE_SYNTAX_ERROR_KNOWN_RANGE(
-            a, b, "invalid syntax '&&'. Use 'and' instead.") }
-    | a=expression '|''|' b=expression {
-        RAISE_SYNTAX_ERROR_KNOWN_RANGE(
-            a, b, "invalid syntax '||'. Use 'or' instead.") }
     | a=NAME '=' b=bitwise_or !('='|':=') {
         RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "invalid syntax. Maybe you meant '==' or ':=' instead of '='?") }
     | !(list|tuple|genexp|'True'|'None'|'False') a=bitwise_or b='=' bitwise_or !('='|':=') {

Lib/test/test_traceback.py

@@ -1815,6 +1815,10 @@ class TestKeywordTypoSuggestions(unittest.TestCase):
         ("[x for x\nin range(3)\nof x]", "if"),
         ("[123 fur x\nin range(3)\nif x]", "for"),
         ("for x im n:\n  pass", "in"),
+        ("switch x:\n case:", "match"),
+        ("delete x", "del"),
+        ("function f():", "def"),
+        ("func f():", "def"),
     ]
 
     def test_keyword_suggestions_from_file(self):

Lib/traceback.py

@@ -1493,7 +1493,14 @@ def _find_keyword_typos(self):
                 suggestion = _suggestions._generate_suggestions(keyword.kwlist + keyword.softkwlist, wrong_name)
                 if suggestion:
                     matches.append(suggestion)
-            matches.extend(difflib.get_close_matches(wrong_name, keyword.kwlist, n=max_matches, cutoff=0.5))
+            matches.extend(
+                difflib.get_close_matches(
+                    wrong_name, 
+                    keyword.kwlist + keyword.softkwlist, 
+                    n=max_matches, 
+                    cutoff=0.5
+                )
+            )
             matches = matches[:max_matches]
             for suggestion in matches:
                 if not suggestion or suggestion == wrong_name:
@@ -1799,10 +1806,6 @@ def print(self, *, file=None, chain=True, **kwargs):
     # function define equivalents
     'function': 'def',
     'func': 'def',
-    # null equivalents
-    'NULL': 'None',
-    'null': 'None',
-    'nil': 'None',
 })
 
 def _substitution_cost(ch_a, ch_b):
@@ -1887,8 +1890,7 @@ def _get_cross_language_hint(obj, wrong_name):
 def _get_cross_language_keyword_hint(wrong_name):
     """Check if wrong_name is a common keyword from another language
     """
-    hint = _CROSS_LANGUAGE_KEYWORD_HINTS.get(wrong_name)
-    return hint
+    return _CROSS_LANGUAGE_KEYWORD_HINTS.get(wrong_name)
 
 
 def _get_safe___dir__(obj):

Misc/NEWS.d/next/Library/2026-06-12-00-17-29.gh-issue-151128.-LYO3a.rst

@@ -0,0 +1,3 @@
+Cross-language keyword suggestions are now shown for :exc:`SyntaxError`
+messages. For example, ``switch x:`` suggests ``match``, ``delete x``
+suggests ``del``, ``function f():`` suggests ``def``.