New approach

Author: DanielNoord

astroid/rebuilder.py

@@ -1389,25 +1389,16 @@ def _find_orelse_keyword(
         if not self._data or not node.orelse:
             return None, None
 
-        end_lineno = node.orelse[0].lineno
-
-        def find_keyword(begin: int, end: int) -> Tuple[Optional[int], Optional[int]]:
-            # pylint: disable-next=unsubscriptable-object
-            data = "\n".join(self._data[begin:end])
-
-            try:
-                tokens = list(generate_tokens(StringIO(data).readline))
-            except tokenize.TokenError:
-                # If we cut-off in the middle of multi-line if statements we
-                # generate a TokenError here. We just keep trying
-                # until the multi-line statement is closed.
-                return find_keyword(begin, end + 1)
-            for t in tokens[::-1]:
-                if t.type == token.NAME and t.string in {"else", "elif"}:
-                    return node.lineno + t.start[0] - 1, t.start[1]
-            raise AssertionError()  # pragma: no cover # Shouldn't be reached.
-
-        return find_keyword(node.lineno - 1, end_lineno)
+        start = node.orelse[0].lineno
+
+        # pylint: disable-next=unsubscriptable-object
+        for index, line in enumerate(self._data[start::-1]):
+            if line.rstrip().startswith("else"):
+                return start - index + 1, line.index("else")
+            if line.rstrip().startswith("elif"):
+                return start - index + 1, line.index("elif")
+
+        return None, None
 
     def visit_if(self, node: "ast.If", parent: NodeNG) -> nodes.If:
         """visit an If node by returning a fresh instance of it"""

tests/unittest_nodes.py

@@ -322,6 +322,18 @@ class IfNodeTest(_NodeTest):
             pass
         else:
             raise
+
+        if 1:
+            print()
+        elif (
+            2
+            and 3
+        ):
+            print()
+        else:
+            # This is using else in a comment
+            raise
+
     """
 
     def test_if_elif_else_node(self) -> None:
@@ -357,6 +369,10 @@ def test_orelse_line_numbering(self) -> None:
         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
+        assert self.astroid.body[4].orelse_lineno == 26
+        assert self.astroid.body[4].orelse_col_offset == 0
+        assert self.astroid.body[4].orelse[0].orelse_lineno == 31
+        assert self.astroid.body[4].orelse[0].orelse_col_offset == 0
 
     @staticmethod
     @pytest.mark.filterwarnings("ignore:.*is_sys_guard:DeprecationWarning")