language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-28 21:05:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Preserve trailing statement semicolons when using fmt: skip (#8273)

Browse source
This commit is contained in:
Micha Reiser 2023-10-30 09:07:14 +09:00 • committed by GitHub
parent e799f90782
commit 2c84f911c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 85 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ruff_python_formatter/src/verbatim.rs
View file

@ -17,6 +17,7 @@ use crate::comments::{leading_comments, trailing_comments, SourceComment};
use crate::prelude::*;
use crate::statement::clause::ClauseHeader;
use crate::statement::suite::SuiteChildStatement;
use crate::statement::trailing_semicolon;
/// Disables formatting for all statements between the `first_suppressed` that has a leading `fmt: off` comment
/// and the first trailing or leading `fmt: on` comment. The statements are formatted as they appear in the source code.
@ -902,6 +903,15 @@ impl Format<PyFormatContext<'_>> for FormatSuppressedNode<'_> {
}
}
// Some statements may end with a semicolon. Preserve the semicolon
let semicolon_range = self
.node
.is_statement()
.then(|| trailing_semicolon(self.node, f.context().source()))
.flatten();
let verbatim_range = semicolon_range.map_or(self.node.range(), |semicolon| {
TextRange::new(self.node.start(), semicolon.end())
});
comments.mark_verbatim_node_comments_formatted(self.node);
// Write the outer comments and format the node as verbatim
@ -909,7 +919,7 @@ impl Format<PyFormatContext<'_>> for FormatSuppressedNode<'_> {
f,
[
leading_comments(node_comments.leading),
verbatim_text(self.node),
verbatim_text(verbatim_range),
trailing_comments(node_comments.trailing)
]
)