mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-04 19:37:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Check capabilities for breakpoint config

Browse source
This commit is contained in:
Dmitry Sharshakov 2021-08-24 10:48:47 +03:00
parent c4085b4e88
commit fdad7d67aa
No known key found for this signature in database
GPG key ID: 471FD32E15FD8473
2 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
helix-dap/src/client.rs
View file

@ -26,7 +26,7 @@ pub struct Client {
_process: Option<Child>, _process: Option<Child>,
server_tx: UnboundedSender<Request>, server_tx: UnboundedSender<Request>,
request_counter: AtomicU64, request_counter: AtomicU64,
capabilities: Option<DebuggerCapabilities>, pub caps: Option<DebuggerCapabilities>,
// //
pub breakpoints: HashMap<PathBuf, Vec<SourceBreakpoint>>, pub breakpoints: HashMap<PathBuf, Vec<SourceBreakpoint>>,
// TODO: multiple threads support // TODO: multiple threads support
@ -77,7 +77,7 @@ impl Client {
_process: process, _process: process,
server_tx, server_tx,
request_counter: AtomicU64::new(0), request_counter: AtomicU64::new(0),
capabilities: None, caps: None,
// //
breakpoints: HashMap::new(), breakpoints: HashMap::new(),
stack_pointer: None, stack_pointer: None,
@ -225,9 +225,7 @@ impl Client {
} }
pub fn capabilities(&self) -> &DebuggerCapabilities { pub fn capabilities(&self) -> &DebuggerCapabilities {
self.capabilities self.caps.as_ref().expect("debugger not yet initialized!")
.as_ref()
.expect("debugger not yet initialized!")
} }
pub async fn initialize(&mut self, adapter_id: String) -> Result<()> { pub async fn initialize(&mut self, adapter_id: String) -> Result<()> {
@ -248,7 +246,7 @@ impl Client {
}; };
let response = self.request::<requests::Initialize>(args).await?; let response = self.request::<requests::Initialize>(args).await?;
self.capabilities = Some(response); self.caps = Some(response);
Ok(()) Ok(())
} }

28
helix-term/src/commands.rs
View file

@ -1949,6 +1949,34 @@ mod cmd {
} }
}; };
if let Some(debugger) = &mut cx.editor.debugger { 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(); let breakpoints = debugger.breakpoints.entry(path.clone()).or_default();
if let Some(pos) = breakpoints.iter().position(|b| b.line == breakpoint.line) { if let Some(pos) = breakpoints.iter().position(|b| b.line == breakpoint.line) {
breakpoints.remove(pos); breakpoints.remove(pos);