Represent ParamSpec and TypeVar names with AssignName

Follow the example of MatchStar and the like

Author: jacobtylerwalls

astroid/nodes/as_string.py

@@ -525,11 +525,11 @@ def visit_tuple(self, node) -> str:
 
     def visit_typealias(self, node: nodes.TypeAlias) -> str:
         """return an astroid.TypeAlias node as string"""
-        return f"{node.value}{node.type_params or ''}"
+        return node.name.accept(self) if node.name else "_"
 
     def visit_typevar(self, node: nodes.TypeVar) -> str:
         """return an astroid.TypeVar node as string"""
-        return node.name
+        return node.name.accept(self) if node.name else "_"
 
     def visit_unaryop(self, node) -> str:
         """return an astroid.UnaryOp node as string"""

astroid/nodes/node_classes.py

@@ -2714,7 +2714,7 @@ def __init__(
         end_lineno: int | None = None,
         end_col_offset: int | None = None,
     ) -> None:
-        self.name: str
+        self.name: AssignName | None
         super().__init__(
             lineno=lineno,
             col_offset=col_offset,
@@ -2723,7 +2723,7 @@ def __init__(
             parent=parent,
         )
 
-    def postinit(self, name: str) -> None:
+    def postinit(self, *, name: AssignName | None) -> None:
         self.name = name
 
     assigned_stmts: ClassVar[
@@ -3376,6 +3376,7 @@ def __init__(
         end_lineno: int | None = None,
         end_col_offset: int | None = None,
     ) -> None:
+        self.name: AssignName | None
         self.type_params: list[TypeVar, ParamSpec]
         self.value: NodeNG
         super().__init__(
@@ -3389,9 +3390,11 @@ def __init__(
     def postinit(
         self,
         *,
+        name: AssignName | None,
         type_params: list[TypeVar, ParamSpec],
         value: NodeNG,
     ) -> None:
+        self.name = name
         self.type_params = type_params
         self.value = value
 
@@ -3431,7 +3434,7 @@ def __init__(
         end_lineno: int | None = None,
         end_col_offset: int | None = None,
     ) -> None:
-        self.name: str
+        self.name: AssignName | None
         self.bound: NodeNG | None
         super().__init__(
             lineno=lineno,
@@ -3441,7 +3444,7 @@ def __init__(
             parent=parent,
         )
 
-    def postinit(self, *, name: str, bound: NodeNG | None) -> None:
+    def postinit(self, *, name: AssignName | None, bound: NodeNG | None) -> None:
         self.name = name
         self.bound = bound
 

astroid/rebuilder.py

@@ -1508,7 +1508,9 @@ def visit_paramspec(self, node: ast.ParamSpec, parent: NodeNG) -> nodes.ParamSpe
             end_col_offset=node.end_col_offset,
             parent=parent,
         )
-        newnode.postinit(node.name)
+        # Add AssignName node for 'node.name'
+        # https://bugs.python.org/issue43994
+        newnode.postinit(name=self.visit_assignname(node, newnode, node.name))
         return newnode
 
     def visit_pass(self, node: ast.Pass, parent: NodeNG) -> nodes.Pass:
@@ -1713,6 +1715,7 @@ def visit_typealias(self, node: ast.TypeAlias, parent: NodeNG) -> nodes.TypeAlia
             parent=parent,
         )
         newnode.postinit(
+            name=self.visit(node.name, newnode),
             type_params=[self.visit(p, newnode) for p in node.type_params],
             value=self.visit(node.value, newnode),
         )
@@ -1727,7 +1730,12 @@ def visit_typevar(self, node: ast.TypeVar, parent: NodeNG) -> nodes.TypeVar:
             end_col_offset=node.end_col_offset,
             parent=parent,
         )
-        newnode.postinit(name=node.name, bound=self.visit(node.bound, newnode))
+        # Add AssignName node for 'node.name'
+        # https://bugs.python.org/issue43994
+        newnode.postinit(
+            name=self.visit_assignname(node, newnode, node.name),
+            bound=self.visit(node.bound, newnode),
+        )
         return newnode
 
     def visit_unaryop(self, node: ast.UnaryOp, parent: NodeNG) -> nodes.UnaryOp:

tests/test_type_params.py

@@ -6,15 +6,16 @@
 
 from astroid import extract_node
 from astroid.const import PY312_PLUS
-from astroid.nodes import ParamSpec, Subscript, TypeAlias, TypeVar
+from astroid.nodes import AssignName, ParamSpec, Subscript, TypeAlias, TypeVar
 
 
 @pytest.mark.skipif(not PY312_PLUS, reason="Requires Python 3.12 or higher")
 def test_type_alias() -> None:
     node = extract_node("type Point[T] = list[float, float]")
     assert isinstance(node, TypeAlias)
     assert isinstance(node.type_params[0], TypeVar)
-    assert node.type_params[0].name == "T"
+    assert isinstance(node.type_params[0].name, AssignName)
+    assert node.type_params[0].name.name == "T"
     assert node.type_params[0].bound is None
 
     assert isinstance(node.value, Subscript)
@@ -31,7 +32,8 @@ def test_type_param_spec() -> None:
     node = extract_node("type Alias[**P] = Callable[P, int]")
     params = node.type_params[0]
     assert isinstance(params, ParamSpec)
-    assert params.name == "P"
+    assert isinstance(params.name, AssignName)
+    assert params.name.name == "P"
 
     assert node.inferred()[0] is node
 
@@ -40,10 +42,10 @@ def test_type_param_spec() -> None:
 def test_type_param() -> None:
     func_node = extract_node("def func[T]() -> T: ...")
     assert isinstance(func_node.type_params[0], TypeVar)
-    assert func_node.type_params[0].name == "T"
+    assert func_node.type_params[0].name.name == "T"
     assert func_node.type_params[0].bound is None
 
     class_node = extract_node("class MyClass[T]: ...")
     assert isinstance(class_node.type_params[0], TypeVar)
-    assert class_node.type_params[0].name == "T"
+    assert class_node.type_params[0].name.name == "T"
     assert class_node.type_params[0].bound is None