bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-def/src/expander.rs')
-rw-r--r--crates/hir-def/src/expander.rs36
1 files changed, 32 insertions, 4 deletions
diff --git a/crates/hir-def/src/expander.rs b/crates/hir-def/src/expander.rs
index 6d8b4445f7..d430733fca 100644
--- a/crates/hir-def/src/expander.rs
+++ b/crates/hir-def/src/expander.rs
@@ -14,6 +14,7 @@ use span::SyntaxContextId;
use syntax::{ast, Parse};
use triomphe::Arc;
+use crate::type_ref::{TypesMap, TypesSourceMap};
use crate::{
attr::Attrs, db::DefDatabase, lower::LowerCtx, path::Path, AsMacroCall, MacroId, ModuleId,
UnresolvedMacro,
@@ -49,6 +50,10 @@ impl Expander {
}
}
+ pub(crate) fn span_map(&self, db: &dyn DefDatabase) -> &SpanMap {
+ self.span_map.get_or_init(|| db.span_map(self.current_file_id))
+ }
+
pub fn krate(&self) -> CrateId {
self.module.krate
}
@@ -110,8 +115,19 @@ impl Expander {
mark.bomb.defuse();
}
- pub fn ctx<'a>(&self, db: &'a dyn DefDatabase) -> LowerCtx<'a> {
- LowerCtx::with_span_map_cell(db, self.current_file_id, self.span_map.clone())
+ pub fn ctx<'a>(
+ &self,
+ db: &'a dyn DefDatabase,
+ types_map: &'a mut TypesMap,
+ types_source_map: &'a mut TypesSourceMap,
+ ) -> LowerCtx<'a> {
+ LowerCtx::with_span_map_cell(
+ db,
+ self.current_file_id,
+ self.span_map.clone(),
+ types_map,
+ types_source_map,
+ )
}
pub(crate) fn in_file<T>(&self, value: T) -> InFile<T> {
@@ -138,8 +154,20 @@ impl Expander {
self.current_file_id
}
- pub(crate) fn parse_path(&mut self, db: &dyn DefDatabase, path: ast::Path) -> Option<Path> {
- let ctx = LowerCtx::with_span_map_cell(db, self.current_file_id, self.span_map.clone());
+ pub(crate) fn parse_path(
+ &mut self,
+ db: &dyn DefDatabase,
+ path: ast::Path,
+ types_map: &mut TypesMap,
+ types_source_map: &mut TypesSourceMap,
+ ) -> Option<Path> {
+ let ctx = LowerCtx::with_span_map_cell(
+ db,
+ self.current_file_id,
+ self.span_map.clone(),
+ types_map,
+ types_source_map,
+ );
Path::from_src(&ctx, path)
}