mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-26 11:59:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix allowed-ellipsis detection (#5174)

Browse source 
## Summary

We weren't resetting the `allow_ellipsis` flag properly, which
ultimately caused us to treat the semicolon as "unnecessary" rather than
"creating a multi-statement line".

Closes #5154.
This commit is contained in:
Charlie Marsh 2023-06-19 00:19:41 -04:00 • committed by GitHub
parent 2b82caa163
commit be11cae619
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/ruff/resources/test/fixtures/pycodestyle/E70.py vendored
View file

@ -60,3 +60,6 @@ match *0, 1, *2:
#:
class Foo:
match: Optional[Match] = None
#: E702:2:4
while 1:
1;...

14
crates/ruff/src/rules/pycodestyle/rules/compound_statements.rs
View file

@ -145,6 +145,12 @@ pub(crate) fn compound_statements(lxr: &[LexResult], settings: &Settings) -> Vec
Tok::Rbrace => {
brace_count = brace_count.saturating_sub(1);
}
Tok::Ellipsis => {
if allow_ellipsis {
allow_ellipsis = false;
continue;
}
}
_ => {}
}
@ -195,17 +201,15 @@ pub(crate) fn compound_statements(lxr: &[LexResult], settings: &Settings) -> Vec
|| with.is_some()
{
colon = Some((range.start(), range.end()));
allow_ellipsis = true;
// Allow `class C: ...`-style definitions in stubs.
allow_ellipsis = class.is_some();
}
}
Tok::Semi => {
semi = Some((range.start(), range.end()));
}
Tok::Comment(..) | Tok::Indent | Tok::Dedent | Tok::NonLogicalNewline => {}
Tok::Ellipsis if allow_ellipsis => {
// Allow `class C: ...`-style definitions in stubs.
allow_ellipsis = false;
}
_ => {
if let Some((start, end)) = semi {
diagnostics.push(Diagnostic::new(

8
crates/ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__E702_E70.py.snap
View file

@ -61,4 +61,12 @@ E70.py:56:13: E702 Multiple statements on one line (semicolon)
58 | match *0, 1, *2:
|
E70.py:65:4: E702 Multiple statements on one line (semicolon)
|
63 | #: E702:2:4
64 | while 1:
65 | 1;...
| ^ E702
|