bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-expand/src/span_map.rs')
-rw-r--r--crates/hir-expand/src/span_map.rs72
1 files changed, 4 insertions, 68 deletions
diff --git a/crates/hir-expand/src/span_map.rs b/crates/hir-expand/src/span_map.rs
index 386063155d..f9763cd886 100644
--- a/crates/hir-expand/src/span_map.rs
+++ b/crates/hir-expand/src/span_map.rs
@@ -1,14 +1,9 @@
-//! Spanmaps allow turning absolute ranges into relative ranges for incrementality purposes as well
-//! as associating spans with text ranges in a particular file.
-
-// FIXME: Consider moving this into the span crate
-
-use base_db::FileId;
-use span::{ErasedFileAstId, Span, SpanAnchor, SyntaxContextId, ROOT_ERASED_FILE_AST_ID};
-use syntax::{ast::HasModuleItem, AstNode, TextRange, TextSize};
+//! Span maps for real files and macro expansions.
+use span::Span;
+use syntax::TextRange;
use triomphe::Arc;
-use crate::db::ExpandDatabase;
+pub use span::RealSpanMap;
pub type ExpansionSpanMap = span::SpanMap<Span>;
@@ -39,11 +34,6 @@ impl mbe::SpanMapper<Span> for SpanMapRef<'_> {
self.span_for_range(range)
}
}
-impl mbe::SpanMapper<Span> for RealSpanMap {
- fn span_for(&self, range: TextRange) -> Span {
- self.span_for_range(range)
- }
-}
impl SpanMap {
pub fn span_for_range(&self, range: TextRange) -> Span {
@@ -69,57 +59,3 @@ impl SpanMapRef<'_> {
}
}
}
-
-#[derive(PartialEq, Eq, Hash, Debug)]
-pub struct RealSpanMap {
- file_id: FileId,
- /// Invariant: Sorted vec over TextSize
- // FIXME: SortedVec<(TextSize, ErasedFileAstId)>?
- pairs: Box<[(TextSize, ErasedFileAstId)]>,
- end: TextSize,
-}
-
-impl RealSpanMap {
- /// Creates a real file span map that returns absolute ranges (relative ranges to the root ast id).
- pub fn absolute(file_id: FileId) -> Self {
- RealSpanMap {
- file_id,
- pairs: Box::from([(TextSize::new(0), ROOT_ERASED_FILE_AST_ID)]),
- end: TextSize::new(!0),
- }
- }
-
- pub fn from_file(db: &dyn ExpandDatabase, file_id: FileId) -> Self {
- let mut pairs = vec![(TextSize::new(0), ROOT_ERASED_FILE_AST_ID)];
- let ast_id_map = db.ast_id_map(file_id.into());
- let tree = db.parse(file_id).tree();
- pairs
- .extend(tree.items().map(|item| {
- (item.syntax().text_range().start(), ast_id_map.ast_id(&item).erase())
- }));
- RealSpanMap {
- file_id,
- pairs: pairs.into_boxed_slice(),
- end: tree.syntax().text_range().end(),
- }
- }
-
- pub fn span_for_range(&self, range: TextRange) -> Span {
- assert!(
- range.end() <= self.end,
- "range {range:?} goes beyond the end of the file {:?}",
- self.end
- );
- let start = range.start();
- let idx = self
- .pairs
- .binary_search_by(|&(it, _)| it.cmp(&start).then(std::cmp::Ordering::Less))
- .unwrap_err();
- let (offset, ast_id) = self.pairs[idx - 1];
- Span {
- range: range - offset,
- anchor: SpanAnchor { file_id: self.file_id, ast_id },
- ctx: SyntaxContextId::ROOT,
- }
- }
-}