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

Reorganize proc-macro-srv

Browse source
This commit is contained in:
Lukas Wirth 2025-07-31 09:53:26 +02:00
parent a7a365e8f8
commit 218e00d0bb
5 changed files with 131 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/proc-macro-srv-cli/src/main_loop.rs
View file

@ -24,13 +24,13 @@ impl SpanTransformer for SpanTrans {
_: &mut Self::Table,
span: Self::Span,
) -> proc_macro_api::legacy_protocol::SpanId {
proc_macro_api::legacy_protocol::SpanId(span.0 as u32)
proc_macro_api::legacy_protocol::SpanId(span.0)
}
fn span_for_token_id(
_: &Self::Table,
id: proc_macro_api::legacy_protocol::SpanId,
) -> Self::Span {
SpanId(id.0 as u32)
SpanId(id.0)
}
}
@ -99,7 +99,7 @@ fn run_json() -> io::Result<()> {
lib,
&env,
current_dir,
macro_name,
&macro_name,
macro_body,
attributes,
def_site,
@ -112,6 +112,7 @@ fn run_json() -> io::Result<()> {
CURRENT_API_VERSION,
)
})
.map_err(|e| e.into_string().unwrap_or_default())
.map_err(msg::PanicMessage)
}),
SpanMode::RustAnalyzer => msg::Response::ExpandMacroExtended({
@ -130,7 +131,7 @@ fn run_json() -> io::Result<()> {
lib,
&env,
current_dir,
macro_name,
&macro_name,
macro_body,
attributes,
def_site,
@ -151,6 +152,7 @@ fn run_json() -> io::Result<()> {
tree,
span_data_table,
})
.map_err(|e| e.into_string().unwrap_or_default())
.map_err(msg::PanicMessage)
}),
}