Skip to content

Fix infinite loop due to rules D207 & W605 #3609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charliermarsh merged 3 commits into from
Mar 19, 2023
+20 −17
Merged

Fix infinite loop due to rules D207 & W605 #3609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
210db9c
Fix infinite loop due to rules D207 & W605
vlindhol Mar 18, 2023
04a29bb
PR review
vlindhol Mar 19, 2023
a062a03
PR review 2
vlindhol Mar 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion crates/ruff/src/rules/pycodestyle/rules/invalid_escape_sequence.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,10 @@ pub fn invalid_escape_sequence(
Range::new(location, end_location),
);
if autofix {
diagnostic.amend(Fix::insertion(r"\".to_string(), location));
diagnostic.amend(Fix::insertion(
r"\".to_string(),
Location::new(location.row(), location.column() + 1),
));
}
diagnostics.push(diagnostic);
}
Expand Down
16 changes: 8 additions & 8 deletions ...ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__W605_W605_0.py.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ expression: diagnostics
content: "\\"
location:
row: 2
column: 9
column: 10
end_location:
row: 2
column: 9
column: 10
parent: ~
- kind:
name: InvalidEscapeSequence
Expand All @@ -37,10 +37,10 @@ expression: diagnostics
content: "\\"
location:
row: 6
column: 0
column: 1
end_location:
row: 6
column: 0
column: 1
parent: ~
- kind:
name: InvalidEscapeSequence
Expand All @@ -57,10 +57,10 @@ expression: diagnostics
content: "\\"
location:
row: 11
column: 5
column: 6
end_location:
row: 11
column: 5
column: 6
parent: ~
- kind:
name: InvalidEscapeSequence
Expand All @@ -77,9 +77,9 @@ expression: diagnostics
content: "\\"
location:
row: 18
column: 5
column: 6
end_location:
row: 18
column: 5
column: 6
parent: ~

16 changes: 8 additions & 8 deletions ...ruff/src/rules/pycodestyle/snapshots/ruff__rules__pycodestyle__tests__W605_W605_1.py.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ expression: diagnostics
content: "\\"
location:
row: 2
column: 9
column: 10
end_location:
row: 2
column: 9
column: 10
parent: ~
- kind:
name: InvalidEscapeSequence
Expand All @@ -37,10 +37,10 @@ expression: diagnostics
content: "\\"
location:
row: 6
column: 0
column: 1
end_location:
row: 6
column: 0
column: 1
parent: ~
- kind:
name: InvalidEscapeSequence
Expand All @@ -57,10 +57,10 @@ expression: diagnostics
content: "\\"
location:
row: 11
column: 5
column: 6
end_location:
row: 11
column: 5
column: 6
parent: ~
- kind:
name: InvalidEscapeSequence
Expand All @@ -77,9 +77,9 @@ expression: diagnostics
content: "\\"
location:
row: 18
column: 5
column: 6
end_location:
row: 18
column: 5
column: 6
parent: ~