85b4410 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

dap: Toggle breakpoints without changing selection, fix offset calc

85b4410Blaž Hrastnik5 years ago

helix-term/src/commands/dap.rs+14−19

compare with master

unifiedsplit

@@ -392,22 +392,25 @@ fn debug_parameter_prompt(

392pub fn dap_toggle_breakpoint(cx: &mut Context) {

393 // TODO: accept line instead of current selection

394 let (view, doc) = current!(cx.editor);

395− let text = doc.text().slice(..);

396− let pos = doc.selection(view.id).primary().cursor(text);

397−

398− let breakpoint = helix_dap::SourceBreakpoint {

399− line: text.char_to_line(pos) + 1, // convert from 0-indexing to 1-indexing (TODO: could set debugger to 0-indexing on init)

400− ..Default::default()

401− };

402−

403 let path = match doc.path() {

395 let path = match doc.path() {

404− Some(path) => path,

396+ Some(path) => path.clone(),

405 None => {

397 None => {

406 cx.editor

398 cx.editor

407 .set_error("Can't set breakpoint: document has no path".to_string());

399 .set_error("Can't set breakpoint: document has no path".to_string());

408 return;

400 return;

409 }

401 }

410 };

402 };

403+ let text = doc.text().slice(..);

404+ let pos = doc.selection(view.id).primary().cursor(text);

405+ let line = text.char_to_line(pos);

406+ dap_toggle_breakpoint_impl(cx, path, line);

407+}

408+

409+pub fn dap_toggle_breakpoint_impl(cx: &mut Context, path: std::path::PathBuf, line: usize) {

410+ let breakpoint = helix_dap::SourceBreakpoint {

411+ line: line + 1, // convert from 0-indexing to 1-indexing (TODO: could set debugger to 0-indexing on init)

412+ ..Default::default()

413+ };

411

414

412 // TODO: need to map breakpoints over edits and update them?

415 // TODO: need to map breakpoints over edits and update them?

413 // we shouldn't really allow editing while debug is running though

416 // we shouldn't really allow editing while debug is running though

@@ -429,16 +432,8 @@ pub fn dap_toggle_breakpoint(cx: &mut Context) {

429 let request = debugger.set_breakpoints(path.clone(), breakpoints);

432 let request = debugger.set_breakpoints(path.clone(), breakpoints);

430 match block_on(request) {

433 match block_on(request) {

431 Ok(Some(breakpoints)) => {

434 Ok(Some(breakpoints)) => {

432− // TODO: avoid this clone here

435+ // TODO: handle breakpoint.message

433− let old_breakpoints = std::mem::replace(&mut debugger.breakpoints, breakpoints.clone());

434− for bp in breakpoints {

436+ debugger.breakpoints = breakpoints;

435− if !old_breakpoints.iter().any(|b| b.message == bp.message) {

436− if let Some(msg) = &bp.message {

437− cx.editor.set_status(format!("Breakpoint set: {}", msg));

438− break;

439− }

440− }

441− }

442 }

437 }

443 Err(e) => cx

438 Err(e) => cx

444 .editor

439 .editor

helix-term/src/ui/editor.rs+16−13

@@ -985,14 +985,19 @@ impl EditorView {

985 if let Some((coords, view_id)) = result {

986 editor.tree.focus = view_id;

987

988− let doc = editor

988+ let view = editor.tree.get(view_id);

989− .documents

989+ let doc = editor.documents.get_mut(&view.doc).unwrap();

990− .get_mut(&editor.tree.get(view_id).doc)

990+

991− .unwrap();

991+ let path = match doc.path() {

992− if let Ok(pos) = doc.text().try_line_to_char(coords.row) {

992+ Some(path) => path.clone(),

993− doc.set_selection(view_id, Selection::point(pos));

993+ None => {

994− commands::dap_toggle_breakpoint(cxt);

994+ return EventResult::Ignored;

995+ }

996+ };

995

997

998+ let line = coords.row + view.offset.row;

999+ if line < doc.text().len_lines() {

1000+ commands::dap_toggle_breakpoint_impl(cxt, path, line);

996 return EventResult::Consumed(None);

1001 return EventResult::Consumed(None);

997 }

1002 }

998 }

1003 }

@@ -1087,12 +1092,10 @@ impl EditorView {

1087 if let Some((coords, view_id)) = result {

1092 if let Some((coords, view_id)) = result {

1088 cxt.editor.tree.focus = view_id;

1093 cxt.editor.tree.focus = view_id;

1089

1094

1090− let doc = cxt

1095+ let view = cxt.editor.tree.get(view_id);

1091− .editor

1096+ let doc = cxt.editor.documents.get_mut(&view.doc).unwrap();

1092− .documents

1097+ let line = coords.row + view.offset.row;

1093− .get_mut(&cxt.editor.tree.get(view_id).doc)

1094− .unwrap();

1095− if let Ok(pos) = doc.text().try_line_to_char(coords.row) {

1098+ if let Ok(pos) = doc.text().try_line_to_char(line) {

1096 doc.set_selection(view_id, Selection::point(pos));

1099 doc.set_selection(view_id, Selection::point(pos));

1097 if modifiers == crossterm::event::KeyModifiers::ALT {

1100 if modifiers == crossterm::event::KeyModifiers::ALT {

1098 commands::Command::dap_edit_log.execute(cxt);

1101 commands::Command::dap_edit_log.execute(cxt);