From 4cc59d1b429949cca3ac97a275795c9b874c0948 Mon Sep 17 00:00:00 2001
From: Dongdong Zhou <dzhou121@gmail.com>
Date: Wed, 17 Aug 2022 19:22:47 +0100
Subject: [PATCH] shutdown lapce-proxy

---
 lapce-data/src/proxy.rs     | 5 ++---
 lapce-proxy/src/dispatch.rs | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lapce-data/src/proxy.rs b/lapce-data/src/proxy.rs
index f7c62f8e..4f3dfc09 100644
--- a/lapce-data/src/proxy.rs
+++ b/lapce-data/src/proxy.rs
@@ -243,7 +243,6 @@ pub fn new(
                 disabled_volts,
                 plugin_configurations,
             );
-            println!("proxy stopped");
             let _ = event_sink.submit_command(
                 LAPCE_UI_COMMAND,
                 LapceUICommand::ProxyUpdateStatus(ProxyStatus::Disconnected),
@@ -401,8 +400,6 @@ fn start_remote(&self, remote: impl Remote) -> Result<()> {
                 .ok_or_else(|| anyhow!("can't find stdout"))?,
         );
 
-        println!("started remote proxy");
-
         let (writer_tx, writer_rx) = crossbeam_channel::unbounded();
         let (reader_tx, reader_rx) = crossbeam_channel::unbounded();
         stdio_transport(stdin, writer_rx, stdout, reader_tx);
@@ -419,6 +416,8 @@ fn start_remote(&self, remote: impl Remote) -> Result<()> {
                         let _ = local_writer_tx.send(RpcMessage::Notification(rpc));
                     }
                     ProxyRpc::Shutdown => {
+                        let _ = child.kill();
+                        let _ = child.wait();
                         return;
                     }
                 }
diff --git a/lapce-proxy/src/dispatch.rs b/lapce-proxy/src/dispatch.rs
index cacb58b9..ca292199 100644
--- a/lapce-proxy/src/dispatch.rs
+++ b/lapce-proxy/src/dispatch.rs
@@ -105,6 +105,7 @@ fn handle_notification(&mut self, rpc: ProxyNotification) {
                     #[allow(deprecated)]
                     let _ = sender.send(Msg::Shutdown);
                 }
+                self.proxy_rpc.shutdown();
             }
             Update { path, delta, rev } => {
                 let buffer = self.buffers.get_mut(&path).unwrap();