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

Fix compilation

pull/574/head
Blaž Hrastnik 2021-11-07 00:31:39 +09:00
parent a5ea61433c
commit 2e1aa5f15b
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -391,7 +391,7 @@ dependencies = [
[[package]] [[package]]
name = "helix-dap" name = "helix-dap"
version = "0.4.1" version = "0.5.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"fern", "fern",

4
helix-term/src/commands/dap.rs
View File

@ -321,7 +321,7 @@ pub fn dap_launch(cx: &mut Context) {
cx.push_layer(Box::new(Picker::new( cx.push_layer(Box::new(Picker::new(
true, true,
config.templates.clone(), config.templates,
|template| template.name.as_str().into(), |template| template.name.as_str().into(),
|editor, template, _action| { |editor, template, _action| {
let completions = template.completion.clone(); let completions = template.completion.clone();
@ -560,7 +560,6 @@ pub fn dap_enable_exceptions(cx: &mut Context) {
) { ) {
cx.editor cx.editor
.set_error(format!("Failed to set up exception breakpoints: {:?}", e)); .set_error(format!("Failed to set up exception breakpoints: {:?}", e));
return;
} }
} }
@ -573,7 +572,6 @@ pub fn dap_disable_exceptions(cx: &mut Context) {
if let Err(e) = block_on(debugger.set_exception_breakpoints(vec![])) { if let Err(e) = block_on(debugger.set_exception_breakpoints(vec![])) {
cx.editor cx.editor
.set_error(format!("Failed to set up exception breakpoints: {:?}", e)); .set_error(format!("Failed to set up exception breakpoints: {:?}", e));
return;
} }
} }

4
helix-term/src/ui/editor.rs
View File

@ -1085,7 +1085,7 @@ impl EditorView {
if let Some((line, _, view_id)) = result { if let Some((line, _, view_id)) = result {
editor.tree.focus = view_id; editor.tree.focus = view_id;
let doc = &mut editor.documents[editor.tree.get(view_id).doc]; let doc = editor.documents.get_mut(&editor.tree.get(view_id).doc).unwrap();
if let Ok(pos) = doc.text().try_line_to_char(line) { if let Ok(pos) = doc.text().try_line_to_char(line) {
doc.set_selection(view_id, Selection::point(pos)); doc.set_selection(view_id, Selection::point(pos));
commands::dap_toggle_breakpoint(cxt); commands::dap_toggle_breakpoint(cxt);
@ -1184,7 +1184,7 @@ impl EditorView {
if let Some((line, _, view_id)) = result { if let Some((line, _, view_id)) = result {
cxt.editor.tree.focus = view_id; cxt.editor.tree.focus = view_id;
let doc = &mut cxt.editor.documents[cxt.editor.tree.get(view_id).doc]; let doc = cxt.editor.documents.get_mut(&cxt.editor.tree.get(view_id).doc).unwrap();
if let Ok(pos) = doc.text().try_line_to_char(line) { if let Ok(pos) = doc.text().try_line_to_char(line) {
doc.set_selection(view_id, Selection::point(pos)); doc.set_selection(view_id, Selection::point(pos));
if modifiers == crossterm::event::KeyModifiers::ALT { if modifiers == crossterm::event::KeyModifiers::ALT {