Other approach

Author: DanielNoord

ChangeLog

@@ -8,8 +8,8 @@ Release date: TBA
 
 * ``astroid`` now requires Python 3.7.2 to run.
 
-* Add ``orelse_lineno`` and ``orelse_col_offset`` attributes to ``nodes.If``,
-  ``nodes.For``, ``nodes.While``, and ``nodes.TryExcept``.
+* Made ``block_range`` of ``nodes.If``, ``nodes.For``, ``nodes.While``,
+  and ``nodes.TryExcept`` respect ``else`` and ``finally``.
 
 * Fix ``re`` brain on Python ``3.11``. The flags now come from ``re._compile``.
 

astroid/mixins.py

@@ -4,9 +4,12 @@
 
 """This module contains some mixins for the different nodes.
 """
+
+from __future__ import annotations
+
 import itertools
 import sys
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from astroid import decorators
 from astroid.exceptions import AttributeInferenceError
@@ -27,23 +30,32 @@ class BlockRangeMixIn:
     def blockstart_tolineno(self):
         return self.lineno
 
-    def _elsed_block_range(self, lineno, orelse, last=None):
+    def _elsed_block_range(
+        self, lineno: int, orelse: list[nodes.NodeNG], last: int | None = None
+    ) -> tuple[int, int]:
         """handle block line numbers range for try/finally, for, if and while
         statements
         """
-        if lineno == self.fromlineno:
+        # If at the end of the node, return same line
+        if lineno == self.tolineno:
             return lineno, lineno
         if orelse:
-            if lineno >= orelse[0].fromlineno:
+            # If the lineno is beyond the body of the node we check the orelse
+            if lineno >= self.body[-1].tolineno + 1:
+                # If the orelse has a scope of its own we determine the block range there
+                if isinstance(orelse[0], BlockRangeMixIn):
+                    return orelse[0]._elsed_block_range(lineno, orelse[0].orelse)
+                # Return last line of orelse
                 return lineno, orelse[-1].tolineno
-            return lineno, orelse[0].fromlineno - 1
+            # If the lineno is within the body we take the last line of the body
+            return lineno, self.body[-1].tolineno
         return lineno, last or self.tolineno
 
 
 class FilterStmtsMixin:
     """Mixin for statement filtering and assignment type"""
 
-    def _get_filtered_stmts(self, _, node, _stmts, mystmt: Optional["nodes.Statement"]):
+    def _get_filtered_stmts(self, _, node, _stmts, mystmt: nodes.Statement | None):
         """method used in _filter_stmts to get statements and trigger break"""
         if self.statement(future=True) is mystmt:
             # original node's statement is the assignment, only keep
@@ -60,7 +72,7 @@ def assign_type(self):
         return self
 
     def _get_filtered_stmts(
-        self, lookup_node, node, _stmts, mystmt: Optional["nodes.Statement"]
+        self, lookup_node, node, _stmts, mystmt: nodes.Statement | None
     ):
         """method used in filter_stmts"""
         if self is mystmt:

astroid/nodes/node_classes.py

