language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 21:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix original_source find order

Browse source
This commit is contained in:
Edwin Cheng 2019-12-15 01:20:07 +08:00
parent 7238037de4
commit 61360fdfec
5 changed files with 109 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

29
crates/ra_hir_expand/src/lib.rs
View file

@ -214,7 +214,17 @@ pub struct ExpansionInfo {
exp_map: Arc<mbe::TokenMap>,
}
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum ExpansionOrigin {
Call,
Def,
}
impl ExpansionInfo {
pub fn call_node(&self) -> Option<InFile<SyntaxNode>> {
Some(self.arg.with_value(self.arg.value.parent()?))
}
pub fn map_token_down(&self, token: InFile<&SyntaxToken>) -> Option<InFile<SyntaxToken>> {
assert_eq!(token.file_id, self.arg.file_id);
let range = token.value.text_range().checked_sub(self.arg.value.text_range().start())?;
@ -228,21 +238,26 @@ impl ExpansionInfo {
Some(self.expanded.with_value(token))
}
pub fn map_token_up(&self, token: InFile<&SyntaxToken>) -> Option<InFile<SyntaxToken>> {
pub fn map_token_up(
&self,
token: InFile<&SyntaxToken>,
) -> Option<(InFile<SyntaxToken>, ExpansionOrigin)> {
let token_id = self.exp_map.token_by_range(token.value.text_range())?;
let (token_id, origin) = self.macro_def.0.map_id_up(token_id);
let (token_map, tt) = match origin {
mbe::Origin::Call => (&self.macro_arg.1, self.arg.clone()),
mbe::Origin::Def => {
(&self.macro_def.1, self.def.as_ref().map(|tt| tt.syntax().clone()))
}
let (token_map, tt, origin) = match origin {
mbe::Origin::Call => (&self.macro_arg.1, self.arg.clone(), ExpansionOrigin::Call),
mbe::Origin::Def => (
&self.macro_def.1,
self.def.as_ref().map(|tt| tt.syntax().clone()),
ExpansionOrigin::Def,
),
};
let range = token_map.range_by_token(token_id)?;
let token = algo::find_covering_element(&tt.value, range + tt.value.text_range().start())
.into_token()?;
Some(tt.with_value(token))
Some((tt.with_value(token), origin))
}
}