git.iko.soy/helix
on master help sign in
Fix compilation
2e1aa5fBlaž Hrastnik
Cargo.lock+1−1
compare with master
unifiedsplit
@@ -391,7 +391,7 @@ dependencies = [
391
391
392[[package]]
392[[package]]
393name = "helix-dap"
393name = "helix-dap"
394−version = "0.4.1"
394+version = "0.5.0"
395dependencies = [
395dependencies = [
396 "anyhow",
396 "anyhow",
397 "fern",
397 "fern",
helix-term/src/commands/dap.rs+1−3
@@ -321,7 +321,7 @@ pub fn dap_launch(cx: &mut Context) {
321
321
322 cx.push_layer(Box::new(Picker::new(
322 cx.push_layer(Box::new(Picker::new(
323 true,
323 true,
324− config.templates.clone(),
324+ config.templates,
325 |template| template.name.as_str().into(),
325 |template| template.name.as_str().into(),
326 |editor, template, _action| {
326 |editor, template, _action| {
327 let completions = template.completion.clone();
327 let completions = template.completion.clone();
@@ -560,7 +560,6 @@ pub fn dap_enable_exceptions(cx: &mut Context) {
560 ) {
560 ) {
561 cx.editor
561 cx.editor
562 .set_error(format!("Failed to set up exception breakpoints: {:?}", e));
562 .set_error(format!("Failed to set up exception breakpoints: {:?}", e));
563− return;
564 }
563 }
565}
564}
566
565
@@ -573,7 +572,6 @@ pub fn dap_disable_exceptions(cx: &mut Context) {
573 if let Err(e) = block_on(debugger.set_exception_breakpoints(vec![])) {
572 if let Err(e) = block_on(debugger.set_exception_breakpoints(vec![])) {
574 cx.editor
573 cx.editor
575 .set_error(format!("Failed to set up exception breakpoints: {:?}", e));
574 .set_error(format!("Failed to set up exception breakpoints: {:?}", e));
576− return;
577 }
575 }
578}
576}
579
577
helix-term/src/ui/editor.rs+2−2
@@ -1085,7 +1085,7 @@ impl EditorView {
1085 if let Some((line, _, view_id)) = result {
1085 if let Some((line, _, view_id)) = result {
1086 editor.tree.focus = view_id;
1086 editor.tree.focus = view_id;
1087
1087
1088− let doc = &mut editor.documents[editor.tree.get(view_id).doc];
1088+ let doc = editor.documents.get_mut(&editor.tree.get(view_id).doc).unwrap();
1089 if let Ok(pos) = doc.text().try_line_to_char(line) {
1089 if let Ok(pos) = doc.text().try_line_to_char(line) {
1090 doc.set_selection(view_id, Selection::point(pos));
1090 doc.set_selection(view_id, Selection::point(pos));
1091 commands::dap_toggle_breakpoint(cxt);
1091 commands::dap_toggle_breakpoint(cxt);
@@ -1184,7 +1184,7 @@ impl EditorView {
1184 if let Some((line, _, view_id)) = result {
1184 if let Some((line, _, view_id)) = result {
1185 cxt.editor.tree.focus = view_id;
1185 cxt.editor.tree.focus = view_id;
1186
1186
1187− let doc = &mut cxt.editor.documents[cxt.editor.tree.get(view_id).doc];
1187+ let doc = cxt.editor.documents.get_mut(&cxt.editor.tree.get(view_id).doc).unwrap();
1188 if let Ok(pos) = doc.text().try_line_to_char(line) {
1188 if let Ok(pos) = doc.text().try_line_to_char(line) {
1189 doc.set_selection(view_id, Selection::point(pos));
1189 doc.set_selection(view_id, Selection::point(pos));
1190 if modifiers == crossterm::event::KeyModifiers::ALT {
1190 if modifiers == crossterm::event::KeyModifiers::ALT {