@@ -2661,12 +2661,6 @@ def __init__(
         self.orelse: typing.List[NodeNG] = []
         """The contents of the ``else`` block of the loop."""
 
-        self.orelse_lineno: Optional[int] = None
-        """The line number of the ``else`` keyword."""
-
-        self.orelse_col_offset: Optional[int] = None
-        """The column offset of the ``else`` keyword."""
-
         self.type_annotation: Optional[NodeNG] = None  # can be None
         """If present, this will contain the type annotation passed by a type comment"""
 
@@ -2686,9 +2680,6 @@ def postinit(
         body: Optional[typing.List[NodeNG]] = None,
         orelse: Optional[typing.List[NodeNG]] = None,
         type_annotation: Optional[NodeNG] = None,
-        *,
-        orelse_lineno: Optional[int] = None,
-        orelse_col_offset: Optional[int] = None,
     ) -> None:
         """Do some setup after initialisation.
 
@@ -2699,19 +2690,13 @@ def postinit(
         :param body: The contents of the body of the loop.
 
         :param orelse: The contents of the ``else`` block of the loop.
-
-        :param orelse_lineno: The line number of the ``else`` keyword.
-
-        :param orelse_lineno: The column offset of the ``else`` keyword.
         """
         self.target = target
         self.iter = iter
         if body is not None:
             self.body = body
         if orelse is not None:
             self.orelse = orelse
-        self.orelse_lineno = orelse_lineno
-        self.orelse_col_offset = orelse_col_offset
         self.type_annotation = type_annotation
 
     assigned_stmts: ClassVar[AssignedStmtsCall["For"]]
@@ -3048,12 +3033,6 @@ def __init__(
         self.is_orelse: bool = False
         """Whether the if-statement is the orelse-block of another if statement."""
 
-        self.orelse_lineno: Optional[int] = None
-        """The line number of the ``else`` or ``elif`` keyword."""
-
-        self.orelse_col_offset: Optional[int] = None
-        """The column offset of the ``else`` or ``elif`` keyword."""
-
         super().__init__(
             lineno=lineno,
             col_offset=col_offset,
@@ -3067,9 +3046,6 @@ def postinit(
         test: Optional[NodeNG] = None,
         body: Optional[typing.List[NodeNG]] = None,
         orelse: Optional[typing.List[NodeNG]] = None,
-        *,
-        orelse_lineno: Optional[int] = None,
-        orelse_col_offset: Optional[int] = None,
     ) -> None:
         """Do some setup after initialisation.
 
@@ -3078,10 +3054,6 @@ def postinit(
         :param body: The contents of the block.
 
         :param orelse: The contents of the ``else`` block.
-
-        :param orelse_lineno: The line number of the ``else`` or ``elif`` keyword.
-
-        :param orelse_lineno: The column offset of the ``else`` or ``elif`` keyword.
         """
         self.test = test
         if body is not None:
@@ -3090,8 +3062,6 @@ def postinit(
             self.orelse = orelse
         if isinstance(self.parent, If) and self in self.parent.orelse:
             self.is_orelse = True
-        self.orelse_lineno = orelse_lineno
-        self.orelse_col_offset = orelse_col_offset
 
     @cached_property
     def blockstart_tolineno(self):
@@ -3994,12 +3964,6 @@ def __init__(
         self.orelse: typing.List[NodeNG] = []
         """The contents of the ``else`` block."""
 
-        self.orelse_lineno: Optional[int] = None
-        """The line number of the ``else`` keyword."""
-
-        self.orelse_col_offset: Optional[int] = None
-        """The column offset of the ``else`` keyword."""
-
         super().__init__(
             lineno=lineno,
             col_offset=col_offset,
@@ -4013,9 +3977,6 @@ def postinit(
         body: Optional[typing.List[NodeNG]] = None,
         handlers: Optional[typing.List[ExceptHandler]] = None,
         orelse: Optional[typing.List[NodeNG]] = None,
-        *,
-        orelse_lineno: Optional[int] = None,
-        orelse_col_offset: Optional[int] = None,
     ) -> None:
         """Do some setup after initialisation.
 
@@ -4024,19 +3985,13 @@ def postinit(
         :param handlers: The exception handlers.
 
         :param orelse: The contents of the ``else`` block.
-
-        :param orelse_lineno: The line number of the ``else`` keyword.
-
-        :param orelse_lineno: The column offset of the ``else`` keyword.
         """
         if body is not None:
             self.body = body
         if handlers is not None:
             self.handlers = handlers
         if orelse is not None:
             self.orelse = orelse
-        self.orelse_lineno = orelse_lineno
-        self.orelse_col_offset = orelse_col_offset
 
     def _infer_name(self, frame, name):
         return name
@@ -4371,12 +4326,6 @@ def __init__(
         self.orelse: typing.List[NodeNG] = []
         """The contents of the ``else`` block."""
 
-        self.orelse_lineno: Optional[int] = None
-        """The line number of the ``else`` keyword."""
-
-        self.orelse_col_offset: Optional[int] = None
-        """The column offset of the ``else`` keyword."""
-
         super().__init__(
             lineno=lineno,
             col_offset=col_offset,
@@ -4390,9 +4339,6 @@ def postinit(
         test: Optional[NodeNG] = None,
         body: Optional[typing.List[NodeNG]] = None,
         orelse: Optional[typing.List[NodeNG]] = None,
-        *,
-        orelse_lineno: Optional[int] = None,
-        orelse_col_offset: Optional[int] = None,
     ) -> None:
         """Do some setup after initialisation.
 
@@ -4401,18 +4347,12 @@ def postinit(
         :param body: The contents of the loop.
 
         :param orelse: The contents of the ``else`` block.
-
-        :param orelse_lineno: The line number of the ``else`` keyword.
-
-        :param orelse_lineno: The column offset of the ``else`` keyword.
         """
         self.test = test
         if body is not None:
             self.body = body
         if orelse is not None:
             self.orelse = orelse
-        self.orelse_lineno = orelse_lineno
-        self.orelse_col_offset = orelse_col_offset
 
     @cached_property
     def blockstart_tolineno(self):

astroid/rebuilder.py

@@ -248,26 +248,6 @@ def _reset_end_lineno(self, newnode: nodes.NodeNG) -> None:
         for child_node in newnode.get_children():
             self._reset_end_lineno(child_node)
 
-    def _find_orelse_keyword(
-        self, node: Union["ast.If", "ast.Try", "ast.For", "ast.AsyncFor", "ast.While"]
-    ) -> Tuple[Optional[int], Optional[int]]:
-        """Get the line number and column offset of the `else` or `elif` keyword."""
-        if not self._data or not node.orelse:
-            return None, None
-
-        start = node.orelse[0].lineno
-
-        # pylint: disable-next=unsubscriptable-object
-        for index, line in enumerate(self._data[start - 1 :: -1]):
-            if line.lstrip().startswith("else"):
-                # if start - index == 37:
-                # breakpoint()
-                return start - index, line.index("else")
-            if line.lstrip().startswith("elif"):
-                return start - index, line.index("elif")
-
-        return None, None
-
     def visit_module(
         self, node: "ast.Module", modname: str, modpath: str, package: bool
     ) -> nodes.Module:
@@ -1195,8 +1175,6 @@ def _visit_for(
             # pylint: disable-next=unsubscriptable-object
             col_offset = self._data[node.lineno - 1].index("async")
 
-        orelse_lineno, orelse_col_offset = self._find_orelse_keyword(node)
-
         newnode = cls(
             lineno=node.lineno,
             col_offset=col_offset,
@@ -1212,8 +1190,6 @@ def _visit_for(
             body=[self.visit(child, newnode) for child in node.body],
             orelse=[self.visit(child, newnode) for child in node.orelse],
             type_annotation=type_annotation,
-            orelse_lineno=orelse_lineno,
-            orelse_col_offset=orelse_col_offset,
         )
         return newnode
 
@@ -1406,14 +1382,10 @@ def visit_if(self, node: "ast.If", parent: NodeNG) -> nodes.If:
             parent=parent,
         )
 
-        orelse_lineno, orelse_col_offset = self._find_orelse_keyword(node)
-
         newnode.postinit(
             self.visit(node.test, newnode),
             [self.visit(child, newnode) for child in node.body],
             [self.visit(child, newnode) for child in node.orelse],
-            orelse_lineno=orelse_lineno,
-            orelse_col_offset=orelse_col_offset,
         )
         return newnode
 
@@ -1827,14 +1799,10 @@ def visit_tryexcept(self, node: "ast.Try", parent: NodeNG) -> nodes.TryExcept:
         else:
             newnode = nodes.TryExcept(node.lineno, node.col_offset, parent)
 
-        orelse_lineno, orelse_col_offset = self._find_orelse_keyword(node)
-
         newnode.postinit(
             [self.visit(child, newnode) for child in node.body],
             [self.visit(child, newnode) for child in node.handlers],
             [self.visit(child, newnode) for child in node.orelse],
-            orelse_lineno=orelse_lineno,
-            orelse_col_offset=orelse_col_offset,
         )
         return newnode
 
@@ -1903,14 +1871,10 @@ def visit_while(self, node: "ast.While", parent: NodeNG) -> nodes.While:
             parent=parent,
         )
 
-        orelse_lineno, orelse_col_offset = self._find_orelse_keyword(node)
-
         newnode.postinit(
             self.visit(node.test, newnode),
             [self.visit(child, newnode) for child in node.body],
             [self.visit(child, newnode) for child in node.orelse],
-            orelse_lineno=orelse_lineno,
-            orelse_col_offset=orelse_col_offset,
         )
         return newnode