mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-03 15:14:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid attempting to fix invalid Optional annotations (#7079)

Browse source
This commit is contained in:
Charlie Marsh 2023-09-03 14:23:36 +01:00 • committed by GitHub
parent 4eaa412370
commit b70dde4a77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ruff/resources/test/fixtures/pyupgrade/UP007.py vendored
View file

@ -91,3 +91,7 @@ def f(x: Optional[int : float]) -> None:
def f(x: Optional[str, int : float]) -> None: def f(x: Optional[str, int : float]) -> None:
... ...
def f(x: Optional[int, float]) -> None:
...

15
crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs
View file

@ -77,10 +77,17 @@ pub(crate) fn use_pep604_annotation(
Pep604Operator::Optional => { Pep604Operator::Optional => {
let mut diagnostic = Diagnostic::new(NonPEP604Annotation, expr.range()); let mut diagnostic = Diagnostic::new(NonPEP604Annotation, expr.range());
if fixable && checker.patch(diagnostic.kind.rule()) { if fixable && checker.patch(diagnostic.kind.rule()) {
diagnostic.set_fix(Fix::suggested(Edit::range_replacement( match slice {
optional(slice, checker.locator()), Expr::Tuple(_) => {
expr.range(), // Invalid type annotation.
))); }
_ => {
diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
optional(slice, checker.locator()),
expr.range(),
)));
}
}
} }
checker.diagnostics.push(diagnostic); checker.diagnostics.push(diagnostic);
} }

8
crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP007.py.snap
View file

@ -361,4 +361,12 @@ UP007.py:92:10: UP007 Use `X | Y` for type annotations
| |
= help: Convert to `X | Y` = help: Convert to `X | Y`
UP007.py:96:10: UP007 Use `X | Y` for type annotations
|
96 | def f(x: Optional[int, float]) -> None:
| ^^^^^^^^^^^^^^^^^^^^ UP007
97 | ...
|
= help: Convert to `X | Y`