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

Encode closing delimiter span in FlatTrees

Browse source
This commit is contained in:
Lukas Wirth 2023-04-14 10:34:41 +02:00
parent 3c7b6716d1
commit 9fb1b04826
5 changed files with 68 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/proc-macro-srv/src/lib.rs
View file

@ -31,7 +31,10 @@ use std::{
time::SystemTime,
};
use proc_macro_api::{msg, ProcMacroKind};
use proc_macro_api::{
msg::{self, CURRENT_API_VERSION},
ProcMacroKind,
};
use ::tt::token_id as tt;
@ -67,8 +70,8 @@ impl ProcMacroSrv {
None => None,
};
let macro_body = task.macro_body.to_subtree();
let attributes = task.attributes.map(|it| it.to_subtree());
let macro_body = task.macro_body.to_subtree(CURRENT_API_VERSION);
let attributes = task.attributes.map(|it| it.to_subtree(CURRENT_API_VERSION));
let result = thread::scope(|s| {
let thread = thread::Builder::new()
.stack_size(EXPANDER_STACK_SIZE)
@ -76,7 +79,7 @@ impl ProcMacroSrv {
.spawn_scoped(s, || {
expander
.expand(&task.macro_name, &macro_body, attributes.as_ref())
.map(|it| msg::FlatTree::new(&it))
.map(|it| msg::FlatTree::new(&it, CURRENT_API_VERSION))
});
let res = match thread {
Ok(handle) => handle.join(),