bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/proc-macro-api/src/process.rs')
-rw-r--r--crates/proc-macro-api/src/process.rs32
1 files changed, 23 insertions, 9 deletions
diff --git a/crates/proc-macro-api/src/process.rs b/crates/proc-macro-api/src/process.rs
index 96f97bf5e2..72f95643c8 100644
--- a/crates/proc-macro-api/src/process.rs
+++ b/crates/proc-macro-api/src/process.rs
@@ -7,6 +7,7 @@ use std::{
};
use paths::{AbsPath, AbsPathBuf};
+use rustc_hash::FxHashMap;
use stdx::JodChild;
use crate::{
@@ -26,9 +27,12 @@ pub(crate) struct ProcMacroProcessSrv {
}
impl ProcMacroProcessSrv {
- pub(crate) fn run(process_path: AbsPathBuf) -> io::Result<ProcMacroProcessSrv> {
+ pub(crate) fn run(
+ process_path: AbsPathBuf,
+ env: &FxHashMap<String, String>,
+ ) -> io::Result<ProcMacroProcessSrv> {
let create_srv = |null_stderr| {
- let mut process = Process::run(process_path.clone(), null_stderr)?;
+ let mut process = Process::run(process_path.clone(), env, null_stderr)?;
let (stdin, stdout) = process.stdio().expect("couldn't access child stdio");
io::Result::Ok(ProcMacroProcessSrv {
@@ -41,7 +45,7 @@ impl ProcMacroProcessSrv {
})
};
let mut srv = create_srv(true)?;
- tracing::info!("sending version check");
+ tracing::info!("sending proc-macro server version check");
match srv.version_check() {
Ok(v) if v > CURRENT_API_VERSION => Err(io::Error::new(
io::ErrorKind::Other,
@@ -51,14 +55,15 @@ impl ProcMacroProcessSrv {
),
)),
Ok(v) => {
- tracing::info!("got version {v}");
+ tracing::info!("Proc-macro server version: {v}");
srv = create_srv(false)?;
srv.version = v;
- if srv.version > RUST_ANALYZER_SPAN_SUPPORT {
+ if srv.version >= RUST_ANALYZER_SPAN_SUPPORT {
if let Ok(mode) = srv.enable_rust_analyzer_spans() {
srv.mode = mode;
}
}
+ tracing::info!("Proc-macro server span mode: {:?}", srv.mode);
Ok(srv)
}
Err(e) => {
@@ -147,8 +152,12 @@ struct Process {
}
impl Process {
- fn run(path: AbsPathBuf, null_stderr: bool) -> io::Result<Process> {
- let child = JodChild(mk_child(&path, null_stderr)?);
+ fn run(
+ path: AbsPathBuf,
+ env: &FxHashMap<String, String>,
+ null_stderr: bool,
+ ) -> io::Result<Process> {
+ let child = JodChild(mk_child(&path, env, null_stderr)?);
Ok(Process { child })
}
@@ -161,9 +170,14 @@ impl Process {
}
}
-fn mk_child(path: &AbsPath, null_stderr: bool) -> io::Result<Child> {
+fn mk_child(
+ path: &AbsPath,
+ env: &FxHashMap<String, String>,
+ null_stderr: bool,
+) -> io::Result<Child> {
let mut cmd = Command::new(path.as_os_str());
- cmd.env("RUST_ANALYZER_INTERNALS_DO_NOT_USE", "this is unstable")
+ cmd.envs(env)
+ .env("RUST_ANALYZER_INTERNALS_DO_NOT_USE", "this is unstable")
.stdin(Stdio::piped())
.stdout(Stdio::piped())
.stderr(if null_stderr { Stdio::null() } else { Stdio::inherit() });