From 4c90b7e2ecd03e739a3c92bbe5afd4c90fe2812d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 15 Nov 2019 23:24:56 +0300 Subject: Sourcify some things If we want to support macros properly, we need to get rid of those FileIds everywhere... --- crates/ra_hir_expand/src/lib.rs | 4 ++++ 1 file changed, 4 insertions(+) (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 930789b0f..437d73e94 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -230,6 +230,10 @@ pub struct Source { } impl Source { + pub fn new(file_id: HirFileId, ast: T) -> Source { + Source { file_id, ast } + } + pub fn map U, U>(self, f: F) -> Source { Source { file_id: self.file_id, ast: f(self.ast) } } -- cgit v1.2.3 From bd8af6a413bb2f762bb696d20727e21cb2d4cb62 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 16 Nov 2019 00:05:10 +0300 Subject: Sourcify some more --- crates/ra_hir_expand/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) (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 437d73e94..6c2cc3af3 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -226,6 +226,8 @@ impl AstId { #[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)] pub struct Source { pub file_id: HirFileId, + // FIXME: this stores all kind of things, not only `ast`. + // There should be a better name... pub ast: T, } -- cgit v1.2.3 From 0404e647e69f758ac84c742b06dddefb01cc4ad6 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 16 Nov 2019 00:40:54 +0300 Subject: Prepare SourceAnalyzer for macros --- crates/ra_hir_expand/src/lib.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 6c2cc3af3..26531cb05 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -223,6 +223,7 @@ impl AstId { } } +/// FIXME: https://github.com/matklad/with ? #[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)] pub struct Source { pub file_id: HirFileId, @@ -236,11 +237,16 @@ impl Source { Source { file_id, ast } } + // Similarly, naming here is stupid... + pub fn with_ast(&self, ast: U) -> Source { + Source::new(self.file_id, ast) + } + pub fn map U, U>(self, f: F) -> Source { - Source { file_id: self.file_id, ast: f(self.ast) } + Source::new(self.file_id, f(self.ast)) } pub fn as_ref(&self) -> Source<&T> { - Source { file_id: self.file_id, ast: &self.ast } + self.with_ast(&self.ast) } pub fn file_syntax(&self, db: &impl db::AstDatabase) -> SyntaxNode { db.parse_or_expand(self.file_id).expect("source created from invalid file") -- cgit v1.2.3 From 2eaa8c94a8a6b5cd86139c5e010ae95268b28658 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 16 Nov 2019 16:49:26 +0300 Subject: Goto definition works inside macros --- crates/ra_hir_expand/src/lib.rs | 9 +++++++++ 1 file changed, 9 insertions(+) (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 26531cb05..6bfbb2f79 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -160,6 +160,15 @@ pub struct ExpansionInfo { } impl ExpansionInfo { + pub fn translate_offset(&self, offset: TextUnit) -> Option { + let offset = offset.checked_sub(self.arg_start.1)?; + let token_id = self.macro_arg.1.token_by_offset(offset)?; + let token_id = tt::TokenId(token_id.0 + self.shift); + + let (r, _) = self.exp_map.ranges.iter().find(|(_, tid)| *tid == token_id)?; + Some(r.start()) + } + pub fn find_range(&self, from: TextRange) -> Option<(HirFileId, TextRange)> { let token_id = look_in_rev_map(&self.exp_map, from)?; -- cgit v1.2.3 From 6a70bff4518dc60a1d5bcdc5adfed751295dbd88 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 17 Nov 2019 18:22:34 +0300 Subject: Don't store shift redundantly --- crates/ra_hir_expand/src/lib.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 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 6bfbb2f79..1774cb58b 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -83,14 +83,13 @@ impl HirFileId { loc.def.ast_id.to_node(db).token_tree()?.syntax().text_range().start(); let macro_def = db.macro_def(loc.def)?; - let shift = macro_def.0.shift(); let exp_map = db.parse_macro(macro_file)?.1; 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 { arg_start, def_start, macro_arg, macro_def, exp_map, shift }) + Some(ExpansionInfo { arg_start, def_start, macro_arg, macro_def, exp_map }) } } } @@ -152,7 +151,6 @@ impl MacroCallId { pub struct ExpansionInfo { pub(crate) arg_start: (HirFileId, TextUnit), pub(crate) def_start: (HirFileId, TextUnit), - pub(crate) shift: u32, pub(crate) macro_def: Arc<(db::TokenExpander, mbe::TokenMap)>, pub(crate) macro_arg: Arc<(tt::Subtree, mbe::TokenMap)>, @@ -163,7 +161,7 @@ impl ExpansionInfo { pub fn translate_offset(&self, offset: TextUnit) -> Option { let offset = offset.checked_sub(self.arg_start.1)?; let token_id = self.macro_arg.1.token_by_offset(offset)?; - let token_id = tt::TokenId(token_id.0 + self.shift); + let token_id = tt::TokenId(token_id.0 + self.macro_def.0.shift()); let (r, _) = self.exp_map.ranges.iter().find(|(_, tid)| *tid == token_id)?; Some(r.start()) @@ -172,8 +170,9 @@ impl ExpansionInfo { pub fn find_range(&self, from: TextRange) -> Option<(HirFileId, TextRange)> { let token_id = look_in_rev_map(&self.exp_map, from)?; - let (token_map, (file_id, start_offset), token_id) = if token_id.0 >= self.shift { - (&self.macro_arg.1, self.arg_start, tt::TokenId(token_id.0 - self.shift).into()) + let shift = self.macro_def.0.shift(); + let (token_map, (file_id, start_offset), token_id) = if token_id.0 >= shift { + (&self.macro_arg.1, self.arg_start, tt::TokenId(token_id.0 - shift).into()) } else { (&self.macro_def.1, self.def_start, token_id) }; -- cgit v1.2.3 From c8f858d04323f93a4bacb143d92c976b2bc1e179 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 17 Nov 2019 19:11:43 +0300 Subject: Make shift an implementation detail of mbe --- crates/ra_hir_expand/src/db.rs | 13 ++++++++++--- crates/ra_hir_expand/src/lib.rs | 12 ++++++------ 2 files changed, 16 insertions(+), 9 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 5eadee9c2..9de7c1ea8 100644 --- a/crates/ra_hir_expand/src/db.rs +++ b/crates/ra_hir_expand/src/db.rs @@ -32,10 +32,17 @@ impl TokenExpander { } } - pub fn shift(&self) -> u32 { + pub fn map_id_down(&self, id: tt::TokenId) -> tt::TokenId { match self { - TokenExpander::MacroRules(it) => it.shift(), - TokenExpander::Builtin(_) => 0, + TokenExpander::MacroRules(it) => it.map_id_down(id), + TokenExpander::Builtin(..) => id, + } + } + + pub fn map_id_up(&self, id: tt::TokenId) -> (tt::TokenId, mbe::Origin) { + match self { + TokenExpander::MacroRules(it) => it.map_id_up(id), + TokenExpander::Builtin(..) => (id, mbe::Origin::Def), } } } diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs index 1774cb58b..5927a03ba 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -161,7 +161,7 @@ impl ExpansionInfo { pub fn translate_offset(&self, offset: TextUnit) -> Option { let offset = offset.checked_sub(self.arg_start.1)?; let token_id = self.macro_arg.1.token_by_offset(offset)?; - let token_id = tt::TokenId(token_id.0 + self.macro_def.0.shift()); + let token_id = self.macro_def.0.map_id_down(token_id); let (r, _) = self.exp_map.ranges.iter().find(|(_, tid)| *tid == token_id)?; Some(r.start()) @@ -170,11 +170,11 @@ impl ExpansionInfo { pub fn find_range(&self, from: TextRange) -> Option<(HirFileId, TextRange)> { let token_id = look_in_rev_map(&self.exp_map, from)?; - let shift = self.macro_def.0.shift(); - let (token_map, (file_id, start_offset), token_id) = if token_id.0 >= shift { - (&self.macro_arg.1, self.arg_start, tt::TokenId(token_id.0 - shift).into()) - } else { - (&self.macro_def.1, self.def_start, token_id) + 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 range = token_map.relative_range_of(token_id)?; -- cgit v1.2.3 From fd52d721e1ed9794048d63e546f43805d24d7ab8 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 17 Nov 2019 20:15:55 +0300 Subject: More correct expansion mapping We can't really map arbitrary ranges, we only can map tokens --- crates/ra_hir_expand/src/lib.rs | 44 ++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 14 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 5927a03ba..57e2e6cb1 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs @@ -18,8 +18,9 @@ use std::sync::Arc; use ra_db::{salsa, CrateId, FileId}; use ra_syntax::{ + algo, ast::{self, AstNode}, - SyntaxNode, TextRange, TextUnit, + SyntaxNode, SyntaxToken, TextRange, TextUnit, }; use crate::ast_id_map::FileAstId; @@ -83,13 +84,21 @@ impl HirFileId { loc.def.ast_id.to_node(db).token_tree()?.syntax().text_range().start(); let macro_def = db.macro_def(loc.def)?; - let exp_map = db.parse_macro(macro_file)?.1; + 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 { arg_start, def_start, macro_arg, macro_def, exp_map }) + Some(ExpansionInfo { + expanded, + arg_start, + def_start, + macro_arg, + macro_def, + exp_map, + }) } } } @@ -146,27 +155,34 @@ impl MacroCallId { } } -#[derive(Debug, Clone, PartialEq, Eq)] /// ExpansionInfo mainly describes how to map text range between src and expanded macro +#[derive(Debug, Clone, PartialEq, Eq)] pub struct ExpansionInfo { - pub(crate) arg_start: (HirFileId, TextUnit), - pub(crate) def_start: (HirFileId, TextUnit), + expanded: Source, + arg_start: (HirFileId, TextUnit), + def_start: (HirFileId, TextUnit), - pub(crate) macro_def: Arc<(db::TokenExpander, mbe::TokenMap)>, - pub(crate) macro_arg: Arc<(tt::Subtree, mbe::TokenMap)>, - pub(crate) exp_map: Arc, + macro_def: Arc<(db::TokenExpander, mbe::TokenMap)>, + macro_arg: Arc<(tt::Subtree, mbe::TokenMap)>, + exp_map: Arc, } impl ExpansionInfo { - pub fn translate_offset(&self, offset: TextUnit) -> Option { - let offset = offset.checked_sub(self.arg_start.1)?; - let token_id = self.macro_arg.1.token_by_offset(offset)?; + 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)?; + let token_id = self.macro_arg.1.token_by_range(range)?; let token_id = self.macro_def.0.map_id_down(token_id); - let (r, _) = self.exp_map.ranges.iter().find(|(_, tid)| *tid == token_id)?; - Some(r.start()) + let range = self.exp_map.range_by_token(token_id)?; + + let token = algo::find_covering_element(&self.expanded.ast, range).into_token()?; + + 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)?; -- cgit v1.2.3