Fix constructors of BaseContainer and Dict

Author: DanielNoord

ChangeLog

@@ -58,6 +58,7 @@ Release date: TBA
   - ``nodes.Attribute``
   - ``nodes.AugAssign``
   - ``nodes.Await``
+  - ``nodes.BaseContainer``
   - ``nodes.BinOp``
   - ``nodes.Call``
   - ``nodes.ClassDef``
@@ -67,6 +68,7 @@ Release date: TBA
   - ``nodes.Delete``
   - ``nodes.DelAttr``
   - ``nodes.DelName``
+  - ``nodes.Dict``
   - ``nodes.DictComp``
   - ``nodes.ExceptHandler``
   - ``nodes.Expr``

astroid/arguments.py

@@ -254,6 +254,8 @@ def infer_argument(
                 lineno=funcnode.args.lineno,
                 col_offset=funcnode.args.col_offset,
                 parent=funcnode.args,
+                end_lineno=funcnode.args.end_lineno,
+                end_col_offset=funcnode.args.end_col_offset,
             )
             kwarg.postinit(
                 [(nodes.const_factory(key), value) for key, value in kwargs.items()]

astroid/brain/brain_builtin_inference.py

@@ -7,10 +7,11 @@
 from __future__ import annotations
 
 import itertools
-from collections.abc import Iterator
+from collections.abc import Callable, Iterable, Iterator
 from functools import partial
+from typing import Any
 
-from astroid import arguments, helpers, inference_tip, nodes, objects, util
+from astroid import arguments, bases, helpers, inference_tip, nodes, objects, util
 from astroid.builder import AstroidBuilder
 from astroid.context import InferenceContext
 from astroid.exceptions import (
@@ -22,7 +23,7 @@
 )
 from astroid.manager import AstroidManager
 from astroid.nodes import scoped_nodes
-from astroid.typing import InferenceResult
+from astroid.typing import InferenceResult, SuccessfulInferenceResult
 
 OBJECT_DUNDER_NEW = "object.__new__"
 
@@ -196,10 +197,21 @@ def _transform_wrapper(node, context: InferenceContext | None = None):
     )
 
 
-def _container_generic_inference(node, context, node_type, transform):
+def _container_generic_inference(
+    node: nodes.Call,
+    context: InferenceContext | None,
+    node_type: type[nodes.BaseContainer],
+    transform: Callable[[SuccessfulInferenceResult], nodes.BaseContainer | None],
+) -> nodes.BaseContainer:
     args = node.args
     if not args:
-        return node_type()
+        return node_type(
+            lineno=node.lineno,
+            col_offset=node.col_offset,
+            parent=node.parent,
+            end_lineno=node.end_lineno,
+            end_col_offset=node.end_col_offset,
+        )
     if len(node.args) > 1:
         raise UseInferenceDefault()
 
@@ -219,8 +231,12 @@ def _container_generic_inference(node, context, node_type, transform):
 
 
 def _container_generic_transform(  # pylint: disable=inconsistent-return-statements
-    arg, context, klass, iterables, build_elts
-):
+    arg: SuccessfulInferenceResult,
+    context: InferenceContext | None,
+    klass: type[nodes.BaseContainer],
+    iterables: tuple[type[nodes.NodeNG] | type[bases.Proxy], ...],
+    build_elts: type[Iterable[Any]],
+) -> nodes.BaseContainer | None:
     if isinstance(arg, klass):
         return arg
     if isinstance(arg, iterables):
