Anthony EidandRemco Smits
07dcb8f2bb
Fixes the Debugpy toolchain detection bug in #40324 When detecting what toolchain (venv) to use in the Debugpy configuration stage, we used to only base it off of the current working directory argument passed to the config. This is wrong behavior for cases like mono repos, where the correct virtual environment to use is nested in another folder. This PR fixes this issue by adding the program and module fields as fallbacks to check for virtual environments. We also added support for program/module relative paths as well when cwd is not None. Release Notes: - debugger: Improve mono repo virtual environment detection with Debugpy --------- Co-authored-by: Remco Smits <djsmits12@gmail.com>
105 lines
2.7 KiB
Rust
105 lines
2.7 KiB
Rust
mod codelldb;
|
|
mod gdb;
|
|
mod go;
|
|
mod javascript;
|
|
mod python;
|
|
|
|
#[cfg(test)]
|
|
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
|
|
use anyhow::Result;
|
|
use async_trait::async_trait;
|
|
use codelldb::CodeLldbDebugAdapter;
|
|
use dap::{
|
|
DapRegistry,
|
|
adapters::{
|
|
self, AdapterVersion, DapDelegate, DebugAdapter, DebugAdapterBinary, DebugAdapterName,
|
|
},
|
|
configure_tcp_connection,
|
|
};
|
|
use gdb::GdbDebugAdapter;
|
|
use go::GoDebugAdapter;
|
|
use gpui::{App, BorrowAppContext};
|
|
use javascript::JsDebugAdapter;
|
|
use python::PythonDebugAdapter;
|
|
use serde_json::json;
|
|
use task::{DebugScenario, ZedDebugConfig};
|
|
|
|
pub fn init(cx: &mut App) {
|
|
cx.update_default_global(|registry: &mut DapRegistry, _cx| {
|
|
registry.add_adapter(Arc::from(CodeLldbDebugAdapter::default()));
|
|
registry.add_adapter(Arc::from(PythonDebugAdapter::default()));
|
|
registry.add_adapter(Arc::from(JsDebugAdapter::default()));
|
|
registry.add_adapter(Arc::from(GoDebugAdapter::default()));
|
|
registry.add_adapter(Arc::from(GdbDebugAdapter));
|
|
|
|
#[cfg(any(test, feature = "test-support"))]
|
|
{
|
|
registry.add_adapter(Arc::from(dap::FakeAdapter {}));
|
|
}
|
|
})
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test_mocks {
|
|
use super::*;
|
|
|
|
pub(crate) struct MockDelegate {
|
|
worktree_root: PathBuf,
|
|
}
|
|
|
|
impl MockDelegate {
|
|
pub(crate) fn new() -> Arc<dyn adapters::DapDelegate> {
|
|
Arc::new(Self {
|
|
worktree_root: PathBuf::from("/tmp/test"),
|
|
})
|
|
}
|
|
}
|
|
|
|
#[async_trait::async_trait]
|
|
impl adapters::DapDelegate for MockDelegate {
|
|
fn worktree_id(&self) -> settings::WorktreeId {
|
|
settings::WorktreeId::from_usize(0)
|
|
}
|
|
|
|
fn worktree_root_path(&self) -> &std::path::Path {
|
|
&self.worktree_root
|
|
}
|
|
|
|
fn http_client(&self) -> Arc<dyn http_client::HttpClient> {
|
|
unimplemented!("Not needed for tests")
|
|
}
|
|
|
|
fn node_runtime(&self) -> node_runtime::NodeRuntime {
|
|
unimplemented!("Not needed for tests")
|
|
}
|
|
|
|
fn toolchain_store(&self) -> Arc<dyn language::LanguageToolchainStore> {
|
|
unimplemented!("Not needed for tests")
|
|
}
|
|
|
|
fn fs(&self) -> Arc<dyn fs::Fs> {
|
|
unimplemented!("Not needed for tests")
|
|
}
|
|
|
|
fn output_to_console(&self, _msg: String) {}
|
|
|
|
async fn which(&self, _command: &std::ffi::OsStr) -> Option<PathBuf> {
|
|
None
|
|
}
|
|
|
|
async fn read_text_file(&self, _path: &util::rel_path::RelPath) -> Result<String> {
|
|
Ok(String::new())
|
|
}
|
|
|
|
async fn shell_env(&self) -> collections::HashMap<String, String> {
|
|
collections::HashMap::default()
|
|
}
|
|
|
|
fn is_headless(&self) -> bool {
|
|
false
|
|
}
|
|
}
|
|
}
|