mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-16 08:30:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Select stable import name when multiple possible bindings are in scope (#12888)

Browse source
This commit is contained in:
Micha Reiser 2024-08-16 20:16:57 +02:00 • committed by GitHub
parent 499c0bd875
commit d61d75d4fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/ruff_python_semantic/src/model.rs
View file

@ -907,7 +907,7 @@ impl<'a> SemanticModel<'a> {
self.current_scopes()
.enumerate()
.find_map(|(scope_index, scope)| {
scope.bindings().find_map(|(name, binding_id)| {
let mut imported_names = scope.bindings().filter_map(|(name, binding_id)| {
let binding = &self.bindings[binding_id];
match &binding.kind {
// Ex) Given `module="sys"` and `object="exit"`:
@ -987,7 +987,22 @@ impl<'a> SemanticModel<'a> {
_ => {}
}
None
})
});
let first = imported_names.next()?;
if let Some(second) = imported_names.next() {
// Multiple candidates. We need to sort them because `scope.bindings()` is a HashMap
// which doesn't have a stable iteration order.
let mut imports: Vec<_> =
[first, second].into_iter().chain(imported_names).collect();
imports.sort_unstable_by_key(|import| import.range.start());
// Return the binding that was imported last.
imports.pop()
} else {
Some(first)
}
})
}