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

Fix round-tripping of nested functions (#4875)

Browse source
This commit is contained in:
Charlie Marsh 2023-06-05 16:13:08 -04:00 • committed by GitHub
parent 913b9d1fcf
commit d1b8fe6af2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

60
crates/ruff_python_ast/src/source_code/generator.rs
View file

@ -209,14 +209,13 @@ impl<'a> Generator<'a> {
.. ..
}) => { }) => {
self.newlines(if self.indent_depth == 0 { 2 } else { 1 }); self.newlines(if self.indent_depth == 0 { 2 } else { 1 });
for decorator in decorator_list {
statement!({
self.p("@");
self.unparse_expr(decorator, precedence::MAX);
});
}
statement!({ statement!({
for decorator in decorator_list {
statement!({
self.p("@");
self.unparse_expr(decorator, precedence::MAX);
});
}
self.newline();
self.p("def "); self.p("def ");
self.p_id(name); self.p_id(name);
self.p("("); self.p("(");
@ -242,13 +241,13 @@ impl<'a> Generator<'a> {
.. ..
}) => { }) => {
self.newlines(if self.indent_depth == 0 { 2 } else { 1 }); self.newlines(if self.indent_depth == 0 { 2 } else { 1 });
for decorator in decorator_list {
statement!({
self.p("@");
self.unparse_expr(decorator, precedence::MAX);
});
}
statement!({ statement!({
for decorator in decorator_list {
statement!({
self.unparse_expr(decorator, precedence::MAX);
});
}
self.newline();
self.p("async def "); self.p("async def ");
self.p_id(name); self.p_id(name);
self.p("("); self.p("(");
@ -274,13 +273,13 @@ impl<'a> Generator<'a> {
range: _range, range: _range,
}) => { }) => {
self.newlines(if self.indent_depth == 0 { 2 } else { 1 }); self.newlines(if self.indent_depth == 0 { 2 } else { 1 });
for decorator in decorator_list {
statement!({
self.p("@");
self.unparse_expr(decorator, precedence::MAX);
});
}
statement!({ statement!({
for decorator in decorator_list {
statement!({
self.unparse_expr(decorator, precedence::MAX);
});
}
self.newline();
self.p("class "); self.p("class ");
self.p_id(name); self.p_id(name);
let mut first = true; let mut first = true;
@ -1614,6 +1613,29 @@ except* Exception as e:
); );
assert_eq!(round_trip(r#"x = (1, 2, 3)"#), r#"x = 1, 2, 3"#); assert_eq!(round_trip(r#"x = (1, 2, 3)"#), r#"x = 1, 2, 3"#);
assert_eq!(round_trip(r#"-(1) + ~(2) + +(3)"#), r#"-1 + ~2 + +3"#); assert_eq!(round_trip(r#"-(1) + ~(2) + +(3)"#), r#"-1 + ~2 + +3"#);
assert_round_trip!(
r#"def f():
def f():
pass"#
);
assert_round_trip!(
r#"@foo
def f():
@foo
def f():
pass"#
);
assert_round_trip!(
r#"@foo
class Foo:
@foo
def f():
pass"#
);
} }
#[test] #[test]