Skip to content

[ty] Fix broken property tests for disjointness #18384

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
AlexWaygood merged 1 commit into from
May 30, 2025
Merged

[ty] Fix broken property tests for disjointness #18384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions crates/ty_python_semantic/resources/mdtest/type_properties/is_disjoint_from.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,15 +454,23 @@ static_assert(is_disjoint_from(bool, Callable[..., Any]))
static_assert(is_disjoint_from(C, Callable[..., Any]))
static_assert(is_disjoint_from(bool | C, Callable[..., Any]))

static_assert(is_disjoint_from(Callable[..., Any], bool))
static_assert(is_disjoint_from(Callable[..., Any], C))
static_assert(is_disjoint_from(Callable[..., Any], bool | C))

static_assert(not is_disjoint_from(str, Callable[..., Any]))
static_assert(not is_disjoint_from(bool | str, Callable[..., Any]))

static_assert(not is_disjoint_from(Callable[..., Any], str))
static_assert(not is_disjoint_from(Callable[..., Any], bool | str))

def bound_with_valid_type():
@final
class D:
def __call__(self, *args: Any, **kwargs: Any) -> Any: ...

static_assert(not is_disjoint_from(D, Callable[..., Any]))
static_assert(not is_disjoint_from(Callable[..., Any], D))

def possibly_unbound_with_valid_type(flag: bool):
@final
Expand All @@ -471,13 +479,15 @@ def possibly_unbound_with_valid_type(flag: bool):
def __call__(self, *args: Any, **kwargs: Any) -> Any: ...

static_assert(not is_disjoint_from(E, Callable[..., Any]))
static_assert(not is_disjoint_from(Callable[..., Any], E))

def bound_with_invalid_type():
@final
class F:
__call__: int = 1

static_assert(is_disjoint_from(F, Callable[..., Any]))
static_assert(is_disjoint_from(Callable[..., Any], F))

def possibly_unbound_with_invalid_type(flag: bool):
@final
Expand All @@ -486,4 +496,5 @@ def possibly_unbound_with_invalid_type(flag: bool):
__call__: int = 1

static_assert(is_disjoint_from(G, Callable[..., Any]))
static_assert(is_disjoint_from(Callable[..., Any], G))
```
21 changes: 10 additions & 11 deletions crates/ty_python_semantic/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2179,23 +2179,22 @@ impl<'db> Type<'db> {

(
Type::Callable(_) | Type::DataclassDecorator(_) | Type::DataclassTransformer(_),
Type::NominalInstance(instance),
instance @ Type::NominalInstance(NominalInstanceType { class, .. }),
)
| (
Type::NominalInstance(instance),
instance @ Type::NominalInstance(NominalInstanceType { class, .. }),
Type::Callable(_) | Type::DataclassDecorator(_) | Type::DataclassTransformer(_),
) if instance.class.is_final(db) => {
let member = self.member_lookup_with_policy(
) if class.is_final(db) => instance
.member_lookup_with_policy(
db,
Name::new_static("__call__"),
MemberLookupPolicy::NO_INSTANCE_FALLBACK,
);
match member.symbol {
// TODO: ideally this would check disjointness of the `__call__` signature and the callable signature
Symbol::Type(ty, _) => !ty.is_assignable_to(db, CallableType::unknown(db)),
Symbol::Unbound => true,
}
}
)
.symbol
.ignore_possibly_unbound()
.is_none_or(|dunder_call| {
!dunder_call.is_assignable_to(db, CallableType::unknown(db))
}),

(
Type::Callable(_) | Type::DataclassDecorator(_) | Type::DataclassTransformer(_),
Expand Down
Loading