Fix decorator + async false positive.

This also move the trigger on an async def from the def to the async.
astral-sh · Nov 18, 2023 · 14b784c · 14b784c
1 parent b667c5c
commit 14b784c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E30.py b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E30.py
@@ -320,6 +320,13 @@ def function():
 # end
 
 
+# no error
+@decorator
+async def function(data: None) -> None:
+    ...
+# end
+
+
 # E301
 class Class(object):
 

diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/blank_lines.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/blank_lines.rs
@@ -442,7 +442,7 @@ pub(crate) fn blank_lines(
                 locator.line_start(token.range.start()),
             )));
             context.push_diagnostic(diagnostic);
-        } else if matches!(token.kind(), TokenKind::Def | TokenKind::Class | TokenKind::At)
+        } else if matches!(token.kind(), TokenKind::Def | TokenKind::Class | TokenKind::At | TokenKind::Async)
             && !(
                 // Allow decorators.
                 tracked_vars.follows_decorator
@@ -579,7 +579,7 @@ pub(crate) fn blank_lines(
                 tracked_vars.follows_def = false;
                 break;
             }
-            TokenKind::Def => {
+            TokenKind::Def | TokenKind::Async => {
                 if !tracked_vars.is_in_fn {
                     tracked_vars.fn_indent_level = indent_level + indent_size;
                 }
@@ -588,10 +588,6 @@ pub(crate) fn blank_lines(
                 tracked_vars.follows_decorator = false;
                 break;
             }
-            TokenKind::Async => {
-                tracked_vars.follows_decorator = false;
-                tracked_vars.follows_def = false;
-            }
             TokenKind::Comment => {
                 break;
             }