Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion crates/ruff_linter/resources/test/fixtures/ruff/RUF020.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,16 @@ def func() -> (
Never # text
| # text
int
): ...
): ...


# Regression test for https://github.com/astral-sh/ruff/issues/23207
# Multi-line single-remaining-element Union should be wrapped in parentheses
from typing import Literal

x: Union[
Never,
Literal["LongLiteralNumberOne"]
| Literal["LongLiteralNumberTwo"]
| Literal["LongLiteralNumberThree"]
]
8 changes: 7 additions & 1 deletion crates/ruff_linter/src/rules/ruff/rules/never_union.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use ruff_diagnostics::Applicability;
use ruff_macros::{ViolationMetadata, derive_message_formats};
use ruff_python_ast::{self as ast, Expr, ExprBinOp, Operator};
use ruff_python_semantic::{SemanticModel, analyze::typing::traverse_union};
use ruff_source_file::LineRanges;
use ruff_text_size::{Ranged, TextRange};

use crate::checkers::ast::Checker;
Expand Down Expand Up @@ -172,7 +173,12 @@ pub(crate) fn never_union(checker: &Checker, expr: &Expr) {
Edit::range_replacement(
if let [only] = rest.as_slice() {
// Ex) `typing.Union[typing.NoReturn, int]` -> `int`
checker.locator().slice(only).to_string()
let inner = checker.locator().slice(only);
if checker.locator().contains_line_break(only.range()) {
format!("({inner})")
} else {
inner.to_string()
}
} else {
// Ex) `typing.Union[typing.NoReturn, int, str]` -> `typing.Union[int, str]`
checker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,4 +215,27 @@ help: Remove `Never`
- | # text
21 | int
22 | ): ...
23 |
note: This is an unsafe fix and may change runtime behavior

RUF020 [*] `Union[Never, T]` is equivalent to `T`
--> RUF020.py:32:5
|
31 | x: Union[
32 | Never,
| ^^^^^
33 | Literal["LongLiteralNumberOne"]
34 | | Literal["LongLiteralNumberTwo"]
|
help: Remove `Never`
28 | # Multi-line single-remaining-element Union should be wrapped in parentheses
29 | from typing import Literal
30 |
- x: Union[
- Never,
- Literal["LongLiteralNumberOne"]
31 + x: (Literal["LongLiteralNumberOne"]
32 | | Literal["LongLiteralNumberTwo"]
- | Literal["LongLiteralNumberThree"]
- ]
33 + | Literal["LongLiteralNumberThree"])