user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19839 from ChayimFriedman2/inlay-hints-attr

Browse source 
fix: Correctly set the span of the proc_macro crate's Group delimiters
This commit is contained in:
Lukas Wirth 2025-05-21 18:43:35 +00:00 • committed by GitHub
commit 2580d833a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
View file

@ -258,7 +258,9 @@ impl server::TokenStream for RaSpanServer {
&mut self,
stream: Self::TokenStream,
) -> Vec<bridge::TokenTree<Self::TokenStream, Self::Span, Self::Symbol>> {
stream.into_bridge()
stream.into_bridge(&mut |first, second| {
server::Span::join(self, first, second).unwrap_or(first)
})
}
}

3
src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/token_id.rs
View file

@ -238,7 +238,8 @@ impl server::TokenStream for TokenIdServer {
&mut self,
stream: Self::TokenStream,
) -> Vec<bridge::TokenTree<Self::TokenStream, Self::Span, Self::Symbol>> {
stream.into_bridge()
// Can't join with `TokenId`.
stream.into_bridge(&mut |first, _second| first)
}
}

11
src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/token_stream.rs
View file

@ -56,7 +56,10 @@ impl<S: Copy> TokenStream<S> {
self.token_trees.is_empty()
}
pub(crate) fn into_bridge(self) -> Vec<bridge::TokenTree<Self, S, intern::Symbol>> {
pub(crate) fn into_bridge(
self,
join_spans: &mut dyn FnMut(S, S) -> S,
) -> Vec<bridge::TokenTree<Self, S, intern::Symbol>> {
let mut result = Vec::new();
let mut iter = self.token_trees.into_iter();
while let Some(tree) = iter.next() {
@ -98,7 +101,11 @@ impl<S: Copy> TokenStream<S> {
token_trees: iter.by_ref().take(subtree.usize_len()).collect(),
})
},
span: bridge::DelimSpan::from_single(subtree.delimiter.open),
span: bridge::DelimSpan {
open: subtree.delimiter.open,
close: subtree.delimiter.close,
entire: join_spans(subtree.delimiter.open, subtree.delimiter.close),
},
}))
}
}

2
src/tools/rust-analyzer/crates/proc-macro-srv/src/tests/mod.rs
View file

@ -144,7 +144,7 @@ fn test_fn_like_macro_clone_ident_subtree() {
SUBTREE $$ 42:2@0..100#ROOT2024 42:2@0..100#ROOT2024
IDENT ident 42:2@0..5#ROOT2024
PUNCH , [alone] 42:2@5..6#ROOT2024
SUBTREE [] 42:2@7..8#ROOT2024 42:2@7..8#ROOT2024"#]],
SUBTREE [] 42:2@7..9#ROOT2024 42:2@7..9#ROOT2024"#]],
);
}