Skip to content

extension_api: Add IPv6 support in DAP extensions API #54984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomhoule merged 2 commits into from
Apr 29, 2026
Merged

extension_api: Add IPv6 support in DAP extensions API #54984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dee478
wit: Log on lossy conversion from ipaddr to ipv4
tomhoule Apr 27, 2026
50a8111
Update since_v0_8_0.rs
tomhoule Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions crates/extension_api/wit/since_v0.8.0/dap.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,23 @@ interface dap {
attach(attach-request)
}

type ipv4-address = tuple<u8, u8, u8, u8>;
Comment thread
MrSubidubi marked this conversation as resolved.
type ipv6-address = tuple<u16, u16, u16, u16, u16, u16, u16, u16>;

variant ip-address {
ipv4(ipv4-address),
ipv6(ipv6-address),
}

record tcp-arguments {
port: u16,
host: u32,
host: ip-address,
timeout: option<u64>,
}

record tcp-arguments-template {
port: option<u16>,
host: option<u32>,
host: option<ip-address>,
timeout: option<u64>,
}

Expand Down
28 changes: 17 additions & 11 deletions crates/extension_host/src/wasm_host/wit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use lsp::LanguageServerName;
use release_channel::ReleaseChannel;
use task::{DebugScenario, SpawnInTerminal, TaskTemplate, ZedDebugConfig};

use crate::wasm_host::wit::since_v0_6_0::dap::StartDebuggingRequestArgumentsRequest;
use latest::dap::StartDebuggingRequestArgumentsRequest;

use super::{WasmState, wasm_engine};
use anyhow::{Context as _, Result, anyhow};
Expand Down Expand Up @@ -1072,18 +1072,19 @@ impl Extension {
Ok(Ok(dap_binary))
}
Extension::V0_6_0(ext) => {
let task: latest::DebugTaskDefinition = task.try_into()?;
let dap_binary = ext
.call_get_dap_binary(
store,
&adapter_name,
&task.try_into()?,
&task.into(),
user_installed_path.as_ref().and_then(|p| p.to_str()),
resource,
)
.await?
.map_err(|e| anyhow!("{e:?}"))?;

Ok(Ok(dap_binary))
Ok(Ok(dap_binary.into()))
}
Extension::V0_5_0(_)
| Extension::V0_4_0(_)
Expand Down Expand Up @@ -1123,7 +1124,7 @@ impl Extension {
.await?
.map_err(|e| anyhow!("{e:?}"))?;

Ok(Ok(dap_binary))
Ok(Ok(dap_binary.into()))
}
Extension::V0_5_0(_)
| Extension::V0_4_0(_)
Expand Down Expand Up @@ -1154,12 +1155,13 @@ impl Extension {
Ok(Ok(dap_binary.try_into()?))
}
Extension::V0_6_0(ext) => {
let config = config.into();
let config: latest::DebugConfig = config.into();
let dap_binary = ext
.call_dap_config_to_scenario(store, &config)
.call_dap_config_to_scenario(store, &config.into())
.await?
.map_err(|e| anyhow!("{e:?}"))?;

let dap_binary: latest::DebugScenario = dap_binary.into();
Ok(Ok(dap_binary.try_into()?))
}
Extension::V0_5_0(_)
Expand Down Expand Up @@ -1199,18 +1201,20 @@ impl Extension {
Ok(dap_binary.map(TryInto::try_into).transpose()?)
}
Extension::V0_6_0(ext) => {
let build_config_template = build_config_template.into();
let build_config_template: latest::dap::TaskTemplate = build_config_template.into();
let dap_binary = ext
.call_dap_locator_create_scenario(
store,
&locator_name,
&build_config_template,
&build_config_template.into(),
&resolved_label,
&debug_adapter_name,
)
.await?;

Ok(dap_binary.map(TryInto::try_into).transpose()?)
Ok(dap_binary
.map(|s| latest::DebugScenario::from(s).try_into())
.transpose()?)
}
Extension::V0_5_0(_)
| Extension::V0_4_0(_)
Expand Down Expand Up @@ -1242,12 +1246,14 @@ impl Extension {
Ok(Ok(dap_request.into()))
}
Extension::V0_6_0(ext) => {
let build_config_template = resolved_build_task.try_into()?;
let build_config_template: latest::dap::TaskTemplate =
resolved_build_task.try_into()?;
let dap_request = ext
.call_run_dap_locator(store, &locator_name, &build_config_template)
.call_run_dap_locator(store, &locator_name, &build_config_template.into())
.await?
.map_err(|e| anyhow!("{e:?}"))?;

let dap_request: latest::DebugRequest = dap_request.into();
Ok(Ok(dap_request.into()))
}
Extension::V0_5_0(_)
Expand Down
Loading
Loading