From b79d6789236bb53c5818949cc2960b5c4991cbeb Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 18 Nov 2019 15:08:39 +0300 Subject: Token-based reverse-mapping --- crates/ra_hir_expand/src/lib.rs | 51 ++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 29 deletions(-) (limited to 'crates/ra_hir_expand/src') diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs index 57e2e6cb1..73ec1688c 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -20,7 +20,7 @@ use ra_db::{salsa, CrateId, FileId}; use ra_syntax::{ algo, ast::{self, AstNode}, - SyntaxNode, SyntaxToken, TextRange, TextUnit, + SyntaxNode, SyntaxToken, TextUnit, }; use crate::ast_id_map::FileAstId; @@ -79,22 +79,17 @@ impl HirFileId { HirFileIdRepr::MacroFile(macro_file) => { let loc: MacroCallLoc = db.lookup_intern_macro(macro_file.macro_call_id); - let arg_start = loc.ast_id.to_node(db).token_tree()?.syntax().text_range().start(); - let def_start = - loc.def.ast_id.to_node(db).token_tree()?.syntax().text_range().start(); + let arg_tt = loc.ast_id.to_node(db).token_tree()?; + let def_tt = loc.def.ast_id.to_node(db).token_tree()?; let macro_def = db.macro_def(loc.def)?; let (parse, exp_map) = db.parse_macro(macro_file)?; - let expanded = Source::new(self, parse.syntax_node()); let macro_arg = db.macro_arg(macro_file.macro_call_id)?; - let arg_start = (loc.ast_id.file_id, arg_start); - let def_start = (loc.def.ast_id.file_id, def_start); - Some(ExpansionInfo { - expanded, - arg_start, - def_start, + expanded: Source::new(self, parse.syntax_node()), + arg: Source::new(loc.ast_id.file_id, arg_tt), + def: Source::new(loc.ast_id.file_id, def_tt), macro_arg, macro_def, exp_map, @@ -159,8 +154,8 @@ impl MacroCallId { #[derive(Debug, Clone, PartialEq, Eq)] pub struct ExpansionInfo { expanded: Source, - arg_start: (HirFileId, TextUnit), - def_start: (HirFileId, TextUnit), + arg: Source, + def: Source, macro_def: Arc<(db::TokenExpander, mbe::TokenMap)>, macro_arg: Arc<(tt::Subtree, mbe::TokenMap)>, @@ -169,8 +164,9 @@ pub struct ExpansionInfo { impl ExpansionInfo { pub fn map_token_down(&self, token: Source<&SyntaxToken>) -> Option> { - assert_eq!(token.file_id, self.arg_start.0); - let range = token.ast.text_range().checked_sub(self.arg_start.1)?; + assert_eq!(token.file_id, self.arg.file_id); + let range = + token.ast.text_range().checked_sub(self.arg.ast.syntax().text_range().start())?; let token_id = self.macro_arg.1.token_by_range(range)?; let token_id = self.macro_def.0.map_id_down(token_id); @@ -181,25 +177,22 @@ impl ExpansionInfo { Some(self.expanded.with_ast(token)) } - // FIXME: a more correct signature would be - // `pub fn map_token_up(&self, token: Source<&SyntaxToken>) -> Option>` - pub fn find_range(&self, from: TextRange) -> Option<(HirFileId, TextRange)> { - let token_id = look_in_rev_map(&self.exp_map, from)?; + pub fn map_token_up(&self, token: Source<&SyntaxToken>) -> Option> { + let token_id = self.exp_map.token_by_range(token.ast.text_range())?; let (token_id, origin) = self.macro_def.0.map_id_up(token_id); - - let (token_map, (file_id, start_offset)) = match origin { - mbe::Origin::Call => (&self.macro_arg.1, self.arg_start), - mbe::Origin::Def => (&self.macro_def.1, self.def_start), + let (token_map, tt) = match origin { + mbe::Origin::Call => (&self.macro_arg.1, &self.arg), + mbe::Origin::Def => (&self.macro_def.1, &self.def), }; let range = token_map.relative_range_of(token_id)?; - - return Some((file_id, range + start_offset)); - - fn look_in_rev_map(exp_map: &mbe::RevTokenMap, from: TextRange) -> Option { - exp_map.ranges.iter().find(|&it| it.0.is_subrange(&from)).map(|it| it.1) - } + let token = algo::find_covering_element( + tt.ast.syntax(), + range + tt.ast.syntax().text_range().start(), + ) + .into_token()?; + Some(tt.with_ast(token)) } } -- cgit v1.2.3 From 2b6f1ab0e2303dce8e6e424514fd2a9e74566c89 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 18 Nov 2019 16:08:41 +0300 Subject: Collapse TokenMap and RevTokenMap --- crates/ra_hir_expand/src/db.rs | 8 +++----- crates/ra_hir_expand/src/lib.rs | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'crates/ra_hir_expand/src') diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs index 9de7c1ea8..3c11c8a22 100644 --- a/crates/ra_hir_expand/src/db.rs +++ b/crates/ra_hir_expand/src/db.rs @@ -59,10 +59,8 @@ pub trait AstDatabase: SourceDatabase { fn intern_macro(&self, macro_call: MacroCallLoc) -> MacroCallId; fn macro_arg(&self, id: MacroCallId) -> Option>; fn macro_def(&self, id: MacroDefId) -> Option>; - fn parse_macro( - &self, - macro_file: MacroFile, - ) -> Option<(Parse, Arc)>; + fn parse_macro(&self, macro_file: MacroFile) + -> Option<(Parse, Arc)>; fn macro_expand(&self, macro_call: MacroCallId) -> Result, String>; } @@ -136,7 +134,7 @@ pub(crate) fn parse_or_expand(db: &dyn AstDatabase, file_id: HirFileId) -> Optio pub(crate) fn parse_macro( db: &dyn AstDatabase, macro_file: MacroFile, -) -> Option<(Parse, Arc)> { +) -> Option<(Parse, Arc)> { let _p = profile("parse_macro_query"); let macro_call_id = macro_file.macro_call_id; diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs index 73ec1688c..cfe7e6d15 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -159,7 +159,7 @@ pub struct ExpansionInfo { macro_def: Arc<(db::TokenExpander, mbe::TokenMap)>, macro_arg: Arc<(tt::Subtree, mbe::TokenMap)>, - exp_map: Arc, + exp_map: Arc, } impl ExpansionInfo { @@ -186,7 +186,7 @@ impl ExpansionInfo { mbe::Origin::Def => (&self.macro_def.1, &self.def), }; - let range = token_map.relative_range_of(token_id)?; + let range = token_map.range_by_token(token_id)?; let token = algo::find_covering_element( tt.ast.syntax(), range + tt.ast.syntax().text_range().start(), -- cgit v1.2.3