aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--helix-dap/src/client.rs10
-rw-r--r--helix-term/src/commands.rs28
2 files changed, 32 insertions, 6 deletions
diff --git a/helix-dap/src/client.rs b/helix-dap/src/client.rs
index 9a2e3920..94a76a54 100644
--- a/helix-dap/src/client.rs
+++ b/helix-dap/src/client.rs
@@ -26,7 +26,7 @@ pub struct Client {
_process: Option<Child>,
server_tx: UnboundedSender<Request>,
request_counter: AtomicU64,
- capabilities: Option<DebuggerCapabilities>,
+ pub caps: Option<DebuggerCapabilities>,
//
pub breakpoints: HashMap<PathBuf, Vec<SourceBreakpoint>>,
// TODO: multiple threads support
@@ -77,7 +77,7 @@ impl Client {
_process: process,
server_tx,
request_counter: AtomicU64::new(0),
- capabilities: None,
+ caps: None,
//
breakpoints: HashMap::new(),
stack_pointer: None,
@@ -225,9 +225,7 @@ impl Client {
}
pub fn capabilities(&self) -> &DebuggerCapabilities {
- self.capabilities
- .as_ref()
- .expect("debugger not yet initialized!")
+ self.caps.as_ref().expect("debugger not yet initialized!")
}
pub async fn initialize(&mut self, adapter_id: String) -> Result<()> {
@@ -248,7 +246,7 @@ impl Client {
};
let response = self.request::<requests::Initialize>(args).await?;
- self.capabilities = Some(response);
+ self.caps = Some(response);
Ok(())
}
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 42591ac4..74466e7e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1949,6 +1949,34 @@ mod cmd {
}
};
if let Some(debugger) = &mut cx.editor.debugger {
+ if breakpoint.condition.is_some()
+ && !debugger
+ .caps
+ .clone()
+ .unwrap()
+ .supports_conditional_breakpoints
+ .unwrap_or_default()
+ {
+ cx.editor.set_error(
+ "Can't edit breakpoint: debugger does not support conditional breakpoints"
+ .to_string(),
+ );
+ return;
+ }
+ if breakpoint.log_message.is_some()
+ && !debugger
+ .caps
+ .clone()
+ .unwrap()
+ .supports_log_points
+ .unwrap_or_default()
+ {
+ cx.editor.set_error(
+ "Can't edit breakpoint: debugger does not support logpoints".to_string(),
+ );
+ return;
+ }
+
let breakpoints = debugger.breakpoints.entry(path.clone()).or_default();
if let Some(pos) = breakpoints.iter().position(|b| b.line == breakpoint.line) {
breakpoints.remove(pos);