Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lsp: Wait for shutdown response before sending exit notification (#33417)

Browse source 
Follow up: #18634

Closes #33328

Release Notes:

- Fixed language server shutdown process to prevent race conditions and
improper termination by waiting for shutdown confirmation before closing
connections.
This commit is contained in:
Umesh Yadav 2025-07-15 21:00:57 +05:30 • committed by GitHub
parent 0671a4d5ae
commit 5f3e7a5f91
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/lsp/src/lsp.rs
View file

@ -874,8 +874,6 @@ impl LanguageServer {
&executor, &executor,
(), (),
); );
let exit = Self::notify_internal::<notification::Exit>(&outbound_tx, &());
outbound_tx.close();
let server = self.server.clone(); let server = self.server.clone();
let name = self.name.clone(); let name = self.name.clone();
@ -901,7 +899,8 @@ impl LanguageServer {
} }
response_handlers.lock().take(); response_handlers.lock().take();
exit?; Self::notify_internal::<notification::Exit>(&outbound_tx, &()).ok();
outbound_tx.close();
output_done.recv().await; output_done.recv().await;
server.lock().take().map(|mut child| child.kill()); server.lock().take().map(|mut child| child.kill());
log::debug!("language server shutdown finished"); log::debug!("language server shutdown finished");
@ -1508,6 +1507,8 @@ impl FakeLanguageServer {
} }
}); });
fake.set_request_handler::<request::Shutdown, _, _>(|_, _| async move { Ok(()) });
(server, fake) (server, fake)
} }
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]

4
crates/vim/src/test.rs
View file

@ -1006,8 +1006,6 @@ async fn test_rename(cx: &mut gpui::TestAppContext) {
cx.assert_state("const afterˇ = 2; console.log(after)", Mode::Normal) cx.assert_state("const afterˇ = 2; console.log(after)", Mode::Normal)
} }
// TODO: this test is flaky on our linux CI machines
#[cfg(target_os = "macos")]
#[gpui::test] #[gpui::test]
async fn test_remap(cx: &mut gpui::TestAppContext) { async fn test_remap(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await; let mut cx = VimTestContext::new(cx, true).await;
@ -1048,8 +1046,6 @@ async fn test_remap(cx: &mut gpui::TestAppContext) {
cx.simulate_keystrokes("g x"); cx.simulate_keystrokes("g x");
cx.assert_state("1234fooˇ56789", Mode::Normal); cx.assert_state("1234fooˇ56789", Mode::Normal);
cx.executor().allow_parking();
// test command // test command
cx.update(|_, cx| { cx.update(|_, cx| {
cx.bind_keys([KeyBinding::new( cx.bind_keys([KeyBinding::new(