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

debugger: Fix delve-dap-shim path on Windows (#31735)

Browse source 
Closes #ISSUE

Release Notes:

- debugger: Fixed wrong path being picked up for delve on Windows
- debugger: Fixed delve not respecting the user-provided binary path
from settings.
This commit is contained in:
Piotr Osiewicz 2025-05-30 10:53:19 +02:00 • committed by GitHub
parent 89c184a26f
commit 3a60420b41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/dap_adapters/src/go.rs
View file

@ -77,7 +77,7 @@ impl GoDebugAdapter {
let path = paths::debug_adapters_dir() let path = paths::debug_adapters_dir()
.join("delve-shim-dap") .join("delve-shim-dap")
.join(format!("delve-shim-dap{}", asset.tag_name)) .join(format!("delve-shim-dap{}", asset.tag_name))
.join("delve-shim-dap"); .join(format!("delve-shim-dap{}", std::env::consts::EXE_SUFFIX));
self.shim_path.set(path.clone()).ok(); self.shim_path.set(path.clone()).ok();
Ok(path) Ok(path)
@ -414,13 +414,15 @@ impl DebugAdapter for GoDebugAdapter {
&self, &self,
delegate: &Arc<dyn DapDelegate>, delegate: &Arc<dyn DapDelegate>,
task_definition: &DebugTaskDefinition, task_definition: &DebugTaskDefinition,
_user_installed_path: Option<PathBuf>, user_installed_path: Option<PathBuf>,
_cx: &mut AsyncApp, _cx: &mut AsyncApp,
) -> Result<DebugAdapterBinary> { ) -> Result<DebugAdapterBinary> {
let adapter_path = paths::debug_adapters_dir().join(&Self::ADAPTER_NAME); let adapter_path = paths::debug_adapters_dir().join(&Self::ADAPTER_NAME);
let dlv_path = adapter_path.join("dlv"); let dlv_path = adapter_path.join("dlv");
let delve_path = if let Some(path) = delegate.which(OsStr::new("dlv")).await { let delve_path = if let Some(path) = user_installed_path {
path.to_string_lossy().to_string()
} else if let Some(path) = delegate.which(OsStr::new("dlv")).await {
path.to_string_lossy().to_string() path.to_string_lossy().to_string()
} else if delegate.fs().is_file(&dlv_path).await { } else if delegate.fs().is_file(&dlv_path).await {
dlv_path.to_string_lossy().to_string() dlv_path.to_string_lossy().to_string()