Fix corner case involving terminal backslash after fixing W293

crates/ruff/src/checkers/physical_lines.rs

@@ -1,11 +1,10 @@
 //! Lint rules based on checking physical lines.
-
 use ruff_text_size::TextSize;
 use std::path::Path;
 
 use ruff_diagnostics::Diagnostic;
 use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
-use ruff_python_whitespace::UniversalNewlines;
+use ruff_python_whitespace::{Line, UniversalNewlines};
 
 use crate::registry::Rule;
 use crate::rules::copyright::rules::missing_copyright_notice;
@@ -58,6 +57,8 @@ pub(crate) fn check_physical_lines(
     let mut commented_lines_iter = indexer.comment_ranges().iter().peekable();
     let mut doc_lines_iter = doc_lines.iter().peekable();
 
+    let mut prev_line: Option<Line> = None;
+
     for (index, line) in locator.contents().universal_newlines().enumerate() {
         while commented_lines_iter
             .next_if(|comment_range| line.range().contains_range(**comment_range))
@@ -146,7 +147,7 @@ pub(crate) fn check_physical_lines(
         }
 
         if enforce_trailing_whitespace || enforce_blank_line_contains_whitespace {
-            if let Some(diagnostic) = trailing_whitespace(&line, settings) {
+            if let Some(diagnostic) = trailing_whitespace(&line, &prev_line, settings) {
                 diagnostics.push(diagnostic);
             }
         }
@@ -156,6 +157,8 @@ pub(crate) fn check_physical_lines(
                 diagnostics.push(diagnostic);
             }
         }
+
+        prev_line = Some(line);
     }
 
     if enforce_no_newline_at_end_of_file {

crates/ruff/src/rules/pycodestyle/rules/trailing_whitespace.rs

@@ -72,7 +72,11 @@ impl AlwaysAutofixableViolation for BlankLineWithWhitespace {
 }
 
 /// W291, W293
-pub(crate) fn trailing_whitespace(line: &Line, settings: &Settings) -> Option<Diagnostic> {
+pub(crate) fn trailing_whitespace(
+    line: &Line,
+    prev_line: &Option<Line>,
+    settings: &Settings,
+) -> Option<Diagnostic> {
     let whitespace_len: TextSize = line
         .chars()
         .rev()
@@ -85,17 +89,30 @@ pub(crate) fn trailing_whitespace(line: &Line, settings: &Settings) -> Option<Di
         if range == line.range() {
             if settings.rules.enabled(Rule::BlankLineWithWhitespace) {
                 let mut diagnostic = Diagnostic::new(BlankLineWithWhitespace, range);
+
                 if settings.rules.should_fix(Rule::BlankLineWithWhitespace) {
-                    #[allow(deprecated)]
-                    diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(range)));
+                    // If this line is blank with whitespace, we have to ensure that the previous line
+                    // doesn't end with a backslash. If it did, the file would end with a backslash
+                    // and therefore have an "unexpected EOF" SyntaxError, so we have to remove it.
+                    if let Some(prev) = prev_line {
+                        let trimmed = prev.trim_end();
+                        if trimmed.ends_with('\\') {
+                            // Shift the diagnostic to remove the continuation as well.
+                            diagnostic.range = range.sub_start(
+                                (prev.text_len() - trimmed.text_len()) + TextSize::from(2),
+                            );
+                        }
+                    }
+
+                    diagnostic.set_fix(Fix::suggested(Edit::range_deletion(diagnostic.range)));
                 }
+
                 return Some(diagnostic);
             }
         } else if settings.rules.enabled(Rule::TrailingWhitespace) {
             let mut diagnostic = Diagnostic::new(TrailingWhitespace, range);
             if settings.rules.should_fix(Rule::TrailingWhitespace) {
-                #[allow(deprecated)]
-                diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(range)));
+                diagnostic.set_fix(Fix::automatic(Edit::range_deletion(range)));
             }
             return Some(diagnostic);
         }

crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__W291_W29.py.snap

@@ -12,7 +12,7 @@ W29.py:4:6: W291 [*] Trailing whitespace
   |
   = help: Remove trailing whitespace
 
-ℹ Suggested fix
+ℹ Fix
 1 1 | #: Okay
 2 2 | # 情
 3 3 | #: W291:1:6
@@ -33,7 +33,7 @@ W29.py:11:35: W291 [*] Trailing whitespace
    |
    = help: Remove trailing whitespace
 
-ℹ Suggested fix
+ℹ Fix
 8  8  |     bang = 12
 9  9  | #: W291:2:35
 10 10 | '''multiline
@@ -54,7 +54,7 @@ W29.py:13:6: W291 [*] Trailing whitespace
    |
    = help: Remove trailing whitespace
 
-ℹ Suggested fix
+ℹ Fix
 10 10 | '''multiline
 11 11 | string with trailing whitespace'''   
 12 12 | #: W291 W292 noeol