debugger: More tidy up for SSH (#28993)
Split `locator` out of DebugTaskDefinition to make it clearer when location needs to happen. Release Notes: - N/A --------- Co-authored-by: Anthony Eid <hello@anthonyeid.me> Co-authored-by: Anthony <anthony@zed.dev> Co-authored-by: Cole Miller <m@cole-miller.net>
This commit is contained in:
parent
d13cd007a2
commit
9d35f0389d
57 changed files with 1146 additions and 884 deletions
|
@ -7,8 +7,9 @@ use std::path::PathBuf;
|
|||
use util::serde::default_true;
|
||||
use util::{ResultExt, truncate_and_remove_front};
|
||||
|
||||
use crate::debug_format::TcpArgumentsTemplate;
|
||||
use crate::{
|
||||
AttachConfig, ResolvedTask, RevealTarget, Shell, SpawnInTerminal, TCPHost, TaskContext, TaskId,
|
||||
AttachRequest, ResolvedTask, RevealTarget, Shell, SpawnInTerminal, TaskContext, TaskId,
|
||||
VariableName, ZED_VARIABLE_NAME_PREFIX,
|
||||
serde_helpers::{non_empty_string_vec, non_empty_string_vec_json_schema},
|
||||
};
|
||||
|
@ -83,7 +84,7 @@ pub enum DebugArgsRequest {
|
|||
/// launch (program, cwd) are stored in TaskTemplate as (command, cwd)
|
||||
Launch,
|
||||
/// Attach
|
||||
Attach(AttachConfig),
|
||||
Attach(AttachRequest),
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Eq, PartialEq, Clone, Debug)]
|
||||
|
@ -94,7 +95,7 @@ pub struct DebugArgs {
|
|||
/// Adapter choice
|
||||
pub adapter: String,
|
||||
/// TCP connection to make with debug adapter
|
||||
pub tcp_connection: Option<TCPHost>,
|
||||
pub tcp_connection: Option<TcpArgumentsTemplate>,
|
||||
/// Args to send to debug adapter
|
||||
pub initialize_args: Option<serde_json::value::Value>,
|
||||
/// the locator to use
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue