Fix decorator frame

ChangeLog

@@ -29,6 +29,10 @@ Release date: TBA
 
   Refs #2860
 
+* Skip direct parent when determining the ``Decorator`` frame.
+
+  Refs pylint-dev/pylint#8425
+
 
 
 What's New in astroid 4.0.3?

astroid/nodes/node_classes.py

@@ -55,6 +55,7 @@
 if TYPE_CHECKING:
     from astroid import nodes
     from astroid.nodes import LocalsDictNodeNG
+    from astroid.nodes.node_ng import FrameType
 
 
 def _is_const(value) -> bool:
@@ -2239,13 +2240,22 @@ def scope(self) -> LocalsDictNodeNG:
 
         :returns: The first parent scope node.
         """
-        # skip the function node to go directly to the upper level scope
+        # skip the function or class node to go directly to the upper level scope
         if not self.parent:
             raise ParentMissingError(target=self)
         if not self.parent.parent:
             raise ParentMissingError(target=self.parent)
         return self.parent.parent.scope()
 
+    def frame(self) -> FrameType:
+        """The first parent node defining a new frame."""
+        # skip the function or class node to go directly to the upper level frame
+        if not self.parent:
+            raise ParentMissingError(target=self)
+        if not self.parent.parent:
+            raise ParentMissingError(target=self.parent)
+        return self.parent.parent.frame()
+
     def get_children(self):
         yield from self.nodes
 
@@ -4927,7 +4937,7 @@ def postinit(self, target: NodeNG, value: NodeNG) -> None:
     See astroid/protocols.py for actual implementation.
     """
 
-    def frame(self) -> nodes.FunctionDef | nodes.Module | nodes.ClassDef | nodes.Lambda:
+    def frame(self) -> FrameType:
         """The first parent frame node.
 
         A frame node is a :class:`Module`, :class:`FunctionDef`,

astroid/nodes/node_ng.py

@@ -42,6 +42,8 @@
 if TYPE_CHECKING:
     from astroid.nodes import _base_nodes
 
+    FrameType = nodes.FunctionDef | nodes.Module | nodes.ClassDef | nodes.Lambda
+
 
 # Types for 'NodeNG.nodes_of_class()'
 _NodesT = TypeVar("_NodesT", bound="NodeNG")
@@ -284,7 +286,7 @@ def statement(self) -> _base_nodes.Statement:
             raise StatementMissing(target=self)
         return self.parent.statement()
 
-    def frame(self) -> nodes.FunctionDef | nodes.Module | nodes.ClassDef | nodes.Lambda:
+    def frame(self) -> FrameType:
         """The first parent frame node.
 
         A frame node is a :class:`Module`, :class:`FunctionDef`,

tests/test_scoped_nodes.py

@@ -2909,6 +2909,39 @@ def method():
         assert module.frame() == module
         assert module.frame() == module
 
+    @staticmethod
+    def test_frame_node_for_decorators():
+        code = builder.extract_node(
+            """
+            def deco(var):
+                def inner(arg):
+                    ...
+                return inner
+
+            @deco(
+                x := 1  #@
+            )
+            def func():  #@
+                ...
+
+            @deco(
+                y := 2  #@
+            )
+            class A:  #@
+                ...
+        """
+        )
+        name_expr_node1, func_node, name_expr_node2, class_node = code
+        module = func_node.root()
+        assert name_expr_node1.scope() == module
+        assert name_expr_node1.frame() == module
+        assert name_expr_node2.scope() == module
+        assert name_expr_node2.frame() == module
+        assert module.locals.get("x") == [name_expr_node1.target]
+        assert module.locals.get("y") == [name_expr_node2.target]
+        assert "x" not in func_node.locals
+        assert "y" not in class_node.locals
+
     @staticmethod
     def test_non_frame_node():
         """Test if the frame of non frame nodes is set correctly."""