bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-expand/src/change.rs')
-rw-r--r--crates/hir-expand/src/change.rs33
1 files changed, 13 insertions, 20 deletions
diff --git a/crates/hir-expand/src/change.rs b/crates/hir-expand/src/change.rs
index 1fdf251ba5..6873cb7eaf 100644
--- a/crates/hir-expand/src/change.rs
+++ b/crates/hir-expand/src/change.rs
@@ -1,29 +1,27 @@
//! Defines a unit of change that can applied to the database to get the next
//! state. Changes are transactional.
-use base_db::{
- ra_salsa::Durability, CrateGraph, CrateId, CrateWorkspaceData, FileChange, SourceRoot,
- SourceRootDatabase,
-};
-use rustc_hash::FxHashMap;
+use base_db::{CrateGraphBuilder, FileChange, SourceRoot};
+use salsa::Durability;
use span::FileId;
use triomphe::Arc;
-use crate::{db::ExpandDatabase, proc_macro::ProcMacros};
+use crate::{db::ExpandDatabase, proc_macro::ProcMacrosBuilder};
#[derive(Debug, Default)]
pub struct ChangeWithProcMacros {
pub source_change: FileChange,
- pub proc_macros: Option<ProcMacros>,
+ pub proc_macros: Option<ProcMacrosBuilder>,
}
impl ChangeWithProcMacros {
- pub fn new() -> Self {
- Self::default()
- }
-
- pub fn apply(self, db: &mut (impl ExpandDatabase + SourceRootDatabase)) {
- self.source_change.apply(db);
+ pub fn apply(self, db: &mut impl ExpandDatabase) {
+ let crates_id_map = self.source_change.apply(db);
if let Some(proc_macros) = self.proc_macros {
+ let proc_macros = proc_macros.build(
+ crates_id_map
+ .as_ref()
+ .expect("cannot set proc macros without setting the crate graph too"),
+ );
db.set_proc_macros_with_durability(Arc::new(proc_macros), Durability::HIGH);
}
}
@@ -32,16 +30,11 @@ impl ChangeWithProcMacros {
self.source_change.change_file(file_id, new_text)
}
- pub fn set_crate_graph(
- &mut self,
- graph: CrateGraph,
- ws_data: FxHashMap<CrateId, Arc<CrateWorkspaceData>>,
- ) {
+ pub fn set_crate_graph(&mut self, graph: CrateGraphBuilder) {
self.source_change.set_crate_graph(graph);
- self.source_change.set_ws_data(ws_data);
}
- pub fn set_proc_macros(&mut self, proc_macros: ProcMacros) {
+ pub fn set_proc_macros(&mut self, proc_macros: ProcMacrosBuilder) {
self.proc_macros = Some(proc_macros);
}