Avoid emitting empty logical lines

astral-sh · May 16, 2023 · be8161c · be8161c
1 parent f0465bf
commit be8161c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 5 deletions.
diff --git a/crates/ruff/resources/test/fixtures/pycodestyle/E11.py b/crates/ruff/resources/test/fixtures/pycodestyle/E11.py
@@ -49,3 +49,18 @@ def start():
 #:
 if False:  #
     print()
+#:
+if False:
+    print()
+
+    print()
+#:
+if False:
+    print()
+    if False:
+
+        print()
+#:
+if False:
+
+    print()
diff --git a/crates/ruff/src/checkers/logical_lines.rs b/crates/ruff/src/checkers/logical_lines.rs
@@ -250,5 +250,20 @@ f()"#
             "f()",
         ];
         assert_eq!(actual, expected);
+
+        let contents = r#"
+if False:
+
+    print()
+"#
+        .trim();
+        let lxr: Vec<LexResult> = lexer::lex(contents, Mode::Module).collect();
+        let locator = Locator::new(contents);
+        let actual: Vec<String> = LogicalLines::from_tokens(&lxr, &locator)
+            .into_iter()
+            .map(|line| line.text_trimmed().to_string())
+            .collect();
+        let expected = vec!["if False:", "print()", ""];
+        assert_eq!(actual, expected);
     }
 }
diff --git a/crates/ruff/src/rules/pycodestyle/rules/logical_lines/mod.rs b/crates/ruff/src/rules/pycodestyle/rules/logical_lines/mod.rs
@@ -432,6 +432,7 @@ impl Whitespace {
 struct CurrentLine {
     flags: TokenFlags,
     tokens_start: u32,
+    non_empty: bool,
 }
 
 /// Builder for [`LogicalLines`]
@@ -455,6 +456,10 @@ impl LogicalLinesBuilder {
     fn push_token(&mut self, kind: TokenKind, range: TextRange) {
         let line = &mut self.current_line;
 
+        if !matches!(kind, TokenKind::NonLogicalNewline) {
+            line.non_empty = true;
+        }
+
         if matches!(kind, TokenKind::Comment) {
             line.flags.insert(TokenFlags::COMMENT);
         } else if kind.is_operator() {
@@ -500,15 +505,18 @@ impl LogicalLinesBuilder {
     fn finish_line(&mut self) {
         let end = self.tokens.len() as u32;
         if self.current_line.tokens_start < end {
-            self.lines.push(Line {
-                flags: self.current_line.flags,
-                tokens_start: self.current_line.tokens_start,
-                tokens_end: end,
-            });
+            if self.current_line.non_empty {
+                self.lines.push(Line {
+                    flags: self.current_line.flags,
+                    tokens_start: self.current_line.tokens_start,
+                    tokens_end: end,
+                });
+            }
 
             self.current_line = CurrentLine {
                 flags: TokenFlags::default(),
                 tokens_start: end,
+                non_empty: false,
             }
         }
     }