Also find the elif keyword

Author: DanielNoord

astroid/nodes/node_classes.py

@@ -3035,10 +3035,10 @@ def __init__(
         """Whether the if-statement is the orelse-block of another if statement."""
 
         self.orelse_lineno: Optional[int] = None
-        """The line number of the ``else`` keyword."""
+        """The line number of the ``else`` or ``elif`` keyword."""
 
         self.orelse_col_offset: Optional[int] = None
-        """The column offset of the ``else`` keyword."""
+        """The column offset of the ``else`` or ``elif`` keyword."""
 
         super().__init__(
             lineno=lineno,
@@ -3065,9 +3065,9 @@ def postinit(
 
         :param orelse: The contents of the ``else`` block.
 
-        :param orelse_lineno: The line number of the ``else`` keyword.
+        :param orelse_lineno: The line number of the ``else`` or ``elif`` keyword.
 
-        :param orelse_lineno: The column offset of the ``else`` keyword.
+        :param orelse_lineno: The column offset of the ``else`` or ``elif`` keyword.
         """
         self.test = test
         if body is not None:

astroid/rebuilder.py

@@ -6,13 +6,13 @@
 order to get a single Astroid representation
 """
 
+import ast
 import sys
 import token
 import tokenize
 from io import StringIO
 from tokenize import TokenInfo, generate_tokens
 from typing import (
-    TYPE_CHECKING,
     Callable,
     Dict,
     Generator,
@@ -39,9 +39,6 @@
 else:
     from typing_extensions import Final
 
-if TYPE_CHECKING:
-    import ast
-
 
 REDIRECT: Final[Dict[str, str]] = {
     "arguments": "Arguments",
@@ -1382,11 +1379,17 @@ def visit_global(self, node: "ast.Global", parent: NodeNG) -> nodes.Global:
                 self._global_names[-1].setdefault(name, []).append(newnode)
         return newnode
 
-    def _find_else_keyword(self, node: "ast.If") -> Tuple[Optional[int], Optional[int]]:
-        """Get the line number and column offset of the `else` keyword."""
+    def _find_orelse_keyword(
+        self, node: "ast.If"
+    ) -> 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
 
+        # If the first child in orelse is an If node the orelse is an elif block
+        if isinstance(node.orelse[0], ast.If):
+            return node.orelse[0].lineno, node.orelse[0].col_offset
+
         end_lineno = node.orelse[0].lineno - 1
 
         # pylint: disable-next=unsubscriptable-object
@@ -1407,7 +1410,7 @@ def visit_if(self, node: "ast.If", parent: NodeNG) -> nodes.If:
             parent=parent,
         )
 
-        orelse_lineno, orelse_col_offset = self._find_else_keyword(node)
+        orelse_lineno, orelse_col_offset = self._find_orelse_keyword(node)
 
         newnode.postinit(
             self.visit(node.test, newnode),

tests/unittest_nodes.py

@@ -349,8 +349,12 @@ def test_orelse_line_numbering(self) -> None:
         assert self.astroid.body[0].orelse_col_offset is None
         assert self.astroid.body[1].orelse_lineno == 7
         assert self.astroid.body[1].orelse_col_offset == 0
-        assert self.astroid.body[2].orelse_lineno is None
-        assert self.astroid.body[2].orelse_col_offset is None
+        assert self.astroid.body[2].orelse_lineno == 12
+        assert self.astroid.body[2].orelse_col_offset == 0
+        assert self.astroid.body[3].orelse_lineno == 17
+        assert self.astroid.body[3].orelse_col_offset == 0
+        assert self.astroid.body[3].orelse[0].orelse_lineno == 19
+        assert self.astroid.body[3].orelse[0].orelse_col_offset == 0
         assert self.astroid.body[3].orelse[0].orelse[0].orelse_lineno == 21
         assert self.astroid.body[3].orelse[0].orelse[0].orelse_col_offset == 0