Avoid panic when fixing inlined else blocks

crates/ruff_linter/resources/test/fixtures/flake8_return/RET505.py

@@ -162,6 +162,20 @@ def bar7():
         :  # comment
         pass
 
+
+def bar8():
+    if True:
+        return
+    else: pass
+
+
+def bar9():
+    if True:
+        return
+    else:\
+        pass
+
+
 x = 0
 
 if x == 1:

crates/ruff_linter/src/rules/flake8_return/rules/function.rs

@@ -756,9 +756,7 @@ pub(crate) fn function(checker: &mut Checker, body: &[Stmt], returns: Option<&Ex
 
 fn remove_else(checker: &mut Checker, elif_else: &ElifElseClause) -> Result<Fix> {
     if elif_else.test.is_some() {
-        // it's an elif, so we can just make it an if
-
-        // delete "el" from "elif"
+        // Ex) `elif` -> `if`
         Ok(Fix::safe_edit(Edit::deletion(
             elif_else.start(),
             elif_else.start() + TextSize::from(2),
@@ -783,6 +781,21 @@ fn remove_else(checker: &mut Checker, elif_else: &ElifElseClause) -> Result<Fix>
             return Err(anyhow::anyhow!("Compound statement cannot be inlined"));
         };
 
+        // If the statement is on the same line as the `else`, just remove the `else: `.
+        // Ex) `else: return True` -> `return True`
+        let Some(first) = elif_else.body.first() else {
+            return Err(anyhow::anyhow!("`else` statement has no body"));
+        };
+        if checker
+            .indexer()
+            .in_multi_statement_line(first, checker.locator())
+        {
+            return Ok(Fix::safe_edit(Edit::deletion(
+                elif_else.start(),
+                first.start(),
+            )));
+        }
+
         // we're deleting the `else`, and it's Colon, and the rest of the line(s) they're on,
         // so here we get the last position of the line the Colon is on
         let else_colon_end = checker.locator().full_line_end(else_colon.end());

crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET505_RET505.py.snap

@@ -132,4 +132,23 @@ RET505.py:161:5: RET505 Unnecessary `else` after `return` statement
     |
     = help: Remove unnecessary `else`
 
+RET505.py:169:5: RET505 Unnecessary `else` after `return` statement
+    |
+167 |     if True:
+168 |         return
+169 |     else: pass
+    |     ^^^^ RET505
+    |
+    = help: Remove unnecessary `else`
+
+RET505.py:175:5: RET505 Unnecessary `else` after `return` statement
+    |
+173 |     if True:
+174 |         return
+175 |     else:\
+    |     ^^^^ RET505
+176 |         pass
+    |
+    = help: Remove unnecessary `else`
+
 

crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__preview__RET505_RET505.py.snap

@@ -276,7 +276,47 @@ RET505.py:161:5: RET505 [*] Unnecessary `else` after `return` statement
     161 |+    # comment
     162 |+    pass
 164 163 | 
-165 164 | x = 0
-166 165 | 
+165 164 | 
+166 165 | def bar8():
+
+RET505.py:169:5: RET505 [*] Unnecessary `else` after `return` statement
+    |
+167 |     if True:
+168 |         return
+169 |     else: pass
+    |     ^^^^ RET505
+    |
+    = help: Remove unnecessary `else`
+
+ℹ Safe fix
+166 166 | def bar8():
+167 167 |     if True:
+168 168 |         return
+169     |-    else: pass
+    169 |+    pass
+170 170 | 
+171 171 | 
+172 172 | def bar9():
+
+RET505.py:175:5: RET505 [*] Unnecessary `else` after `return` statement
+    |
+173 |     if True:
+174 |         return
+175 |     else:\
+    |     ^^^^ RET505
+176 |         pass
+    |
+    = help: Remove unnecessary `else`
+
+ℹ Safe fix
+172 172 | def bar9():
+173 173 |     if True:
+174 174 |         return
+175     |-    else:\
+176     |-        pass
+    175 |+    pass
+177 176 | 
+178 177 | 
+179 178 | x = 0