Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-14 17:07:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Set proc_macros input when creating the RootDatabase

Browse source
This commit is contained in:
Lukas Wirth 2023-03-25 18:20:42 +01:00
parent 607375dc20
commit e5f24a6d7c
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,7 @@ impl RootDatabase {
// SourceDatabase // SourceDatabase
base_db::ParseQuery base_db::ParseQuery
base_db::CrateGraphQuery base_db::CrateGraphQuery
base_db::ProcMacrosQuery
// SourceDatabaseExt // SourceDatabaseExt
base_db::FileTextQuery base_db::FileTextQuery

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

@ -137,6 +137,7 @@ impl RootDatabase {
pub fn new(lru_capacity: Option<usize>) -> RootDatabase { pub fn new(lru_capacity: Option<usize>) -> RootDatabase {
let mut db = RootDatabase { storage: ManuallyDrop::new(salsa::Storage::default()) }; let mut db = RootDatabase { storage: ManuallyDrop::new(salsa::Storage::default()) };
db.set_crate_graph_with_durability(Default::default(), Durability::HIGH); db.set_crate_graph_with_durability(Default::default(), Durability::HIGH);
db.set_proc_macros_with_durability(Default::default(), Durability::HIGH);
db.set_local_roots_with_durability(Default::default(), Durability::HIGH); db.set_local_roots_with_durability(Default::default(), Durability::HIGH);
db.set_library_roots_with_durability(Default::default(), Durability::HIGH); db.set_library_roots_with_durability(Default::default(), Durability::HIGH);
db.set_enable_proc_attr_macros(false); db.set_enable_proc_attr_macros(false);

6
crates/rust-analyzer/src/reload.rs
View file

@ -445,12 +445,14 @@ impl GlobalState {
let mut change = Change::new(); let mut change = Change::new();
change.set_crate_graph(crate_graph); change.set_crate_graph(crate_graph);
self.analysis_host.apply_change(change); self.analysis_host.apply_change(change);
self.process_changes();
if same_workspaces { if same_workspaces && !self.fetch_workspaces_queue.op_requested() {
self.load_proc_macros(proc_macro_paths); self.load_proc_macros(proc_macro_paths);
} }
self.process_changes();
self.reload_flycheck(); self.reload_flycheck();
tracing::info!("did switch workspaces"); tracing::info!("did switch workspaces");
} }