language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-26 11:59:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Invert structure of Scope#shadowed_bindings (#4855)

Browse source
This commit is contained in:
Charlie Marsh 2023-06-04 22:03:21 -04:00 • committed by GitHub
parent 694bf7f5b8
commit a0721912a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/ruff_python_semantic/src/scope.rs
View file

@ -1,3 +1,5 @@
use nohash_hasher::{BuildNoHashHasher, IntMap};
use std::collections::HashMap;
use std::ops::{Deref, DerefMut}; use std::ops::{Deref, DerefMut};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
@ -17,10 +19,10 @@ pub struct Scope<'a> {
/// A list of star imports in this scope. These represent _module_ imports (e.g., `sys` in /// A list of star imports in this scope. These represent _module_ imports (e.g., `sys` in
/// `from sys import *`), rather than individual bindings (e.g., individual members in `sys`). /// `from sys import *`), rather than individual bindings (e.g., individual members in `sys`).
star_imports: Vec<StarImportation<'a>>, star_imports: Vec<StarImportation<'a>>,
/// A map from bound name to binding index, for current bindings. /// A map from bound name to binding ID.
bindings: FxHashMap<&'a str, BindingId>, bindings: FxHashMap<&'a str, BindingId>,
/// A map from bound name to binding index, for bindings that were shadowed later in the scope. /// A map from binding ID to binding ID that it shadows.
shadowed_bindings: FxHashMap<&'a str, Vec<BindingId>>, shadowed_bindings: HashMap<BindingId, BindingId, BuildNoHashHasher<BindingId>>,
/// Index into the globals arena, if the scope contains any globally-declared symbols. /// Index into the globals arena, if the scope contains any globally-declared symbols.
globals_id: Option<GlobalsId>, globals_id: Option<GlobalsId>,
} }
@ -33,7 +35,7 @@ impl<'a> Scope<'a> {
uses_locals: false, uses_locals: false,
star_imports: Vec::default(), star_imports: Vec::default(),
bindings: FxHashMap::default(), bindings: FxHashMap::default(),
shadowed_bindings: FxHashMap::default(), shadowed_bindings: IntMap::default(),
globals_id: None, globals_id: None,
} }
} }
@ -45,7 +47,7 @@ impl<'a> Scope<'a> {
uses_locals: false, uses_locals: false,
star_imports: Vec::default(), star_imports: Vec::default(),
bindings: FxHashMap::default(), bindings: FxHashMap::default(),
shadowed_bindings: FxHashMap::default(), shadowed_bindings: IntMap::default(),
globals_id: None, globals_id: None,
} }
} }
@ -57,9 +59,9 @@ impl<'a> Scope<'a> {
/// Adds a new binding with the given name to this scope. /// Adds a new binding with the given name to this scope.
pub fn add(&mut self, name: &'a str, id: BindingId) -> Option<BindingId> { pub fn add(&mut self, name: &'a str, id: BindingId) -> Option<BindingId> {
if let Some(id) = self.bindings.insert(name, id) { if let Some(shadowed) = self.bindings.insert(name, id) {
self.shadowed_bindings.entry(name).or_default().push(id); self.shadowed_bindings.insert(id, shadowed);
Some(id) Some(shadowed)
} else { } else {
None None
} }
@ -88,11 +90,9 @@ impl<'a> Scope<'a> {
/// Returns an iterator over all [bindings](BindingId) bound to the given name, including /// Returns an iterator over all [bindings](BindingId) bound to the given name, including
/// those that were shadowed by later bindings. /// those that were shadowed by later bindings.
pub fn bindings_for_name(&self, name: &str) -> impl Iterator<Item = BindingId> + '_ { pub fn bindings_for_name(&self, name: &str) -> impl Iterator<Item = BindingId> + '_ {
self.bindings std::iter::successors(self.bindings.get(name).copied(), |id| {
.get(name) self.shadowed_bindings.get(id).copied()
.into_iter() })
.chain(self.shadowed_bindings.get(name).into_iter().flatten().rev())
.copied()
} }
/// Adds a reference to a star import (e.g., `from sys import *`) to this scope. /// Adds a reference to a star import (e.g., `from sys import *`) to this scope.