Use correct start location for class/function clause header

astral-sh · Oct 4, 2023 · 26fb68e · 26fb68e
1 parent 37d21c0
commit 26fb68e
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/crates/ruff_python_formatter/src/statement/clause.rs b/crates/ruff_python_formatter/src/statement/clause.rs
@@ -203,15 +203,23 @@ impl<'a> ClauseHeader<'a> {
     fn first_keyword_range(self, source: &str) -> FormatResult<TextRange> {
         match self {
             ClauseHeader::Class(header) => {
-                find_keyword(header.start(), SimpleTokenKind::Class, source)
+                let start_position = header
+                    .decorator_list
+                    .last()
+                    .map_or_else(|| header.start(), |decorator| decorator.end());
+                find_keyword(start_position, SimpleTokenKind::Class, source)
             }
             ClauseHeader::Function(header) => {
+                let start_position = header
+                    .decorator_list
+                    .last()
+                    .map_or_else(|| header.start(), |decorator| decorator.end());
                 let keyword = if header.is_async {
                     SimpleTokenKind::Async
                 } else {
                     SimpleTokenKind::Def
                 };
-                find_keyword(header.start(), keyword, source)
+                find_keyword(start_position, keyword, source)
             }
             ClauseHeader::If(header) => find_keyword(header.start(), SimpleTokenKind::If, source),
             ClauseHeader::ElifElse(ElifElseClause {