debugger: Add support for CodeLLDB (#28376)
Closes #ISSUE Release Notes: - N/A
This commit is contained in:
parent
61ddcd516f
commit
c441b651fa
6 changed files with 172 additions and 13 deletions
|
@ -93,7 +93,7 @@ pub struct TcpArguments {
|
||||||
pub port: u16,
|
pub port: u16,
|
||||||
pub timeout: Option<u64>,
|
pub timeout: Option<u64>,
|
||||||
}
|
}
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Default, Debug, Clone)]
|
||||||
pub struct DebugAdapterBinary {
|
pub struct DebugAdapterBinary {
|
||||||
pub command: String,
|
pub command: String,
|
||||||
pub arguments: Option<Vec<OsString>>,
|
pub arguments: Option<Vec<OsString>>,
|
||||||
|
@ -102,6 +102,7 @@ pub struct DebugAdapterBinary {
|
||||||
pub connection: Option<TcpArguments>,
|
pub connection: Option<TcpArguments>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
pub struct AdapterVersion {
|
pub struct AdapterVersion {
|
||||||
pub tag_name: String,
|
pub tag_name: String,
|
||||||
pub url: String,
|
pub url: String,
|
||||||
|
|
141
crates/dap_adapters/src/codelldb.rs
Normal file
141
crates/dap_adapters/src/codelldb.rs
Normal file
|
@ -0,0 +1,141 @@
|
||||||
|
use std::{path::PathBuf, sync::OnceLock};
|
||||||
|
|
||||||
|
use anyhow::{Result, bail};
|
||||||
|
use async_trait::async_trait;
|
||||||
|
use dap::adapters::latest_github_release;
|
||||||
|
use gpui::AsyncApp;
|
||||||
|
use task::{DebugAdapterConfig, DebugRequestType, DebugTaskDefinition};
|
||||||
|
|
||||||
|
use crate::*;
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
|
pub(crate) struct CodeLldbDebugAdapter {
|
||||||
|
last_known_version: OnceLock<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CodeLldbDebugAdapter {
|
||||||
|
const ADAPTER_NAME: &'static str = "CodeLLDB";
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_trait(?Send)]
|
||||||
|
impl DebugAdapter for CodeLldbDebugAdapter {
|
||||||
|
fn name(&self) -> DebugAdapterName {
|
||||||
|
DebugAdapterName(Self::ADAPTER_NAME.into())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn install_binary(
|
||||||
|
&self,
|
||||||
|
version: AdapterVersion,
|
||||||
|
delegate: &dyn DapDelegate,
|
||||||
|
) -> Result<()> {
|
||||||
|
adapters::download_adapter_from_github(
|
||||||
|
self.name(),
|
||||||
|
version,
|
||||||
|
adapters::DownloadedFileType::Vsix,
|
||||||
|
delegate,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn fetch_latest_adapter_version(
|
||||||
|
&self,
|
||||||
|
delegate: &dyn DapDelegate,
|
||||||
|
) -> Result<AdapterVersion> {
|
||||||
|
let release =
|
||||||
|
latest_github_release("vadimcn/codelldb", true, false, delegate.http_client()).await?;
|
||||||
|
|
||||||
|
let arch = match std::env::consts::ARCH {
|
||||||
|
"aarch64" => "arm64",
|
||||||
|
"x86_64" => "x64",
|
||||||
|
_ => {
|
||||||
|
return Err(anyhow!(
|
||||||
|
"unsupported architecture {}",
|
||||||
|
std::env::consts::ARCH
|
||||||
|
));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let platform = match std::env::consts::OS {
|
||||||
|
"macos" => "darwin",
|
||||||
|
"linux" => "linux",
|
||||||
|
"windows" => "win32",
|
||||||
|
_ => {
|
||||||
|
return Err(anyhow!(
|
||||||
|
"unsupported operating system {}",
|
||||||
|
std::env::consts::OS
|
||||||
|
));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let asset_name = format!("codelldb-{platform}-{arch}.vsix");
|
||||||
|
let _ = self.last_known_version.set(release.tag_name.clone());
|
||||||
|
let ret = AdapterVersion {
|
||||||
|
tag_name: release.tag_name,
|
||||||
|
url: release
|
||||||
|
.assets
|
||||||
|
.iter()
|
||||||
|
.find(|asset| asset.name == asset_name)
|
||||||
|
.ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?
|
||||||
|
.browser_download_url
|
||||||
|
.clone(),
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(ret)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_installed_binary(
|
||||||
|
&self,
|
||||||
|
_: &dyn DapDelegate,
|
||||||
|
_: &DebugAdapterConfig,
|
||||||
|
_: Option<PathBuf>,
|
||||||
|
_: &mut AsyncApp,
|
||||||
|
) -> Result<DebugAdapterBinary> {
|
||||||
|
let Some(version) = self.last_known_version.get() else {
|
||||||
|
bail!("Could not determine latest CodeLLDB version");
|
||||||
|
};
|
||||||
|
let adapter_path = paths::debug_adapters_dir().join(&Self::ADAPTER_NAME);
|
||||||
|
let version_path = adapter_path.join(format!("{}_{}", Self::ADAPTER_NAME, version));
|
||||||
|
|
||||||
|
let adapter_dir = version_path.join("extension").join("adapter");
|
||||||
|
let command = adapter_dir.join("codelldb");
|
||||||
|
let command = command
|
||||||
|
.to_str()
|
||||||
|
.map(ToOwned::to_owned)
|
||||||
|
.ok_or_else(|| anyhow!("Adapter path is expected to be valid UTF-8"))?;
|
||||||
|
Ok(DebugAdapterBinary {
|
||||||
|
command,
|
||||||
|
cwd: Some(adapter_dir),
|
||||||
|
..Default::default()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn request_args(&self, config: &DebugTaskDefinition) -> Value {
|
||||||
|
let mut args = json!({
|
||||||
|
"request": match config.request {
|
||||||
|
DebugRequestType::Launch(_) => "launch",
|
||||||
|
DebugRequestType::Attach(_) => "attach",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
let map = args.as_object_mut().unwrap();
|
||||||
|
match &config.request {
|
||||||
|
DebugRequestType::Attach(attach) => {
|
||||||
|
map.insert("pid".into(), attach.process_id.into());
|
||||||
|
}
|
||||||
|
DebugRequestType::Launch(launch) => {
|
||||||
|
map.insert("program".into(), launch.program.clone().into());
|
||||||
|
|
||||||
|
if !launch.args.is_empty() {
|
||||||
|
map.insert("args".into(), launch.args.clone().into());
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(stop_on_entry) = config.stop_on_entry {
|
||||||
|
map.insert("stopOnEntry".into(), stop_on_entry.into());
|
||||||
|
}
|
||||||
|
if let Some(cwd) = launch.cwd.as_ref() {
|
||||||
|
map.insert("cwd".into(), cwd.to_string_lossy().into_owned().into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
args
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,3 +1,4 @@
|
||||||
|
mod codelldb;
|
||||||
mod gdb;
|
mod gdb;
|
||||||
mod go;
|
mod go;
|
||||||
mod javascript;
|
mod javascript;
|
||||||
|
@ -9,6 +10,7 @@ use std::{net::Ipv4Addr, sync::Arc};
|
||||||
|
|
||||||
use anyhow::{Result, anyhow};
|
use anyhow::{Result, anyhow};
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
|
use codelldb::CodeLldbDebugAdapter;
|
||||||
use dap::{
|
use dap::{
|
||||||
DapRegistry,
|
DapRegistry,
|
||||||
adapters::{
|
adapters::{
|
||||||
|
@ -26,6 +28,7 @@ use serde_json::{Value, json};
|
||||||
use task::{DebugAdapterConfig, TCPHost};
|
use task::{DebugAdapterConfig, TCPHost};
|
||||||
|
|
||||||
pub fn init(registry: Arc<DapRegistry>) {
|
pub fn init(registry: Arc<DapRegistry>) {
|
||||||
|
registry.add_adapter(Arc::from(CodeLldbDebugAdapter::default()));
|
||||||
registry.add_adapter(Arc::from(PythonDebugAdapter));
|
registry.add_adapter(Arc::from(PythonDebugAdapter));
|
||||||
registry.add_adapter(Arc::from(PhpDebugAdapter));
|
registry.add_adapter(Arc::from(PhpDebugAdapter));
|
||||||
registry.add_adapter(Arc::from(JsDebugAdapter::default()));
|
registry.add_adapter(Arc::from(JsDebugAdapter::default()));
|
||||||
|
|
|
@ -25,7 +25,9 @@ use project::{
|
||||||
};
|
};
|
||||||
use rpc::proto::{self};
|
use rpc::proto::{self};
|
||||||
use settings::Settings;
|
use settings::Settings;
|
||||||
use std::{any::TypeId, path::PathBuf};
|
use std::any::TypeId;
|
||||||
|
use std::path::Path;
|
||||||
|
use std::sync::Arc;
|
||||||
use task::DebugTaskDefinition;
|
use task::DebugTaskDefinition;
|
||||||
use terminal_view::terminal_panel::TerminalPanel;
|
use terminal_view::terminal_panel::TerminalPanel;
|
||||||
use ui::{ContextMenu, Divider, DropdownMenu, Tooltip, prelude::*};
|
use ui::{ContextMenu, Divider, DropdownMenu, Tooltip, prelude::*};
|
||||||
|
@ -272,7 +274,7 @@ impl DebugPanel {
|
||||||
fn handle_run_in_terminal_request(
|
fn handle_run_in_terminal_request(
|
||||||
&self,
|
&self,
|
||||||
title: Option<String>,
|
title: Option<String>,
|
||||||
cwd: PathBuf,
|
cwd: Option<Arc<Path>>,
|
||||||
command: Option<String>,
|
command: Option<String>,
|
||||||
args: Vec<String>,
|
args: Vec<String>,
|
||||||
envs: HashMap<String, String>,
|
envs: HashMap<String, String>,
|
||||||
|
|
|
@ -38,7 +38,7 @@ use std::{
|
||||||
borrow::Borrow,
|
borrow::Borrow,
|
||||||
collections::{BTreeMap, HashSet},
|
collections::{BTreeMap, HashSet},
|
||||||
ffi::OsStr,
|
ffi::OsStr,
|
||||||
path::PathBuf,
|
path::{Path, PathBuf},
|
||||||
sync::{Arc, atomic::Ordering::SeqCst},
|
sync::{Arc, atomic::Ordering::SeqCst},
|
||||||
};
|
};
|
||||||
use std::{collections::VecDeque, sync::atomic::AtomicU32};
|
use std::{collections::VecDeque, sync::atomic::AtomicU32};
|
||||||
|
@ -57,7 +57,7 @@ pub enum DapStoreEvent {
|
||||||
RunInTerminal {
|
RunInTerminal {
|
||||||
session_id: SessionId,
|
session_id: SessionId,
|
||||||
title: Option<String>,
|
title: Option<String>,
|
||||||
cwd: PathBuf,
|
cwd: Option<Arc<Path>>,
|
||||||
command: Option<String>,
|
command: Option<String>,
|
||||||
args: Vec<String>,
|
args: Vec<String>,
|
||||||
envs: HashMap<String, String>,
|
envs: HashMap<String, String>,
|
||||||
|
@ -549,10 +549,10 @@ impl DapStore {
|
||||||
|
|
||||||
let seq = request.seq;
|
let seq = request.seq;
|
||||||
|
|
||||||
let cwd = PathBuf::from(request_args.cwd);
|
let cwd = Path::new(&request_args.cwd);
|
||||||
|
|
||||||
match cwd.try_exists() {
|
match cwd.try_exists() {
|
||||||
Ok(true) => (),
|
Ok(false) | Err(_) if !request_args.cwd.is_empty() => {
|
||||||
Ok(false) | Err(_) => {
|
|
||||||
return session.update(cx, |session, cx| {
|
return session.update(cx, |session, cx| {
|
||||||
session.respond_to_client(
|
session.respond_to_client(
|
||||||
seq,
|
seq,
|
||||||
|
@ -574,8 +574,8 @@ impl DapStore {
|
||||||
)
|
)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
_ => (),
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut args = request_args.args.clone();
|
let mut args = request_args.args.clone();
|
||||||
|
|
||||||
// Handle special case for NodeJS debug adapter
|
// Handle special case for NodeJS debug adapter
|
||||||
|
@ -602,7 +602,19 @@ impl DapStore {
|
||||||
}
|
}
|
||||||
|
|
||||||
let (tx, mut rx) = mpsc::channel::<Result<u32>>(1);
|
let (tx, mut rx) = mpsc::channel::<Result<u32>>(1);
|
||||||
|
let cwd = Some(cwd)
|
||||||
|
.filter(|cwd| cwd.as_os_str().len() > 0)
|
||||||
|
.map(Arc::from)
|
||||||
|
.or_else(|| {
|
||||||
|
self.session_by_id(session_id)
|
||||||
|
.and_then(|session| {
|
||||||
|
session
|
||||||
|
.read(cx)
|
||||||
|
.configuration()
|
||||||
|
.and_then(|config| config.request.cwd())
|
||||||
|
})
|
||||||
|
.map(Arc::from)
|
||||||
|
});
|
||||||
cx.emit(DapStoreEvent::RunInTerminal {
|
cx.emit(DapStoreEvent::RunInTerminal {
|
||||||
session_id,
|
session_id,
|
||||||
title: request_args.title,
|
title: request_args.title,
|
||||||
|
|
|
@ -40,7 +40,7 @@ pub enum TerminalKind {
|
||||||
command: Option<String>,
|
command: Option<String>,
|
||||||
args: Vec<String>,
|
args: Vec<String>,
|
||||||
envs: HashMap<String, String>,
|
envs: HashMap<String, String>,
|
||||||
cwd: PathBuf,
|
cwd: Option<Arc<Path>>,
|
||||||
title: Option<String>,
|
title: Option<String>,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -101,7 +101,7 @@ impl Project {
|
||||||
self.active_project_directory(cx)
|
self.active_project_directory(cx)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
TerminalKind::Debug { cwd, .. } => Some(Arc::from(cwd.as_path())),
|
TerminalKind::Debug { cwd, .. } => cwd.clone(),
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut settings_location = None;
|
let mut settings_location = None;
|
||||||
|
@ -205,7 +205,7 @@ impl Project {
|
||||||
this.active_project_directory(cx)
|
this.active_project_directory(cx)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
TerminalKind::Debug { cwd, .. } => Some(Arc::from(cwd.as_path())),
|
TerminalKind::Debug { cwd, .. } => cwd.clone(),
|
||||||
};
|
};
|
||||||
let ssh_details = this.ssh_details(cx);
|
let ssh_details = this.ssh_details(cx);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue