language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 05:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add TokenTextRange

Browse source
This commit is contained in:
Edwin Cheng 2019-12-13 23:55:51 +08:00
parent 59295854f8
commit 320416d756
2 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -227,7 +227,7 @@ impl ExpansionInfo {
let token_id = self.macro_arg.1.token_by_range(range)?;
let token_id = self.macro_def.0.map_id_down(token_id);
let range = self.exp_map.range_by_token(token_id)?;
let range = self.exp_map.range_by_token(token_id)?.range(token.value.kind())?;
let token = algo::find_covering_element(&self.expanded.value, range).into_token()?;
@ -248,7 +248,7 @@ impl ExpansionInfo {
}
};
let range = token_map.range_by_token(token_id)?;
let range = token_map.range_by_token(token_id)?.range(token.value.kind())?;
let token = algo::find_covering_element(&tt.value, range + tt.value.text_range().start())
.into_token()?;
Some((tt.with_value(token), origin))