Mirrors
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

dap: Simplify more calls

Browse Source
pull/574/head
Blaž Hrastnik 3 years ago
parent 155c608237
commit 5803de2067
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File

16
helix-term/src/commands/dap.rs
Unescape Escape View File

@ -163,7 +163,7 @@ pub fn dap_start_impl(
let (_, doc) = current!(editor); let (_, doc) = current!(editor);
let path = match doc.path() { let path = match doc.path() {
Some(path) => path.to_path_buf(), Some(path) => path,
None => { None => {
editor.set_error("Can't start debug: document has no path".to_string()); editor.set_error("Can't start debug: document has no path".to_string());
return; return;
@ -420,7 +420,7 @@ pub fn dap_toggle_breakpoint(cx: &mut Context) {
}; };
let path = match doc.path() { let path = match doc.path() {
Some(path) => path.to_path_buf(), Some(path) => path,
None => { None => {
cx.editor cx.editor
.set_error("Can't set breakpoint: document has no path".to_string()); .set_error("Can't set breakpoint: document has no path".to_string());
@ -444,7 +444,7 @@ pub fn dap_toggle_breakpoint(cx: &mut Context) {
Some(debugger) => debugger, Some(debugger) => debugger,
None => return, None => return,
}; };
let request = debugger.set_breakpoints(path, breakpoints); let request = debugger.set_breakpoints(path.clone(), breakpoints);
match block_on(request) { match block_on(request) {
Ok(Some(breakpoints)) => { Ok(Some(breakpoints)) => {
let old_breakpoints = debugger.breakpoints.clone(); let old_breakpoints = debugger.breakpoints.clone();
@ -671,7 +671,7 @@ pub fn dap_edit_condition(cx: &mut Context) {
let (_, doc) = current!(cx.editor); let (_, doc) = current!(cx.editor);
let path = match doc.path() { let path = match doc.path() {
Some(path) => path.to_path_buf(), Some(path) => path,
None => { None => {
cx.editor.set_status( cx.editor.set_status(
"Can't edit breakpoint: document has no path".to_owned(), "Can't edit breakpoint: document has no path".to_owned(),
@ -713,7 +713,8 @@ pub fn dap_edit_condition(cx: &mut Context) {
// { // {
// bail!("Can't edit breakpoint: debugger does not support logpoints") // bail!("Can't edit breakpoint: debugger does not support logpoints")
// } // }
let request = debugger.set_breakpoints(path, breakpoints.clone()); let request =
debugger.set_breakpoints(path.clone(), breakpoints.clone());
if let Err(e) = block_on(request) { if let Err(e) = block_on(request) {
cx.editor cx.editor
.set_status(format!("Failed to set breakpoints: {:?}", e)) .set_status(format!("Failed to set breakpoints: {:?}", e))
@ -749,7 +750,7 @@ pub fn dap_edit_log(cx: &mut Context) {
let (_, doc) = current!(cx.editor); let (_, doc) = current!(cx.editor);
let path = match doc.path() { let path = match doc.path() {
Some(path) => path.to_path_buf(), Some(path) => path,
None => { None => {
cx.editor.set_status( cx.editor.set_status(
"Can't edit breakpoint: document has no path".to_owned(), "Can't edit breakpoint: document has no path".to_owned(),
@ -791,7 +792,8 @@ pub fn dap_edit_log(cx: &mut Context) {
// { // {
// bail!("Can't edit breakpoint: debugger does not support logpoints") // bail!("Can't edit breakpoint: debugger does not support logpoints")
// } // }
let request = debugger.set_breakpoints(path, breakpoints.clone()); let request =
debugger.set_breakpoints(path.clone(), breakpoints.clone());
if let Err(e) = block_on(request) { if let Err(e) = block_on(request) {
cx.editor cx.editor
.set_status(format!("Failed to set breakpoints: {:?}", e)) .set_status(format!("Failed to set breakpoints: {:?}", e))

Write Preview
Loading…
Cancel
Save