Refactor, add more tests

crates/ruff_linter/resources/test/fixtures/ruff/RUF047_for.py

@@ -16,18 +16,29 @@
 # `else`
 else:
     pass
-    ...
 
 
 for _and in so:
     does()
 # this
 else:
-    ...
     pass
 
 
 for of in course():
     this()
 else:
     ...  # too
+
+
+for of in course():
+    this()
+else:
+    ...
+    # too
+
+for of in course():
+    this()
+else:
+    ...
+# this comment does not belong to the else

crates/ruff_linter/resources/test/fixtures/ruff/RUF047_if.py

@@ -20,21 +20,41 @@
 
 if this_second_comment():
     belongs()  # to
-# `else`
+    # `else`
 else:
     pass
-    ...
 
 
-if and_so():
-    does()
-# this
+if this_second_comment():
+    belongs()  # to
+# `else`
 else:
-    ...
     pass
 
-
 if of_course():
     this()
 else:
     ...  # too
+
+if of_course():
+    this()
+else:
+    ...
+    # comment
+
+if of_course():
+    this()
+else:
+    ...
+# this comment doesn't belong to the if
+
+if of_course: this()
+else: ...
+
+if of_course:
+    this() # comment
+else: ...
+
+if of_course:
+    this() # comment
+else: ...  # trailing

crates/ruff_linter/resources/test/fixtures/ruff/RUF047_try.py

@@ -23,7 +23,6 @@
 # `else`
 else:
     pass
-    ...
 
 
 try:
@@ -33,7 +32,6 @@
 # this
 else:
     ...
-    pass
 
 
 try:
@@ -42,3 +40,32 @@
     this()
 else:
     ...  # too
+
+try:
+    of_course()
+except:
+    this()
+else:
+    ...
+    # This comment belongs to else
+finally:
+    pass
+
+try:
+    of_course()
+except:
+    this()
+else:
+    ...
+# This comment belongs to finally
+finally:
+    pass
+
+
+try:
+    of_course()
+except:
+    this()
+else:
+    ...
+# This comment belongs to the statement coming after the else

crates/ruff_linter/resources/test/fixtures/ruff/RUF047_while.py

@@ -16,18 +16,29 @@
 # `else`
 else:
     pass
-    ...
 
 
 while and_so:
     does()
 # this
 else:
     ...
-    pass
 
 
 while of_course():
     this()
 else:
     ...  # too
+
+while of_course():
+    this()
+else:
+    ...
+    # this comment belongs to the else
+
+while of_course():
+    this()
+else:
+    ...
+# this comment belongs to the statement coming after the else
+

crates/ruff_linter/src/checkers/ast/analyze/statement.rs

@@ -1239,7 +1239,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 ruff::rules::if_key_in_dict_del(checker, if_);
             }
             if checker.enabled(Rule::NeedlessElse) {
-                ruff::rules::needless_else(checker, stmt);
+                ruff::rules::needless_else(checker, if_.into());
             }
         }
         Stmt::Assert(
@@ -1348,7 +1348,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 flake8_async::rules::async_busy_wait(checker, while_stmt);
             }
             if checker.enabled(Rule::NeedlessElse) {
-                ruff::rules::needless_else(checker, stmt);
+                ruff::rules::needless_else(checker, while_stmt.into());
             }
         }
         Stmt::For(
@@ -1437,16 +1437,18 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
             }
             if checker.enabled(Rule::NeedlessElse) {
-                ruff::rules::needless_else(checker, stmt);
+                ruff::rules::needless_else(checker, for_stmt.into());
             }
         }
-        Stmt::Try(ast::StmtTry {
-            body,
-            handlers,
-            orelse,
-            finalbody,
-            ..
-        }) => {
+        Stmt::Try(
+            try_stmt @ ast::StmtTry {
+                body,
+                handlers,
+                orelse,
+                finalbody,
+                ..
+            },
+        ) => {
             if checker.enabled(Rule::TooManyNestedBlocks) {
                 pylint::rules::too_many_nested_blocks(checker, stmt);
             }
@@ -1514,7 +1516,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 tryceratops::rules::error_instead_of_exception(checker, handlers);
             }
             if checker.enabled(Rule::NeedlessElse) {
-                ruff::rules::needless_else(checker, stmt);
+                ruff::rules::needless_else(checker, try_stmt.into());
             }
         }
         Stmt::Assign(assign @ ast::StmtAssign { targets, value, .. }) => {

crates/ruff_linter/src/rules/pylint/rules/useless_else_on_loop.rs

@@ -73,8 +73,7 @@ pub(crate) fn useless_else_on_loop(
         return;
     }
 
-    let else_range =
-        identifier::else_loop(stmt, checker.locator().contents()).expect("else clause");
+    let else_range = identifier::else_(stmt, checker.locator().contents()).expect("else clause");
 
     let mut diagnostic = Diagnostic::new(UselessElseOnLoop, else_range);
     diagnostic.try_set_fix(|| {