Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use preceded_by_continuations

This commit is contained in:
Charlie Marsh 2023-06-19 22:06:45 -04:00
parent 1e36145972
commit 2abdc2540a
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ruff/src/checkers/physical_lines.rs
View File

@ -57,8 +57,6 @@ 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))
@ -147,7 +145,7 @@ pub(crate) fn check_physical_lines(
}
if enforce_trailing_whitespace || enforce_blank_line_contains_whitespace {
if let Some(diagnostic) = trailing_whitespace(&line, &prev_line, settings) {
if let Some(diagnostic) = trailing_whitespace(&line, locator, indexer, settings) {
diagnostics.push(diagnostic);
}
}
@ -157,8 +155,6 @@ pub(crate) fn check_physical_lines(
diagnostics.push(diagnostic);
}
}
prev_line = Some(line);
}
if enforce_no_newline_at_end_of_file {

29
crates/ruff/src/rules/pycodestyle/rules/trailing_whitespace.rs
View File

@ -2,6 +2,8 @@ use ruff_text_size::{TextLen, TextRange, TextSize};
use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
use ruff_macros::{derive_message_formats, violation};
use ruff_python_ast::helpers;
use ruff_python_ast::source_code::{Indexer, Locator};
use ruff_python_whitespace::Line;
use crate::registry::Rule;
@ -74,7 +76,8 @@ impl AlwaysAutofixableViolation for BlankLineWithWhitespace {
/// W291, W293
pub(crate) fn trailing_whitespace(
line: &Line,
prev_line: &Option<Line>,
locator: &Locator,
indexer: &Indexer,
settings: &Settings,
) -> Option<Diagnostic> {
let whitespace_len: TextSize = line
@ -91,20 +94,18 @@ pub(crate) fn trailing_whitespace(
let mut diagnostic = Diagnostic::new(BlankLineWithWhitespace, range);
if settings.rules.should_fix(Rule::BlankLineWithWhitespace) {
// 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),
);
}
// Remove any preceding continuations, to avoid introducing a potential
// syntax error.
if let Some(continuation) =
helpers::preceded_by_continuations(line.start(), locator, indexer)
{
diagnostic.set_fix(Fix::suggested(Edit::range_deletion(TextRange::new(
continuation,
range.end(),
))));
} else {
diagnostic.set_fix(Fix::suggested(Edit::range_deletion(range)));
}
diagnostic.set_fix(Fix::suggested(Edit::range_deletion(diagnostic.range)));
}
return Some(diagnostic);