editor: select a range if stack pointer has an end

imgbot
Dmitry Sharshakov 3 years ago
parent 132198323c
commit d0b0c9b2ef
No known key found for this signature in database
GPG Key ID: 471FD32E15FD8473

1
Cargo.lock generated

@ -388,6 +388,7 @@ dependencies = [
"serde_json", "serde_json",
"signal-hook", "signal-hook",
"signal-hook-tokio", "signal-hook-tokio",
"smallvec",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"toml", "toml",

@ -56,5 +56,7 @@ toml = "0.5"
serde_json = "1.0" serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
smallvec = "1.4"
[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100 [target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] } signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }

@ -1,4 +1,4 @@
use helix_core::{syntax, Selection}; use helix_core::{syntax, Range, Selection};
use helix_dap::Payload; use helix_dap::Payload;
use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap}; use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
use helix_view::{theme, Editor}; use helix_view::{theme, Editor};
@ -13,7 +13,7 @@ use crate::{
}; };
use log::error; use log::error;
use smallvec::smallvec;
use std::{ use std::{
io::{stdout, Write}, io::{stdout, Write},
sync::Arc, sync::Arc,
@ -309,19 +309,32 @@ impl Application {
}), }),
line, line,
column, column,
end_line,
end_column,
.. ..
}) = &debugger.stack_pointer }) = &debugger.stack_pointer
{ {
let path = src.clone(); let path = src.clone();
let line = *line; let line = *line;
let column = *column; let column = *column;
let end_line = *end_line;
let end_column = *end_column;
self.editor self.editor
.open(path, helix_view::editor::Action::Replace) .open(path, helix_view::editor::Action::Replace)
.unwrap(); .unwrap();
let (view, doc) = current!(self.editor); let (view, doc) = current!(self.editor);
let pos = doc.text().line_to_char(line - 1) + column; let start = doc.text().line_to_char(line - 1) + column;
doc.set_selection(view.id, Selection::point(pos)); if let Some(end_line) = end_line {
let end =
doc.text().line_to_char(end_line - 1) + end_column.unwrap_or(0);
doc.set_selection(
view.id,
Selection::new(smallvec![Range::new(start, end)], 0),
);
} else {
doc.set_selection(view.id, Selection::point(start));
}
align_view(doc, view, Align::Center); align_view(doc, view, Align::Center);
} }
self.editor.set_status(status); self.editor.set_status(status);

Loading…
Cancel
Save