diff options
| author | Edwin Cheng <[email protected]> | 2019-12-13 15:55:51 +0000 |
|---|---|---|
| committer | Edwin Cheng <[email protected]> | 2019-12-18 03:20:22 +0000 |
| commit | 320416d7561e9926ecbbc392cc2efd48740610e0 (patch) | |
| tree | f20bbcfca5e079582ecd6ea87b2b4972b34fe7f2 /crates/ra_hir_expand | |
| parent | 59295854f892b0a8f42a6fbc80b04d1f1c695828 (diff) | |
Add TokenTextRange
Diffstat (limited to 'crates/ra_hir_expand')
| -rw-r--r-- | crates/ra_hir_expand/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs index cb4e1950b..720a29ea5 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs | |||
| @@ -227,7 +227,7 @@ impl ExpansionInfo { | |||
| 227 | let token_id = self.macro_arg.1.token_by_range(range)?; | 227 | let token_id = self.macro_arg.1.token_by_range(range)?; |
| 228 | let token_id = self.macro_def.0.map_id_down(token_id); | 228 | let token_id = self.macro_def.0.map_id_down(token_id); |
| 229 | 229 | ||
| 230 | let range = self.exp_map.range_by_token(token_id)?; | 230 | let range = self.exp_map.range_by_token(token_id)?.range(token.value.kind())?; |
| 231 | 231 | ||
| 232 | let token = algo::find_covering_element(&self.expanded.value, range).into_token()?; | 232 | let token = algo::find_covering_element(&self.expanded.value, range).into_token()?; |
| 233 | 233 | ||
| @@ -248,7 +248,7 @@ impl ExpansionInfo { | |||
| 248 | } | 248 | } |
| 249 | }; | 249 | }; |
| 250 | 250 | ||
| 251 | let range = token_map.range_by_token(token_id)?; | 251 | let range = token_map.range_by_token(token_id)?.range(token.value.kind())?; |
| 252 | let token = algo::find_covering_element(&tt.value, range + tt.value.text_range().start()) | 252 | let token = algo::find_covering_element(&tt.value, range + tt.value.text_range().start()) |
| 253 | .into_token()?; | 253 | .into_token()?; |
| 254 | Some((tt.with_value(token), origin)) | 254 | Some((tt.with_value(token), origin)) |