From 04cd04eb443db1a73abc4abdff4ece0d05cc5fe6 Mon Sep 17 00:00:00 2001 From: Remco Smits Date: Tue, 10 Dec 2024 17:54:38 +0100 Subject: [PATCH] Move thread status to debug_panel --- crates/dap/src/client.rs | 9 --------- crates/debugger_ui/src/debugger_panel.rs | 11 ++++++++++- crates/debugger_ui/src/debugger_panel_item.rs | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crates/dap/src/client.rs b/crates/dap/src/client.rs index 45f2ec1ddd..367799102c 100644 --- a/crates/dap/src/client.rs +++ b/crates/dap/src/client.rs @@ -22,15 +22,6 @@ use task::{DebugAdapterConfig, DebugRequestType}; const DAP_REQUEST_TIMEOUT: Duration = Duration::from_secs(5); -#[derive(Copy, Clone, Default, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] -pub enum ThreadStatus { - #[default] - Running, - Stopped, - Exited, - Ended, -} - #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] #[repr(transparent)] pub struct DebugAdapterClientId(pub usize); diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rs index d9270aace1..ed38d7196e 100644 --- a/crates/debugger_ui/src/debugger_panel.rs +++ b/crates/debugger_ui/src/debugger_panel.rs @@ -3,7 +3,7 @@ use crate::debugger_panel_item::DebugPanelItem; use anyhow::Result; use collections::{BTreeMap, HashMap}; use command_palette_hooks::CommandPaletteFilter; -use dap::client::{DebugAdapterClientId, ThreadStatus}; +use dap::client::DebugAdapterClientId; use dap::debugger_settings::DebuggerSettings; use dap::messages::{Events, Message}; use dap::requests::{Request, RunInTerminal, StartDebugging}; @@ -63,6 +63,15 @@ pub struct ThreadState { pub stopped: bool, } +#[derive(Copy, Clone, Default, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] +pub enum ThreadStatus { + #[default] + Running, + Stopped, + Exited, + Ended, +} + pub struct DebugPanel { size: Pixels, pane: View, diff --git a/crates/debugger_ui/src/debugger_panel_item.rs b/crates/debugger_ui/src/debugger_panel_item.rs index 33c5309620..b89ab445cd 100644 --- a/crates/debugger_ui/src/debugger_panel_item.rs +++ b/crates/debugger_ui/src/debugger_panel_item.rs @@ -1,11 +1,11 @@ use crate::console::Console; -use crate::debugger_panel::{DebugPanel, DebugPanelEvent, ThreadState}; +use crate::debugger_panel::{DebugPanel, DebugPanelEvent, ThreadState, ThreadStatus}; use crate::loaded_source_list::LoadedSourceList; use crate::module_list::ModuleList; use crate::stack_frame_list::{StackFrameList, StackFrameListEvent}; use crate::variable_list::VariableList; -use dap::client::{DebugAdapterClientId, ThreadStatus}; +use dap::client::DebugAdapterClientId; use dap::debugger_settings::DebuggerSettings; use dap::{ Capabilities, ContinuedEvent, LoadedSourceEvent, ModuleEvent, OutputEvent, OutputEventCategory,