mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-07-23 13:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Support fmt: skip for simple-statements and decorators (#6561)

Browse source
This commit is contained in:
Micha Reiser 2023-08-17 07:58:19 +02:00 • committed by GitHub
parent e3ecbe660e
commit 4dc32a00d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 545 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

54
crates/ruff_python_formatter/src/lib.rs
View file

@ -19,6 +19,7 @@ use crate::comments::{
};
use crate::context::PyFormatContext;
pub use crate::options::{MagicTrailingComma, PyFormatOptions, QuoteStyle};
use crate::verbatim::suppressed_node;
pub(crate) mod builders;
pub mod cli;
@ -50,24 +51,21 @@ where
let node_comments = comments.leading_dangling_trailing_comments(node.as_any_node_ref());
write!(
f,
[
leading_comments(node_comments.leading),
source_position(node.start())
]
)?;
if self.is_suppressed(node_comments.trailing, f.context()) {
suppressed_node(node.as_any_node_ref()).fmt(f)
} else {
leading_comments(node_comments.leading).fmt(f)?;
self.fmt_fields(node, f)?;
self.fmt_dangling_comments(node_comments.dangling, f)?;
self.fmt_fields(node, f)?;
self.fmt_dangling_comments(node_comments.dangling, f)?;
write!(
f,
[
source_position(node.end()),
trailing_comments(node_comments.trailing)
]
)
write!(
f,
[
source_position(node.end()),
trailing_comments(node_comments.trailing)
]
)
}
}
/// Formats the node's fields.
@ -87,6 +85,14 @@ where
) -> FormatResult<()> {
dangling_comments(dangling_node_comments).fmt(f)
}
fn is_suppressed(
&self,
_trailing_comments: &[SourceComment],
_context: &PyFormatContext,
) -> bool {
false
}
}
#[derive(Error, Debug)]
@ -236,16 +242,12 @@ if True:
#[ignore]
#[test]
fn quick_test() {
let src = r#"def test():
# fmt: off
let src = r#"
@MyDecorator(list = a) # fmt: skip
# trailing comment
class Test:
pass
a + b
# suppressed comments
a + b # formatted
"#;
// Tokenize once