Skip to content

Commit 18397f3

Browse files
dcreagerdcreager
committed
Merge branch 'main' into dcreager/alist-type
* main: [red-knot] Switch to a handwritten parser for mdtest error assertions (#16422) [red-knot] Disallow more invalid type expressions (#16427) Bump version to Ruff 0.9.9 (#16434) Check `LinterSettings::preview` for version-related syntax errors (#16429) Avoid caching files with unsupported syntax errors (#16425) Prioritize "bug" label for changelog sections (#16433) [`flake8-copyright`] Add links to applicable options (`CPY001`) (#16421) Fix string-length limit in documentation for PYI054 (#16432) Show version-related syntax errors in the playground (#16419) Allow passing `ParseOptions` to inline tests (#16357) Bump version to 0.9.8 (#16414) [red-knot] Ignore surrounding whitespace when looking for `<!-- snapshot-diagnostics -->` directives in mdtests (#16380) Notify users for invalid client settings (#16361) Avoid indexing the project if `configurationPreference` is `editorOnly` (#16381)
2 parents 29cdd6e + 0c7c001 commit 18397f3

File tree

34 files changed

+1247
-204
lines changed

34 files changed

+1247
-204
lines changed

‎CHANGELOG.md

+46
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,51 @@
11
# Changelog
22

3+
## 0.9.9
4+
5+
### Preview features
6+
7+
- Fix caching of unsupported-syntax errors ([#16425](https://github.com/astral-sh/ruff/pull/16425))
8+
9+
### Bug fixes
10+
11+
- Only show unsupported-syntax errors in editors when preview mode is enabled ([#16429](https://github.com/astral-sh/ruff/pull/16429))
12+
13+
## 0.9.8
14+
15+
### Preview features
16+
17+
- Start detecting version-related syntax errors in the parser ([#16090](https://github.com/astral-sh/ruff/pull/16090))
18+
19+
### Rule changes
20+
21+
- \[`pylint`\] Mark fix unsafe (`PLW1507`) ([#16343](https://github.com/astral-sh/ruff/pull/16343))
22+
- \[`pylint`\] Catch `case np.nan`/`case math.nan` in `match` statements (`PLW0177`) ([#16378](https://github.com/astral-sh/ruff/pull/16378))
23+
- \[`ruff`\] Add more Pydantic models variants to the list of default copy semantics (`RUF012`) ([#16291](https://github.com/astral-sh/ruff/pull/16291))
24+
25+
### Server
26+
27+
- Avoid indexing the project if `configurationPreference` is `editorOnly` ([#16381](https://github.com/astral-sh/ruff/pull/16381))
28+
- Avoid unnecessary info at non-trace server log level ([#16389](https://github.com/astral-sh/ruff/pull/16389))
29+
- Expand `ruff.configuration` to allow inline config ([#16296](https://github.com/astral-sh/ruff/pull/16296))
30+
- Notify users for invalid client settings ([#16361](https://github.com/astral-sh/ruff/pull/16361))
31+
32+
### Configuration
33+
34+
- Add `per-file-target-version` option ([#16257](https://github.com/astral-sh/ruff/pull/16257))
35+
36+
### Bug fixes
37+
38+
- \[`refurb`\] Do not consider docstring(s) (`FURB156`) ([#16391](https://github.com/astral-sh/ruff/pull/16391))
39+
- \[`flake8-self`\] Ignore attribute accesses on instance-like variables (`SLF001`) ([#16149](https://github.com/astral-sh/ruff/pull/16149))
40+
- \[`pylint`\] Fix false positives, add missing methods, and support positional-only parameters (`PLE0302`) ([#16263](https://github.com/astral-sh/ruff/pull/16263))
41+
- \[`flake8-pyi`\] Mark `PYI030` fix unsafe when comments are deleted ([#16322](https://github.com/astral-sh/ruff/pull/16322))
42+
43+
### Documentation
44+
45+
- Fix example for `S611` ([#16316](https://github.com/astral-sh/ruff/pull/16316))
46+
- Normalize inconsistent markdown headings in docstrings ([#16364](https://github.com/astral-sh/ruff/pull/16364))
47+
- Document MSRV policy ([#16384](https://github.com/astral-sh/ruff/pull/16384))
48+
349
## 0.9.7
450

551
### Preview features

‎Cargo.lock

+6-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
149149
powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"
150150

151151
# For a specific version.
152-
curl -LsSf https://astral.sh/ruff/0.9.7/install.sh | sh
153-
powershell -c "irm https://astral.sh/ruff/0.9.7/install.ps1 | iex"
152+
curl -LsSf https://astral.sh/ruff/0.9.9/install.sh | sh
153+
powershell -c "irm https://astral.sh/ruff/0.9.9/install.ps1 | iex"
154154
```
155155

156156
You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -183,7 +183,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
183183
```yaml
184184
- repo: https://github.com/astral-sh/ruff-pre-commit
185185
# Ruff version.
186-
rev: v0.9.7
186+
rev: v0.9.9
187187
hooks:
188188
# Run the linter.
189189
- id: ruff

‎crates/red_knot_python_semantic/resources/mdtest/annotations/invalid.md

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Tests for invalid types in type expressions
2+
3+
## Invalid types are rejected
4+
5+
Many types are illegal in the context of a type expression:
6+
7+
```py
8+
import typing
9+
from knot_extensions import AlwaysTruthy, AlwaysFalsy
10+
from typing_extensions import Literal, Never
11+
12+
def _(
13+
a: type[int],
14+
b: AlwaysTruthy,
15+
c: AlwaysFalsy,
16+
d: Literal[True],
17+
e: Literal["bar"],
18+
f: Literal[b"foo"],
19+
g: tuple[int, str],
20+
h: Never,
21+
):
22+
def foo(): ...
23+
def invalid(
24+
i: a, # error: [invalid-type-form] "Variable of type `type[int]` is not allowed in a type expression"
25+
j: b, # error: [invalid-type-form]
26+
k: c, # error: [invalid-type-form]
27+
l: d, # error: [invalid-type-form]
28+
m: e, # error: [invalid-type-form]
29+
n: f, # error: [invalid-type-form]
30+
o: g, # error: [invalid-type-form]
31+
p: h, # error: [invalid-type-form]
32+
q: typing, # error: [invalid-type-form]
33+
r: foo, # error: [invalid-type-form]
34+
):
35+
reveal_type(i) # revealed: Unknown
36+
reveal_type(j) # revealed: Unknown
37+
reveal_type(k) # revealed: Unknown
38+
reveal_type(l) # revealed: Unknown
39+
reveal_type(m) # revealed: Unknown
40+
reveal_type(n) # revealed: Unknown
41+
reveal_type(o) # revealed: Unknown
42+
reveal_type(p) # revealed: Unknown
43+
reveal_type(q) # revealed: Unknown
44+
reveal_type(r) # revealed: Unknown
45+
```

‎crates/red_knot_python_semantic/resources/mdtest/annotations/unsupported_special_forms.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def f(*args: Unpack[Ts]) -> tuple[Unpack[Ts]]:
1818
# TODO: should understand the annotation
1919
reveal_type(args) # revealed: tuple
2020

21-
reveal_type(Alias) # revealed: @Todo(Unsupported or invalid type in a type expression)
21+
reveal_type(Alias) # revealed: @Todo(Invalid or unsupported `KnownInstanceType` in `Type::to_type_expression`)
2222

2323
def g() -> TypeGuard[int]: ...
2424
def h() -> TypeIs[int]: ...
@@ -33,7 +33,7 @@ def i(callback: Callable[Concatenate[int, P], R_co], *args: P.args, **kwargs: P.
3333

3434
class Foo:
3535
def method(self, x: Self):
36-
reveal_type(x) # revealed: @Todo(Unsupported or invalid type in a type expression)
36+
reveal_type(x) # revealed: @Todo(Invalid or unsupported `KnownInstanceType` in `Type::to_type_expression`)
3737
```
3838

3939
## Inheritance

‎crates/red_knot_python_semantic/src/types.rs

+84-38
Original file line numberDiff line numberDiff line change
@@ -2470,32 +2470,45 @@ impl<'db> Type<'db> {
24702470
match self {
24712471
// Special cases for `float` and `complex`
24722472
// https://typing.readthedocs.io/en/latest/spec/special-types.html#special-cases-for-float-and-complex
2473-
Type::ClassLiteral(ClassLiteralType { class })
2474-
if class.is_known(db, KnownClass::Float) =>
2475-
{
2476-
Ok(UnionType::from_elements(
2477-
db,
2478-
[
2479-
KnownClass::Int.to_instance(db),
2480-
KnownClass::Float.to_instance(db),
2481-
],
2482-
))
2483-
}
2484-
Type::ClassLiteral(ClassLiteralType { class })
2485-
if class.is_known(db, KnownClass::Complex) =>
2486-
{
2487-
Ok(UnionType::from_elements(
2488-
db,
2489-
[
2490-
KnownClass::Int.to_instance(db),
2491-
KnownClass::Float.to_instance(db),
2492-
KnownClass::Complex.to_instance(db),
2493-
],
2494-
))
2473+
Type::ClassLiteral(ClassLiteralType { class }) => {
2474+
let ty = match class.known(db) {
2475+
Some(KnownClass::Complex) => UnionType::from_elements(
2476+
db,
2477+
[
2478+
KnownClass::Int.to_instance(db),
2479+
KnownClass::Float.to_instance(db),
2480+
KnownClass::Complex.to_instance(db),
2481+
],
2482+
),
2483+
Some(KnownClass::Float) => UnionType::from_elements(
2484+
db,
2485+
[
2486+
KnownClass::Int.to_instance(db),
2487+
KnownClass::Float.to_instance(db),
2488+
],
2489+
),
2490+
_ => Type::instance(*class),
2491+
};
2492+
Ok(ty)
24952493
}
2496-
// In a type expression, a bare `type` is interpreted as "instance of `type`", which is
2497-
// equivalent to `type[object]`.
2498-
Type::ClassLiteral(_) | Type::SubclassOf(_) => Ok(self.to_instance(db)),
2494+
Type::SubclassOf(_)
2495+
| Type::BooleanLiteral(_)
2496+
| Type::BytesLiteral(_)
2497+
| Type::AlwaysTruthy
2498+
| Type::AlwaysFalsy
2499+
| Type::SliceLiteral(_)
2500+
| Type::IntLiteral(_)
2501+
| Type::LiteralString
2502+
| Type::ModuleLiteral(_)
2503+
| Type::StringLiteral(_)
2504+
| Type::Tuple(_)
2505+
| Type::Callable(_)
2506+
| Type::Never
2507+
| Type::FunctionLiteral(_) => Err(InvalidTypeExpressionError {
2508+
invalid_expressions: smallvec::smallvec![InvalidTypeExpression::InvalidType(*self)],
2509+
fallback_type: Type::unknown(),
2510+
}),
2511+
24992512
// We treat `typing.Type` exactly the same as `builtins.type`:
25002513
Type::KnownInstance(KnownInstanceType::Type) => Ok(KnownClass::Type.to_instance(db)),
25012514
Type::KnownInstance(KnownInstanceType::Tuple) => Ok(KnownClass::Tuple.to_instance(db)),
@@ -2556,7 +2569,6 @@ impl<'db> Type<'db> {
25562569
}
25572570
Type::KnownInstance(KnownInstanceType::LiteralString) => Ok(Type::LiteralString),
25582571
Type::KnownInstance(KnownInstanceType::Any) => Ok(Type::any()),
2559-
// TODO: Should emit a diagnostic
25602572
Type::KnownInstance(KnownInstanceType::Annotated) => Err(InvalidTypeExpressionError {
25612573
invalid_expressions: smallvec::smallvec![InvalidTypeExpression::BareAnnotated],
25622574
fallback_type: Type::unknown(),
@@ -2580,9 +2592,13 @@ impl<'db> Type<'db> {
25802592
Type::KnownInstance(KnownInstanceType::Unknown) => Ok(Type::unknown()),
25812593
Type::KnownInstance(KnownInstanceType::AlwaysTruthy) => Ok(Type::AlwaysTruthy),
25822594
Type::KnownInstance(KnownInstanceType::AlwaysFalsy) => Ok(Type::AlwaysFalsy),
2583-
_ => Ok(todo_type!(
2584-
"Unsupported or invalid type in a type expression"
2595+
Type::KnownInstance(_) => Ok(todo_type!(
2596+
"Invalid or unsupported `KnownInstanceType` in `Type::to_type_expression`"
2597+
)),
2598+
Type::Instance(_) => Ok(todo_type!(
2599+
"Invalid or unsupported `Instance` in `Type::to_type_expression`"
25852600
)),
2601+
Type::Intersection(_) => Ok(todo_type!("Type::Intersection.in_type_expression")),
25862602
}
25872603
}
25882604

@@ -2815,7 +2831,7 @@ impl<'db> From<Type<'db>> for TypeAndQualifiers<'db> {
28152831
#[derive(Debug, PartialEq, Eq)]
28162832
pub struct InvalidTypeExpressionError<'db> {
28172833
fallback_type: Type<'db>,
2818-
invalid_expressions: smallvec::SmallVec<[InvalidTypeExpression; 1]>,
2834+
invalid_expressions: smallvec::SmallVec<[InvalidTypeExpression<'db>; 1]>,
28192835
}
28202836

28212837
impl<'db> InvalidTypeExpressionError<'db> {
@@ -2825,15 +2841,19 @@ impl<'db> InvalidTypeExpressionError<'db> {
28252841
invalid_expressions,
28262842
} = self;
28272843
for error in invalid_expressions {
2828-
context.report_lint(&INVALID_TYPE_FORM, node, format_args!("{}", error.reason()));
2844+
context.report_lint(
2845+
&INVALID_TYPE_FORM,
2846+
node,
2847+
format_args!("{}", error.reason(context.db())),
2848+
);
28292849
}
28302850
fallback_type
28312851
}
28322852
}
28332853

28342854
/// Enumeration of various types that are invalid in type-expression contexts
28352855
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
2836-
enum InvalidTypeExpression {
2856+
enum InvalidTypeExpression<'db> {
28372857
/// `x: Annotated` is invalid as an annotation
28382858
BareAnnotated,
28392859
/// `x: Literal` is invalid as an annotation
@@ -2842,16 +2862,42 @@ enum InvalidTypeExpression {
28422862
ClassVarInTypeExpression,
28432863
/// The `Final` type qualifier was used in a type expression
28442864
FinalInTypeExpression,
2865+
/// Some types are always invalid in type expressions
2866+
InvalidType(Type<'db>),
28452867
}
28462868

2847-
impl InvalidTypeExpression {
2848-
const fn reason(self) -> &'static str {
2849-
match self {
2850-
Self::BareAnnotated => "`Annotated` requires at least two arguments when used in an annotation or type expression",
2851-
Self::BareLiteral => "`Literal` requires at least one argument when used in a type expression",
2852-
Self::ClassVarInTypeExpression => "Type qualifier `typing.ClassVar` is not allowed in type expressions (only in annotation expressions)",
2853-
Self::FinalInTypeExpression => "Type qualifier `typing.Final` is not allowed in type expressions (only in annotation expressions)",
2869+
impl<'db> InvalidTypeExpression<'db> {
2870+
const fn reason(self, db: &'db dyn Db) -> impl std::fmt::Display + 'db {
2871+
struct Display<'db> {
2872+
error: InvalidTypeExpression<'db>,
2873+
db: &'db dyn Db,
28542874
}
2875+
2876+
impl std::fmt::Display for Display<'_> {
2877+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
2878+
match self.error {
2879+
InvalidTypeExpression::BareAnnotated => f.write_str(
2880+
"`Annotated` requires at least two arguments when used in an annotation or type expression"
2881+
),
2882+
InvalidTypeExpression::BareLiteral => f.write_str(
2883+
"`Literal` requires at least one argument when used in a type expression"
2884+
),
2885+
InvalidTypeExpression::ClassVarInTypeExpression => f.write_str(
2886+
"Type qualifier `typing.ClassVar` is not allowed in type expressions (only in annotation expressions)"
2887+
),
2888+
InvalidTypeExpression::FinalInTypeExpression => f.write_str(
2889+
"Type qualifier `typing.Final` is not allowed in type expressions (only in annotation expressions)"
2890+
),
2891+
InvalidTypeExpression::InvalidType(ty) => write!(
2892+
f,
2893+
"Variable of type `{ty}` is not allowed in a type expression",
2894+
ty = ty.display(self.db)
2895+
),
2896+
}
2897+
}
2898+
}
2899+
2900+
Display { error: self, db }
28552901
}
28562902
}
28572903

‎crates/red_knot_test/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ salsa = { workspace = true }
3131
smallvec = { workspace = true }
3232
serde = { workspace = true }
3333
toml = { workspace = true }
34+
thiserror = { workspace = true }
3435

3536
[lints]
3637
workspace = true

0 commit comments

Comments
 (0)