diff --git a/crates/debugger_tools/src/dap_log.rs b/crates/debugger_tools/src/dap_log.rs index 8a14b4b929..91b4b669f3 100644 --- a/crates/debugger_tools/src/dap_log.rs +++ b/crates/debugger_tools/src/dap_log.rs @@ -173,7 +173,7 @@ impl LogStore { project.read(cx).debug_client_for_id(client_id, cx), ); } - project::Event::DebugClientStopped(id) => { + project::Event::DebugClientShutdown(id) => { this.remove_debug_client(*id, cx); } diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rs index de63f816bf..f6c7307de5 100644 --- a/crates/debugger_ui/src/debugger_panel.rs +++ b/crates/debugger_ui/src/debugger_panel.rs @@ -43,7 +43,7 @@ pub enum DebugPanelEvent { Output((DebugAdapterClientId, OutputEvent)), Module((DebugAdapterClientId, ModuleEvent)), LoadedSource((DebugAdapterClientId, LoadedSourceEvent)), - ClientStopped(DebugAdapterClientId), + ClientShutdown(DebugAdapterClientId), CapabilitiesChanged(DebugAdapterClientId), } @@ -174,8 +174,8 @@ impl DebugPanel { } _ => unreachable!(), }, - project::Event::DebugClientStopped(client_id) => { - cx.emit(DebugPanelEvent::ClientStopped(*client_id)); + project::Event::DebugClientShutdown(client_id) => { + cx.emit(DebugPanelEvent::ClientShutdown(*client_id)); this.message_queue.remove(client_id); this.thread_states diff --git a/crates/debugger_ui/src/debugger_panel_item.rs b/crates/debugger_ui/src/debugger_panel_item.rs index dcaaffe699..2e56d1b483 100644 --- a/crates/debugger_ui/src/debugger_panel_item.rs +++ b/crates/debugger_ui/src/debugger_panel_item.rs @@ -141,8 +141,8 @@ impl DebugPanelItem { DebugPanelEvent::LoadedSource((client_id, event)) => { this.handle_loaded_source_event(client_id, event, cx) } - DebugPanelEvent::ClientStopped(client_id) => { - this.handle_client_stopped_event(client_id, cx) + DebugPanelEvent::ClientShutdown(client_id) => { + this.handle_client_shutdown_event(client_id, cx) } DebugPanelEvent::Continued((client_id, event)) => { this.handle_thread_continued_event(client_id, event, cx); @@ -378,7 +378,7 @@ impl DebugPanelItem { }); } - fn handle_client_stopped_event( + fn handle_client_shutdown_event( &mut self, client_id: &DebugAdapterClientId, cx: &mut ViewContext, diff --git a/crates/project/src/dap_store.rs b/crates/project/src/dap_store.rs index 48047cfc79..5727e9d424 100644 --- a/crates/project/src/dap_store.rs +++ b/crates/project/src/dap_store.rs @@ -57,7 +57,7 @@ use util::{merge_json_value_into, ResultExt as _}; pub enum DapStoreEvent { DebugClientStarted(DebugAdapterClientId), - DebugClientStopped(DebugAdapterClientId), + DebugClientShutdown(DebugAdapterClientId), DebugClientEvent { client_id: DebugAdapterClientId, message: Message, @@ -1359,7 +1359,7 @@ impl DapStore { return Task::ready(Err(anyhow!("Could not find client: {:?}", client_id))); }; - cx.emit(DapStoreEvent::DebugClientStopped(*client_id)); + cx.emit(DapStoreEvent::DebugClientShutdown(*client_id)); self.ignore_breakpoints.remove(client_id); let capabilities = self.capabilities.remove(client_id); @@ -1512,7 +1512,7 @@ impl DapStore { dap_store.capabilities.remove(&client_id); - cx.emit(DapStoreEvent::DebugClientStopped(client_id)); + cx.emit(DapStoreEvent::DebugClientShutdown(client_id)); cx.notify(); } }) diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index 1bcc164495..dd2aafc97f 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -252,7 +252,7 @@ pub enum Event { LanguageServerPrompt(LanguageServerPromptRequest), LanguageNotFound(Model), DebugClientStarted(DebugAdapterClientId), - DebugClientStopped(DebugAdapterClientId), + DebugClientShutdown(DebugAdapterClientId), SetDebugClient(SetDebuggerPanelItem), ActiveDebugLineChanged, DebugClientEvent { @@ -2499,8 +2499,8 @@ impl Project { DapStoreEvent::DebugClientStarted(client_id) => { cx.emit(Event::DebugClientStarted(*client_id)); } - DapStoreEvent::DebugClientStopped(client_id) => { - cx.emit(Event::DebugClientStopped(*client_id)); + DapStoreEvent::DebugClientShutdown(client_id) => { + cx.emit(Event::DebugClientShutdown(*client_id)); } DapStoreEvent::DebugClientEvent { client_id, message } => { cx.emit(Event::DebugClientEvent {