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

debuggee all over the place?

Browse source
This commit is contained in:
versecafe 2025-08-26 11:25:29 -07:00
parent 6dae5a1fcd
commit 5ac866dbc9
No known key found for this signature in database
GPG key ID: 5B3F561B567F9A4C
9 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/dap_adapters/src/codelldb.rs
View file

@ -208,7 +208,7 @@ impl DebugAdapter for CodeLldbDebugAdapter {
},
"processCreateCommands": {
"type": "array",
"description": "Commands that create the debuggee process",
"description": "Commands that create the debugger process",
"items": {
"type": "string"
}
@ -222,7 +222,7 @@ impl DebugAdapter for CodeLldbDebugAdapter {
},
"preTerminateCommands": {
"type": "array",
"description": "Commands executed just before the debuggee is terminated or disconnected from",
"description": "Commands executed just before the debugger is terminated or disconnected from",
"items": {
"type": "string"
}

2
crates/extension_api/src/extension_api.rs
View file

@ -205,7 +205,7 @@ pub trait Extension: Send + Sync {
Err("`get_dap_binary` not implemented".to_string())
}
/// Determines whether the specified adapter configuration should *launch* a new debuggee process
/// Determines whether the specified adapter configuration should *launch* a new debugger process
/// or *attach* to an existing one. This function should not perform any further validation (outside of determining the kind of a request).
/// This function should return an error when the kind cannot be determined (rather than fall back to a known default).
fn dap_request_kind(

16
crates/project/src/debugger/dap_command.rs
View file

@ -544,8 +544,8 @@ impl DapCommand for PauseCommand {
#[derive(Debug, Hash, PartialEq, Eq)]
pub(crate) struct DisconnectCommand {
pub restart: Option<bool>,
pub terminate_debuggee: Option<bool>,
pub suspend_debuggee: Option<bool>,
pub terminate_debugger: Option<bool>,
pub suspend_debugger: Option<bool>,
}
impl LocalDapCommand for DisconnectCommand {
@ -555,8 +555,8 @@ impl LocalDapCommand for DisconnectCommand {
fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
dap::DisconnectArguments {
restart: self.restart,
terminate_debuggee: self.terminate_debuggee,
suspend_debuggee: self.suspend_debuggee,
terminate_debugger: self.terminate_debugger,
suspend_debugger: self.suspend_debugger,
}
}
@ -579,8 +579,8 @@ impl DapCommand for DisconnectCommand {
fn from_proto(request: &Self::ProtoRequest) -> Self {
Self {
restart: request.restart,
terminate_debuggee: request.terminate_debuggee,
suspend_debuggee: request.suspend_debuggee,
terminate_debugger: request.terminate_debugger,
suspend_debugger: request.suspend_debugger,
}
}
@ -593,8 +593,8 @@ impl DapCommand for DisconnectCommand {
project_id: upstream_project_id,
client_id: debug_client_id.to_proto(),
restart: self.restart,
terminate_debuggee: self.terminate_debuggee,
suspend_debuggee: self.suspend_debuggee,
terminate_debugger: self.terminate_debugger,
suspend_debugger: self.suspend_debugger,
}
}

6
crates/project/src/debugger/memory.rs
View file

@ -1,4 +1,4 @@
//! This module defines the format in which memory of debuggee is represented.
//! This module defines the format in which memory of debugger is represented.
//!
//! Each byte in memory can either be mapped or unmapped. We try to mimic that twofold:
//! - We assume that the memory is divided into pages of a fixed size.
@ -59,13 +59,13 @@ impl MappedPageContents {
}
}
/// We hope for the whole page to be mapped in a single chunk, but we do leave the possibility open
/// of having interleaved read permissions in a single page; debuggee's execution environment might either
/// of having interleaved read permissions in a single page; debugger's execution environment might either
/// have a different page size OR it might not have paged memory layout altogether
/// (which might be relevant to embedded systems).
///
/// As stated previously, the concept of a page in this module has to do more
/// with optimizing fetching of the memory and not with the underlying bits and pieces
/// of the memory of a debuggee.
/// of the memory of a debugger.
#[derive(Default, Debug)]
pub(super) struct MappedPageContents(

14
crates/project/src/debugger/session.rs
View file

@ -1009,7 +1009,7 @@ impl Session {
let supports_terminate = self
.capabilities
.support_terminate_debuggee
.support_terminate_debugger
.unwrap_or(false);
cx.background_spawn(async move {
@ -1024,8 +1024,8 @@ impl Session {
client
.request::<dap::requests::Disconnect>(dap::DisconnectArguments {
restart: Some(false),
terminate_debuggee: Some(true),
suspend_debuggee: Some(false),
terminate_debugger: Some(true),
suspend_debugger: Some(false),
})
.await
.ok();
@ -2133,8 +2133,8 @@ impl Session {
self.request(
DisconnectCommand {
restart: Some(false),
terminate_debuggee: Some(true),
suspend_debuggee: Some(false),
terminate_debugger: Some(true),
suspend_debugger: Some(false),
},
Self::clear_active_debug_line_response,
cx,
@ -2683,8 +2683,8 @@ impl Session {
pub fn disconnect_client(&mut self, cx: &mut Context<Self>) {
let command = DisconnectCommand {
restart: Some(false),
terminate_debuggee: Some(false),
suspend_debuggee: Some(false),
terminate_debugger: Some(false),
suspend_debugger: Some(false),
};
self.request(command, Self::empty_response, cx).detach()

4
crates/proto/proto/debugger.proto
View file

@ -195,8 +195,8 @@ message DapDisconnectRequest {
uint64 project_id = 1;
uint64 client_id = 2;
optional bool restart = 3;
optional bool terminate_debuggee = 4;
optional bool suspend_debuggee = 5;
optional bool terminate_debugger = 4;
optional bool suspend_debugger = 5;
}
message DapTerminateThreadsRequest {

4
crates/task/src/debug_format.rs
View file

@ -88,7 +88,7 @@ pub struct LaunchRequest {
/// The current working directory of your project
#[serde(default)]
pub cwd: Option<PathBuf>,
/// Arguments to pass to a debuggee
/// Arguments to pass to a debugger
#[serde(default)]
pub args: Vec<String>,
#[serde(default)]
@ -265,7 +265,7 @@ pub struct DebugScenario {
pub adapter: SharedString,
/// Name of the debug task
pub label: SharedString,
/// A task to run prior to spawning the debuggee.
/// A task to run prior to spawning the debugger.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub build: Option<BuildTaskDefinition>,
/// The main arguments to be sent to the debug adapter

2
docs/src/extensions/debugger-extensions.md
View file

@ -32,7 +32,7 @@ This method should return the command to start up a debug adapter protocol serve
If you need to download the DAP server from an external source—like GitHub Releases or npm—you can also do that in this function. Make sure to check for updates only periodically, as this function is called whenever a user spawns a new debug session with your debug adapter.
You must also implement `dap_request_kind`. This function is used to determine whether a given debug scenario will _launch_ a new debuggee or _attach_ to an existing one.
You must also implement `dap_request_kind`. This function is used to determine whether a given debug scenario will _launch_ a new debugger or _attach_ to an existing one.
We also use it to determine that a given debug scenario requires running a _locator_.
```rust

2
docs/src/languages/go.md
View file

@ -177,7 +177,7 @@ You might find yourself needing to connect to an existing instance of Delve that
]
```
In such case Zed won't spawn a new instance of Delve, as it opts to use an existing one. The consequence of this is that _there will be no terminal_ in Zed; you have to interact with the Delve instance directly, as it handles stdin/stdout of the debuggee.
In such case Zed won't spawn a new instance of Delve, as it opts to use an existing one. The consequence of this is that _there will be no terminal_ in Zed; you have to interact with the Delve instance directly, as it handles stdin/stdout of the debugger.
## Go Mod