language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Improve shutdown process

Browse source
This commit is contained in:
Edwin Cheng 2020-03-27 12:55:58 +08:00
parent 1b8a26653f
commit 55061b489f
2 changed files with 54 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ra_proc_macro/src/lib.rs
View file

@ -9,7 +9,7 @@ mod rpc;
mod process;
pub mod msg;
use process::ProcMacroProcessSrv;
use process::{ProcMacroProcessSrv, ProcMacroProcessThread};
use ra_tt::{SmolStr, Subtree};
use rpc::ProcMacroKind;
use std::{
@ -45,21 +45,23 @@ impl ra_tt::TokenExpander for ProcMacroProcessExpander {
}
}
#[derive(Debug, Clone)]
#[derive(Debug)]
enum ProcMacroClientKind {
Process { process: Arc<ProcMacroProcessSrv> },
Process { process: Arc<ProcMacroProcessSrv>, thread: ProcMacroProcessThread },
Dummy,
}
#[derive(Debug, Clone)]
#[derive(Debug)]
pub struct ProcMacroClient {
kind: ProcMacroClientKind,
}
impl ProcMacroClient {
pub fn extern_process(process_path: &Path) -> Result<ProcMacroClient, std::io::Error> {
let process = ProcMacroProcessSrv::run(process_path)?;
Ok(ProcMacroClient { kind: ProcMacroClientKind::Process { process: Arc::new(process) } })
let (thread, process) = ProcMacroProcessSrv::run(process_path)?;
Ok(ProcMacroClient {
kind: ProcMacroClientKind::Process { process: Arc::new(process), thread },
})
}
pub fn dummy() -> ProcMacroClient {
@ -72,7 +74,7 @@ impl ProcMacroClient {
) -> Vec<(SmolStr, Arc<dyn ra_tt::TokenExpander>)> {
match &self.kind {
ProcMacroClientKind::Dummy => vec![],
ProcMacroClientKind::Process { process } => {
ProcMacroClientKind::Process { process, .. } => {
let macros = match process.find_proc_macros(dylib_path) {
Err(err) => {
eprintln!("Fail to find proc macro. Error: {:#?}", err);