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

Merge commit '7219414e81' into sync-from-ra

Browse source
This commit is contained in:
Laurențiu Nicola 2024-01-28 15:56:54 +02:00
parent 858f4aca6c
commit f43cea0878
78 changed files with 1391 additions and 2797 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,8 +21,8 @@ extern crate proc_macro;
extern crate rustc_driver as _;
mod dylib;
mod server;
mod proc_macros;
mod server;
use std::{
collections::{hash_map::Entry, HashMap},

2
crates/proc-macro-srv/src/server.rs
View file

@ -13,9 +13,9 @@ use proc_macro::bridge;
mod token_stream;
pub use token_stream::TokenStream;
pub mod token_id;
pub mod rust_analyzer_span;
mod symbol;
pub mod token_id;
pub use symbol::*;
use tt::Spacing;

2
crates/proc-macro-srv/src/server/token_id.rs
View file

@ -206,7 +206,7 @@ impl server::TokenStream for TokenIdServer {
stream: if subtree.token_trees.is_empty() {
None
} else {
Some(subtree.token_trees.into_iter().collect())
Some(TokenStream { token_trees: subtree.token_trees })
},
span: bridge::DelimSpan::from_single(subtree.delimiter.open),
}),