@@ -251,8 +267,12 @@ def _container_generic_transform(  # pylint: disable=inconsistent-return-stateme
 
 
 def _infer_builtin_container(
-    node, context, klass=None, iterables=None, build_elts=None
-):
+    node: nodes.Call,
+    context: InferenceContext | None,
+    klass: type[nodes.BaseContainer],
+    iterables: tuple[type[nodes.NodeNG] | type[bases.Proxy], ...],
+    build_elts: type[Iterable[Any]],
+) -> nodes.BaseContainer:
     transform_func = partial(
         _container_generic_transform,
         context=context,
@@ -337,7 +357,7 @@ def is_iterable(n):
     return items
 
 
-def infer_dict(node, context: InferenceContext | None = None):
+def infer_dict(node: nodes.Call, context: InferenceContext | None = None) -> nodes.Dict:
     """Try to infer a dict call to a Dict node.
 
     The function treats the following cases:
@@ -360,7 +380,13 @@ def infer_dict(node, context: InferenceContext | None = None):
 
     if not args and not kwargs:
         # dict()
-        return nodes.Dict()
+        return nodes.Dict(
+            lineno=node.lineno,
+            col_offset=node.col_offset,
+            parent=node.parent,
+            end_lineno=node.end_lineno,
+            end_col_offset=node.end_col_offset,
+        )
     if kwargs and not args:
         # dict(a=1, b=2, c=4)
         items = [(nodes.Const(key), value) for key, value in kwargs]
@@ -374,7 +400,11 @@ def infer_dict(node, context: InferenceContext | None = None):
     else:
         raise UseInferenceDefault()
     value = nodes.Dict(
-        col_offset=node.col_offset, lineno=node.lineno, parent=node.parent
+        col_offset=node.col_offset,
+        lineno=node.lineno,
+        parent=node.parent,
+        end_lineno=node.end_lineno,
+        end_col_offset=node.end_col_offset,
     )
     value.postinit(items)
     return value
@@ -853,7 +883,11 @@ def infer_dict_fromkeys(node, context: InferenceContext | None = None):
 
     def _build_dict_with_elements(elements):
         new_node = nodes.Dict(
-            col_offset=node.col_offset, lineno=node.lineno, parent=node.parent
+            col_offset=node.col_offset,
+            lineno=node.lineno,
+            parent=node.parent,
+            end_lineno=node.end_lineno,
+            end_col_offset=node.end_col_offset,
         )
         new_node.postinit(elements)
         return new_node

astroid/brain/brain_namedtuple_enum.py

@@ -466,9 +466,23 @@ def name(self):
             node.locals[local] = new_targets
 
         # The undocumented `_value2member_map_` member:
-        node.locals["_value2member_map_"] = [nodes.Dict(parent=node)]
-
-        members = nodes.Dict(parent=node)
+        node.locals["_value2member_map_"] = [
+            nodes.Dict(
+                parent=node,
+                lineno=node.lineno,
+                col_offset=node.col_offset,
+                end_lineno=node.end_lineno,
+                end_col_offset=node.end_col_offset,
+            )
+        ]
+
+        members = nodes.Dict(
+            parent=node,
+            lineno=node.lineno,
+            col_offset=node.col_offset,
+            end_lineno=node.end_lineno,
+            end_col_offset=node.end_col_offset,
+        )
         members.postinit(
             [
                 (

astroid/inference.py

@@ -130,7 +130,11 @@ def infer_sequence(
     if has_starred_named_expr:
         values = _infer_sequence_helper(self, context)
         new_seq = type(self)(
-            lineno=self.lineno, col_offset=self.col_offset, parent=self.parent
+            lineno=self.lineno,
+            col_offset=self.col_offset,
+            parent=self.parent,
+            end_lineno=self.end_lineno,
+            end_col_offset=self.end_col_offset,
         )
         new_seq.postinit(values)
 
@@ -151,7 +155,13 @@ def infer_map(
         yield self
     else:
         items = _infer_map(self, context)
-        new_seq = type(self)(self.lineno, self.col_offset, self.parent)
+        new_seq = type(self)(
+            self.lineno,
+            self.col_offset,
+            self.parent,
+            end_lineno=self.end_lineno,
+            end_col_offset=self.end_col_offset,
+        )
         new_seq.postinit(list(items.items()))
         yield new_seq
 

astroid/interpreter/objectmodel.py

@@ -47,7 +47,13 @@
 
 
 def _dunder_dict(instance, attributes):
-    obj = node_classes.Dict(parent=instance)
+    obj = node_classes.Dict(
+        parent=instance,
+        lineno=instance.lineno,
+        col_offset=instance.col_offset,
+        end_lineno=instance.end_lineno,
+        end_col_offset=instance.end_col_offset,
+    )
 
     # Convert the keys to node strings
     keys = [
@@ -263,7 +269,13 @@ def attr___defaults__(self):
 
     @property
     def attr___annotations__(self):
-        obj = node_classes.Dict(parent=self._instance)
+        obj = node_classes.Dict(
+            parent=self._instance,
+            lineno=self._instance.lineno,
+            col_offset=self._instance.col_offset,
+            end_lineno=self._instance.end_lineno,
+            end_col_offset=self._instance.end_col_offset,
+        )
 
         if not self._instance.returns:
             returns = None
@@ -297,7 +309,13 @@ def attr___annotations__(self):
 
     @property
     def attr___dict__(self):
-        return node_classes.Dict(parent=self._instance)
+        return node_classes.Dict(
+            parent=self._instance,
+            lineno=self._instance.lineno,
+            col_offset=self._instance.col_offset,
+            end_lineno=self._instance.end_lineno,
+            end_col_offset=self._instance.end_col_offset,
+        )
 
     attr___globals__ = attr___dict__
 
@@ -314,7 +332,13 @@ def _default_args(args, parent):
                 yield name, default
 
         args = self._instance.args
-        obj = node_classes.Dict(parent=self._instance)
+        obj = node_classes.Dict(
+            parent=self._instance,
+            lineno=self._instance.lineno,
+            col_offset=self._instance.col_offset,
+            end_lineno=self._instance.end_lineno,
+            end_col_offset=self._instance.end_col_offset,
+        )
         defaults = dict(_default_args(args, obj))
 
         obj.postinit(list(defaults.items()))
@@ -567,7 +591,13 @@ def infer_call_result(
 
     @property
     def attr___dict__(self):
-        return node_classes.Dict(parent=self._instance)
+        return node_classes.Dict(
+            parent=self._instance,
+            lineno=self._instance.lineno,
+            col_offset=self._instance.col_offset,
+            end_lineno=self._instance.end_lineno,
+            end_col_offset=self._instance.end_col_offset,
+        )
 
     @property
     def attr___call__(self):