diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-04 17:21:41 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-11-04 17:21:41 +0000 |
| commit | d9fb01f803671bfb6fca6b873bd140d8177ecb1c (patch) | |
| tree | 9a1a0b696749d4d079ff0744272f78f497caae29 /crates/ra_lsp_server/src/main_loop/pending_requests.rs | |
| parent | cc2d75d0f88bdcb1b3e20db36decb6ee6eca517a (diff) | |
| parent | a5839662f448602d6aa2d724432844fc2d08947e (diff) | |
Merge #2173
2173: MBE: Add TokenId shift in macro_rules r=matklad a=edwin0cheng
As discussed in #2169 , for fixing duplication TokenId during expansion :
> What we can do here is to re-number the tokens during expansion. Specifically:
> * when we create macro_rules, we note the highest id of the token we have as shift>
> * when we expand macro rules, if we need to output a token from definition, we just re-use its id
> * if we need to output a token from the argument, we increase its id by shift (so it's guaranteed to not to collide with anything from the definition)
> * finally, when we have a HirFileId of the expansion, we can look up the original value of shift and classify node to the arg/def by comparing it's id with shift.
>
This PR implement first 3 points of above solution.
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src/main_loop/pending_requests.rs')
0 files changed, 0 insertions, 0 deletions