mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Opt for FxHashMap<Id,Id> instead of <Id,Option<Id>> and apply requested changes

Browse Source
This commit is contained in:
Ali Bektas 2024-03-04 22:58:49 +01:00
parent a15cc86c64
commit 9c50d129da
3 changed files with 127 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
crates/load-cargo/src/lib.rs
View File

@ -267,32 +267,27 @@ pub fn partition(&self, vfs: &vfs::Vfs) -> Vec<SourceRoot> {
} }
/// Maps local source roots to their parent source roots by bytewise comparing of root paths . /// Maps local source roots to their parent source roots by bytewise comparing of root paths .
/// If a source root doesn't have a parent then its parent is declared as None. /// If a `SourceRoot` doesn't have a parent and is local then it is not contained in this mapping but it can be asserted that it is a root `SourceRoot`.
pub fn source_root_parent_map(&self) -> FxHashMap<SourceRootId, Option<SourceRootId>> { pub fn source_root_parent_map(&self) -> FxHashMap<SourceRootId, SourceRootId> {
let roots = self.fsc.roots(); let roots = self.fsc.roots();
let mut map = FxHashMap::<SourceRootId, Option<SourceRootId>>::default(); let mut map = FxHashMap::<SourceRootId, SourceRootId>::default();
roots
'outer: for (idx, (root, root_id)) in roots.iter().enumerate() { .iter()
if !self.local_filesets.contains(root_id) { .enumerate()
continue; .filter(|(_, (_, id))| self.local_filesets.contains(id))
} .filter_map(|(idx, (root, root_id))| {
for (_, (root2, root2_id)) in roots.iter().enumerate().take(idx).rev() {
if root2.iter().enumerate().all(|(i, c)| &root[i] == c) {
// We are interested in parents if they are also local source roots. // We are interested in parents if they are also local source roots.
// So instead of a non-local parent we may take a local ancestor as a parent to a node. // So instead of a non-local parent we may take a local ancestor as a parent to a node.
if self.local_filesets.contains(root2_id) { roots.iter().take(idx).find_map(|(root2, root2_id)| {
map.insert( if self.local_filesets.contains(root2_id) && root.starts_with(root2) {
SourceRootId(root_id.to_owned() as u32), return Some((root_id, root2_id));
Some(SourceRootId(root2_id.to_owned() as u32)),
);
continue 'outer;
} }
} None
} })
map.insert(SourceRootId(idx as u32), None); })
} .for_each(|(child, parent)| {
map.insert(SourceRootId(*child as u32), SourceRootId(*parent as u32));
});
map map
} }
} }
@ -427,6 +422,11 @@ mod tests {
use super::*; use super::*;
use ide_db::base_db::SourceRootId;
use vfs::{file_set::FileSetConfigBuilder, VfsPath};
use crate::SourceRootConfig;
#[test] #[test]
fn test_loading_rust_analyzer() { fn test_loading_rust_analyzer() {
let path = Path::new(env!("CARGO_MANIFEST_DIR")).parent().unwrap().parent().unwrap(); let path = Path::new(env!("CARGO_MANIFEST_DIR")).parent().unwrap().parent().unwrap();
@ -444,202 +444,123 @@ fn test_loading_rust_analyzer() {
assert!(n_crates > 20); assert!(n_crates > 20);
} }
mod source_root_parent {
use ide_db::base_db::SourceRootId;
use vfs::{file_set::FileSetConfigBuilder, VfsPath};
use crate::SourceRootConfig;
macro_rules! virp {
($s : literal) => {
VfsPath::new_virtual_path(format!($s))
};
}
#[test] #[test]
fn test1() { fn unrelated_sources() {
let mut builder = FileSetConfigBuilder::default(); let mut builder = FileSetConfigBuilder::default();
let root = vec![virp!("/ROOT/abc")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/abc".to_owned())]);
let root2 = vec![virp!("/ROOT/def")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def".to_owned())]);
builder.add_file_set(root);
builder.add_file_set(root2);
let fsc = builder.build(); let fsc = builder.build();
let src = SourceRootConfig { fsc, local_filesets: vec![0, 1] }; let src = SourceRootConfig { fsc, local_filesets: vec![0, 1] };
let vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>(); let vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>();
assert_eq!(vc, vec![(SourceRootId(0), None), (SourceRootId(1), None)]) assert_eq!(vc, vec![])
} }
#[test] #[test]
fn test2() { fn unrelated_source_sharing_dirname() {
let mut builder = FileSetConfigBuilder::default(); let mut builder = FileSetConfigBuilder::default();
let root = vec![virp!("/ROOT/abc")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/abc".to_owned())]);
let root2 = vec![virp!("/ROOT/def/abc")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def/abc".to_owned())]);
builder.add_file_set(root);
builder.add_file_set(root2);
let fsc = builder.build(); let fsc = builder.build();
let src = SourceRootConfig { fsc, local_filesets: vec![0, 1] }; let src = SourceRootConfig { fsc, local_filesets: vec![0, 1] };
let vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>(); let vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>();
assert_eq!(vc, vec![(SourceRootId(0), None), (SourceRootId(1), None)]) assert_eq!(vc, vec![])
} }
#[test] #[test]
fn test3() { fn basic_child_parent() {
let mut builder = FileSetConfigBuilder::default(); let mut builder = FileSetConfigBuilder::default();
let root = vec![virp!("/ROOT/abc")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/abc".to_owned())]);
let root2 = vec![virp!("/ROOT/abc/def")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/abc/def".to_owned())]);
builder.add_file_set(root);
builder.add_file_set(root2);
let fsc = builder.build(); let fsc = builder.build();
let src = SourceRootConfig { fsc, local_filesets: vec![0, 1] }; let src = SourceRootConfig { fsc, local_filesets: vec![0, 1] };
let vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>(); let vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>();
assert_eq!(vc, vec![(SourceRootId(0), None), (SourceRootId(1), Some(SourceRootId(0)))]) assert_eq!(vc, vec![(SourceRootId(1), SourceRootId(0))])
} }
#[test] #[test]
fn test4() { fn basic_child_parent_with_unrelated_parents_sib() {
let mut builder = FileSetConfigBuilder::default(); let mut builder = FileSetConfigBuilder::default();
let root = vec![virp!("/ROOT/abc")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/abc".to_owned())]);
let root2 = vec![virp!("/ROOT/def")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def".to_owned())]);
let root3 = vec![virp!("/ROOT/def/abc")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def/abc".to_owned())]);
builder.add_file_set(root);
builder.add_file_set(root2);
builder.add_file_set(root3);
let fsc = builder.build(); let fsc = builder.build();
let src = SourceRootConfig { fsc, local_filesets: vec![0, 1, 2] }; let src = SourceRootConfig { fsc, local_filesets: vec![0, 1, 2] };
let vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>(); let vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>();
assert_eq!( assert_eq!(vc, vec![(SourceRootId(2), SourceRootId(1))])
vc,
vec![
(SourceRootId(0), None),
(SourceRootId(1), None),
(SourceRootId(2), Some(SourceRootId(1)))
]
)
} }
#[test] #[test]
fn test5() { fn deep_sources_with_parent_missing() {
let mut builder = FileSetConfigBuilder::default(); let mut builder = FileSetConfigBuilder::default();
let root = vec![virp!("/ROOT/abc")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/abc".to_owned())]);
let root2 = vec![virp!("/ROOT/ghi")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/ghi".to_owned())]);
let root3 = vec![virp!("/ROOT/def/abc")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def/abc".to_owned())]);
builder.add_file_set(root);
builder.add_file_set(root2);
builder.add_file_set(root3);
let fsc = builder.build(); let fsc = builder.build();
let src = SourceRootConfig { fsc, local_filesets: vec![0, 1, 2] }; let src = SourceRootConfig { fsc, local_filesets: vec![0, 1, 2] };
let vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>(); let vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>();
assert_eq!( assert_eq!(vc, vec![])
vc,
vec![(SourceRootId(0), None), (SourceRootId(1), None), (SourceRootId(2), None)]
)
} }
#[test] #[test]
fn test6() { fn ancestor_can_be_parent() {
let mut builder = FileSetConfigBuilder::default(); let mut builder = FileSetConfigBuilder::default();
let root = vec![virp!("/ROOT/abc")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/abc".to_owned())]);
let root2 = vec![virp!("/ROOT/def")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def".to_owned())]);
let root3 = vec![virp!("/ROOT/def/ghi/jkl")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def/ghi/jkl".to_owned())]);
builder.add_file_set(root);
builder.add_file_set(root2);
builder.add_file_set(root3);
let fsc = builder.build(); let fsc = builder.build();
let src = SourceRootConfig { fsc, local_filesets: vec![0, 1, 2] }; let src = SourceRootConfig { fsc, local_filesets: vec![0, 1, 2] };
let vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>(); let vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>();
assert_eq!( assert_eq!(vc, vec![(SourceRootId(2), SourceRootId(1))])
vc,
vec![
(SourceRootId(0), None),
(SourceRootId(1), None),
(SourceRootId(2), Some(SourceRootId(1)))
]
)
} }
#[test] #[test]
fn test7() { fn ancestor_can_be_parent_2() {
let mut builder = FileSetConfigBuilder::default(); let mut builder = FileSetConfigBuilder::default();
let root = vec![virp!("/ROOT/abc")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/abc".to_owned())]);
let root2 = vec![virp!("/ROOT/def")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def".to_owned())]);
let root3 = vec![virp!("/ROOT/def/ghi/jkl")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def/ghi/jkl".to_owned())]);
let root4 = vec![virp!("/ROOT/def/ghi/klm")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def/ghi/klm".to_owned())]);
builder.add_file_set(root);
builder.add_file_set(root2);
builder.add_file_set(root3);
builder.add_file_set(root4);
let fsc = builder.build(); let fsc = builder.build();
let src = SourceRootConfig { fsc, local_filesets: vec![0, 1, 2, 3] }; let src = SourceRootConfig { fsc, local_filesets: vec![0, 1, 2, 3] };
let mut vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>(); let mut vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>();
vc.sort_by(|x, y| x.0 .0.cmp(&y.0 .0)); vc.sort_by(|x, y| x.0 .0.cmp(&y.0 .0));
assert_eq!( assert_eq!(vc, vec![(SourceRootId(2), SourceRootId(1)), (SourceRootId(3), SourceRootId(1))])
vc,
vec![
(SourceRootId(0), None),
(SourceRootId(1), None),
(SourceRootId(2), Some(SourceRootId(1))),
(SourceRootId(3), Some(SourceRootId(1)))
]
)
} }
#[test] #[test]
fn test8() { fn non_locals_are_skipped() {
let mut builder = FileSetConfigBuilder::default(); let mut builder = FileSetConfigBuilder::default();
let root = vec![virp!("/ROOT/abc")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/abc".to_owned())]);
let root2 = vec![virp!("/ROOT/def")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def".to_owned())]);
let root3 = vec![virp!("/ROOT/def/ghi/jkl")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def/ghi/jkl".to_owned())]);
let root4 = vec![virp!("/ROOT/def/klm")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def/klm".to_owned())]);
builder.add_file_set(root);
builder.add_file_set(root2);
builder.add_file_set(root3);
builder.add_file_set(root4);
let fsc = builder.build(); let fsc = builder.build();
let src = SourceRootConfig { fsc, local_filesets: vec![0, 1, 3] }; let src = SourceRootConfig { fsc, local_filesets: vec![0, 1, 3] };
let mut vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>(); let mut vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>();
vc.sort_by(|x, y| x.0 .0.cmp(&y.0 .0)); vc.sort_by(|x, y| x.0 .0.cmp(&y.0 .0));
assert_eq!( assert_eq!(vc, vec![(SourceRootId(3), SourceRootId(1)),])
vc,
vec![
(SourceRootId(0), None),
(SourceRootId(1), None),
(SourceRootId(3), Some(SourceRootId(1))),
]
)
} }
#[test] #[test]
fn test9() { fn child_binds_ancestor_if_parent_nonlocal() {
let mut builder = FileSetConfigBuilder::default(); let mut builder = FileSetConfigBuilder::default();
let root = vec![virp!("/ROOT/abc")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/abc".to_owned())]);
let root2 = vec![virp!("/ROOT/def")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def".to_owned())]);
let root3 = vec![virp!("/ROOT/def/klm")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def/klm".to_owned())]);
let root4 = vec![virp!("/ROOT/def/klm/jkl")]; builder.add_file_set(vec![VfsPath::new_virtual_path("/ROOT/def/klm/jkl".to_owned())]);
builder.add_file_set(root);
builder.add_file_set(root2);
builder.add_file_set(root3);
builder.add_file_set(root4);
let fsc = builder.build(); let fsc = builder.build();
let src = SourceRootConfig { fsc, local_filesets: vec![0, 1, 3] }; let src = SourceRootConfig { fsc, local_filesets: vec![0, 1, 3] };
let mut vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>(); let mut vc = src.source_root_parent_map().into_iter().collect::<Vec<_>>();
vc.sort_by(|x, y| x.0 .0.cmp(&y.0 .0)); vc.sort_by(|x, y| x.0 .0.cmp(&y.0 .0));
assert_eq!( assert_eq!(vc, vec![(SourceRootId(3), SourceRootId(1)),])
vc,
vec![
(SourceRootId(0), None),
(SourceRootId(1), None),
(SourceRootId(3), Some(SourceRootId(1))),
]
)
}
} }
} }

2
crates/rust-analyzer/src/global_state.rs
View File

@ -67,7 +67,7 @@ pub(crate) struct GlobalState {
pub(crate) mem_docs: MemDocs, pub(crate) mem_docs: MemDocs,
pub(crate) source_root_config: SourceRootConfig, pub(crate) source_root_config: SourceRootConfig,
/// A mapping that maps a local source root's `SourceRootId` to it parent's `SourceRootId`, if it has one. /// A mapping that maps a local source root's `SourceRootId` to it parent's `SourceRootId`, if it has one.
pub(crate) local_roots_parent_map: FxHashMap<SourceRootId, Option<SourceRootId>>, pub(crate) local_roots_parent_map: FxHashMap<SourceRootId, SourceRootId>,
pub(crate) semantic_tokens_cache: Arc<Mutex<FxHashMap<Url, SemanticTokens>>>, pub(crate) semantic_tokens_cache: Arc<Mutex<FxHashMap<Url, SemanticTokens>>>,
// status // status

8
crates/vfs/src/file_set.rs
View File

@ -125,13 +125,7 @@ fn len(&self) -> usize {
/// Get the lexicographically ordered vector of the underlying map. /// Get the lexicographically ordered vector of the underlying map.
pub fn roots(&self) -> Vec<(Vec<u8>, u64)> { pub fn roots(&self) -> Vec<(Vec<u8>, u64)> {
let mut stream = self.map.stream(); self.map.stream().into_byte_vec()
let mut vc = vec![];
while let Some((pth, idx)) = stream.next() {
vc.push((pth.to_vec(), idx));
}
vc
} }
/// Returns the set index for the given `path`. /// Returns the set index for the given `path`.