Skip to content

[ty] Return getter and setter definitions for properties #24349

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

Closed
mvanhorn wants to merge 1 commit into from
+35 −23
Closed

[ty] Return getter and setter definitions for properties #24349

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
58 changes: 35 additions & 23 deletions crates/ty_python_semantic/src/types/ide_support.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,12 @@ fn definitions_for_attribute_in_class_hierarchy<'db>(
let class_scope = ancestor.body_scope(db);
let class_place_table = crate::semantic_index::place_table(db, class_scope);

// Look for class-level declarations and bindings
// Look for class-level declarations and bindings.
// Collect all definitions from the same scope before breaking,
// so that property getter+setter pairs are both returned.
if let Some(place_id) = class_place_table.symbol_id(attribute_name) {
let use_def = use_def_map(db, class_scope);
let len_before = resolved.len();

// Check declarations first
for decl in use_def.reachable_symbol_declarations(place_id) {
Expand All @@ -369,22 +372,26 @@ fn definitions_for_attribute_in_class_hierarchy<'db>(
Some(attribute_name),
ImportAliasResolution::ResolveAliases,
));
break 'scopes;
}
}

// If no declarations found, check bindings
for binding in use_def.reachable_symbol_bindings(place_id) {
if let Some(def) = binding.binding.definition() {
resolved.extend(resolve_definition(
db,
def,
Some(attribute_name),
ImportAliasResolution::ResolveAliases,
));
break 'scopes;
// If no declarations found, check bindings (collect all)
if resolved.len() == len_before {
for binding in use_def.reachable_symbol_bindings(place_id) {
if let Some(def) = binding.binding.definition() {
resolved.extend(resolve_definition(
db,
def,
Some(attribute_name),
ImportAliasResolution::ResolveAliases,
));
}
}
}

if resolved.len() > len_before {
break 'scopes;
}
}

// Look for instance attributes in method scopes (e.g., self.x = 1)
Expand All @@ -397,6 +404,7 @@ fn definitions_for_attribute_in_class_hierarchy<'db>(
.member_id_by_instance_attribute_name(attribute_name)
{
let use_def = index.use_def_map(function_scope_id);
let len_before = resolved.len();

// Check declarations first
for decl in use_def.reachable_member_declarations(place_id) {
Expand All @@ -407,22 +415,26 @@ fn definitions_for_attribute_in_class_hierarchy<'db>(
Some(attribute_name),
ImportAliasResolution::ResolveAliases,
));
break 'scopes;
}
}

// If no declarations found, check bindings
for binding in use_def.reachable_member_bindings(place_id) {
if let Some(def) = binding.binding.definition() {
resolved.extend(resolve_definition(
db,
def,
Some(attribute_name),
ImportAliasResolution::ResolveAliases,
));
break 'scopes;
// If no declarations found, check bindings (collect all)
if resolved.len() == len_before {
for binding in use_def.reachable_member_bindings(place_id) {
if let Some(def) = binding.binding.definition() {
resolved.extend(resolve_definition(
db,
def,
Some(attribute_name),
ImportAliasResolution::ResolveAliases,
));
}
}
}

if resolved.len() > len_before {
break 'scopes;
}
}
}
}
Expand Down
Loading