language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-23 00:33:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refactor: Use MEDIUM durability for crate-graph changes, high for library source files

Browse source 
The idea here is that the crate graph may change over time, but library source file contents *never* will (or really never should). Disconnecting the two means that queries that depend on library sources will not need to re-validatewhen the crate graph changes (unless they depend on the crate graph in some capacity).
This commit is contained in:
Lukas Wirth 2025-03-26 06:46:49 +01:00
parent 749fde9017
commit 454e4be40d
4 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/base-db/src/change.rs
View file

@ -55,7 +55,7 @@ impl FileChange {
if let Some(roots) = self.roots { if let Some(roots) = self.roots {
for (idx, root) in roots.into_iter().enumerate() { for (idx, root) in roots.into_iter().enumerate() {
let root_id = SourceRootId(idx as u32); let root_id = SourceRootId(idx as u32);
let durability = durability(&root); let durability = source_root_durability(&root);
for file_id in root.iter() { for file_id in root.iter() {
db.set_file_source_root_with_durability(file_id, root_id, durability); db.set_file_source_root_with_durability(file_id, root_id, durability);
} }
@ -68,7 +68,7 @@ impl FileChange {
let source_root_id = db.file_source_root(file_id); let source_root_id = db.file_source_root(file_id);
let source_root = db.source_root(source_root_id.source_root_id(db)); let source_root = db.source_root(source_root_id.source_root_id(db));
let durability = durability(&source_root.source_root(db)); let durability = file_text_durability(&source_root.source_root(db));
// XXX: can't actually remove the file, just reset the text // XXX: can't actually remove the file, just reset the text
let text = text.unwrap_or_default(); let text = text.unwrap_or_default();
db.set_file_text_with_durability(file_id, &text, durability) db.set_file_text_with_durability(file_id, &text, durability)
@ -81,6 +81,10 @@ impl FileChange {
} }
} }
fn durability(source_root: &SourceRoot) -> Durability { fn source_root_durability(source_root: &SourceRoot) -> Durability {
if source_root.is_library { Durability::MEDIUM } else { Durability::LOW }
}
fn file_text_durability(source_root: &SourceRoot) -> Durability {
if source_root.is_library { Durability::HIGH } else { Durability::LOW } if source_root.is_library { Durability::HIGH } else { Durability::LOW }
} }

14
crates/base-db/src/input.rs
View file

@ -491,7 +491,7 @@ impl CrateGraphBuilder {
if **old_all_crates != *all_crates { if **old_all_crates != *all_crates {
db.set_all_crates_with_durability( db.set_all_crates_with_durability(
Arc::new(all_crates.into_boxed_slice()), Arc::new(all_crates.into_boxed_slice()),
Durability::HIGH, Durability::MEDIUM,
); );
} }
@ -549,30 +549,30 @@ impl CrateGraphBuilder {
Entry::Occupied(entry) => { Entry::Occupied(entry) => {
let old_crate = *entry.get(); let old_crate = *entry.get();
if crate_data != *old_crate.data(db) { if crate_data != *old_crate.data(db) {
old_crate.set_data(db).with_durability(Durability::HIGH).to(crate_data); old_crate.set_data(db).with_durability(Durability::MEDIUM).to(crate_data);
} }
if krate.extra != *old_crate.extra_data(db) { if krate.extra != *old_crate.extra_data(db) {
old_crate old_crate
.set_extra_data(db) .set_extra_data(db)
.with_durability(Durability::HIGH) .with_durability(Durability::MEDIUM)
.to(krate.extra.clone()); .to(krate.extra.clone());
} }
if krate.cfg_options != *old_crate.cfg_options(db) { if krate.cfg_options != *old_crate.cfg_options(db) {
old_crate old_crate
.set_cfg_options(db) .set_cfg_options(db)
.with_durability(Durability::HIGH) .with_durability(Durability::MEDIUM)
.to(krate.cfg_options.clone()); .to(krate.cfg_options.clone());
} }
if krate.env != *old_crate.env(db) { if krate.env != *old_crate.env(db) {
old_crate old_crate
.set_env(db) .set_env(db)
.with_durability(Durability::HIGH) .with_durability(Durability::MEDIUM)
.to(krate.env.clone()); .to(krate.env.clone());
} }
if krate.ws_data != *old_crate.workspace_data(db) { if krate.ws_data != *old_crate.workspace_data(db) {
old_crate old_crate
.set_workspace_data(db) .set_workspace_data(db)
.with_durability(Durability::HIGH) .with_durability(Durability::MEDIUM)
.to(krate.ws_data.clone()); .to(krate.ws_data.clone());
} }
old_crate old_crate
@ -585,7 +585,7 @@ impl CrateGraphBuilder {
krate.cfg_options.clone(), krate.cfg_options.clone(),
krate.env.clone(), krate.env.clone(),
) )
.durability(Durability::HIGH) .durability(Durability::MEDIUM)
.new(db); .new(db);
entry.insert(input); entry.insert(input);
input input

4
crates/ide-db/src/apply_change.rs
View file

@ -29,8 +29,8 @@ impl RootDatabase {
local_roots.insert(root_id); local_roots.insert(root_id);
} }
} }
self.set_local_roots_with_durability(Arc::new(local_roots), Durability::HIGH); self.set_local_roots_with_durability(Arc::new(local_roots), Durability::MEDIUM);
self.set_library_roots_with_durability(Arc::new(library_roots), Durability::HIGH); self.set_library_roots_with_durability(Arc::new(library_roots), Durability::MEDIUM);
} }
change.apply(self); change.apply(self);
} }

6
crates/ide-db/src/lib.rs
View file

@ -220,9 +220,9 @@ impl RootDatabase {
// This needs to be here otherwise `CrateGraphBuilder` will panic. // This needs to be here otherwise `CrateGraphBuilder` will panic.
db.set_all_crates(Arc::new(Box::new([]))); db.set_all_crates(Arc::new(Box::new([])));
CrateGraphBuilder::default().set_in_db(&mut db); CrateGraphBuilder::default().set_in_db(&mut db);
db.set_proc_macros_with_durability(Default::default(), Durability::HIGH); db.set_proc_macros_with_durability(Default::default(), Durability::MEDIUM);
db.set_local_roots_with_durability(Default::default(), Durability::HIGH); db.set_local_roots_with_durability(Default::default(), Durability::MEDIUM);
db.set_library_roots_with_durability(Default::default(), Durability::HIGH); db.set_library_roots_with_durability(Default::default(), Durability::MEDIUM);
db.set_expand_proc_attr_macros_with_durability(false, Durability::HIGH); db.set_expand_proc_attr_macros_with_durability(false, Durability::HIGH);
db.update_base_query_lru_capacities(lru_capacity); db.update_base_query_lru_capacities(lru_capacity);
db db