squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Only allow one proc-macro process

Browse source
This commit is contained in:
Edwin Cheng 2021-02-02 04:55:17 +08:00
parent 379b677559
commit 4adf13e2ef
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
crates/rust-analyzer/src/reload.rs
View file

@ -269,20 +269,22 @@ impl GlobalState {
let project_folders =
ProjectFolders::new(&workspaces, &files_config.exclude, workspace_build_data.as_ref());
self.proc_macro_client = match self.config.proc_macro_srv() {
None => None,
Some((path, args)) => match ProcMacroClient::extern_process(path.clone(), args) {
Ok(it) => Some(it),
Err(err) => {
log::error!(
"Failed to run proc_macro_srv from path {}, error: {:?}",
path.display(),
err
);
None
}
},
};
if self.proc_macro_client.is_none() {
self.proc_macro_client = match self.config.proc_macro_srv() {
None => None,
Some((path, args)) => match ProcMacroClient::extern_process(path.clone(), args) {
Ok(it) => Some(it),
Err(err) => {
log::error!(
"Failed to run proc_macro_srv from path {}, error: {:?}",
path.display(),
err
);
None
}
},
};
}
let watch = match files_config.watcher {
FilesWatcher::Client => vec![],