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

fix: Fix proc-macro server crashing when parsing a non-lexable string into a TokenStream

Browse source
This commit is contained in:
Lukas Wirth 2024-08-29 08:08:00 +02:00
parent 6f3356d0dd
commit d6666b16c4
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/proc-macro-srv/src/server_impl/token_id.rs
View file

@ -131,7 +131,13 @@ impl server::TokenStream for TokenIdServer {
stream.is_empty()
}
fn from_str(&mut self, src: &str) -> Self::TokenStream {
Self::TokenStream::from_str(src, self.call_site).expect("cannot parse string")
Self::TokenStream::from_str(src, self.call_site).unwrap_or_else(|e| {
Self::TokenStream::from_str(
&format!("compile_error!(\"failed to parse str to token stream: {e}\")"),
self.call_site,
)
.unwrap()
})
}
fn to_string(&mut self, stream: &Self::TokenStream) -> String {
stream.to_string()