andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Dmitry Sharshakov 2021-08-24 11:32:44 +03:00
parent 2158366b24
commit 34c6094604
No known key found for this signature in database
GPG Key ID: 471FD32E15FD8473
5 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

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

4
helix-dap/src/client.rs
View File

@ -225,9 +225,7 @@ async fn request<R: crate::types::Request>(
}
pub fn capabilities(&self) -> &DebuggerCapabilities {
self.caps
.as_ref()
.expect("debugger not yet initialized!")
self.caps.as_ref().expect("debugger not yet initialized!")
}
pub async fn initialize(&mut self, adapter_id: String) -> Result<()> {

2
helix-term/Cargo.toml
View File

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

15
helix-term/src/application.rs
View File

@ -13,7 +13,6 @@
};
use log::error;
use smallvec::smallvec;
use std::{
io::{stdout, Write},
sync::Arc,
@ -305,20 +304,17 @@ pub async fn handle_debugger_message(&mut self, payload: helix_dap::Payload) {
if let Some(helix_dap::StackFrame {
source:
Some(helix_dap::Source {
path: Some(src), ..
path: Some(ref src),
..
}),
line,
column,
end_line,
end_column,
..
}) = &debugger.stack_pointer
}) = debugger.stack_pointer
{
let path = src.clone();
let line = *line;
let column = *column;
let end_line = *end_line;
let end_column = *end_column;
self.editor
.open(path, helix_view::editor::Action::Replace)
.unwrap();
@ -333,7 +329,10 @@ pub async fn handle_debugger_message(&mut self, payload: helix_dap::Payload) {
doc.set_selection(
view.id,
Selection::new(
smallvec![Range::new(start.min(text_end), end.min(text_end))],
helix_core::SmallVec::from_vec(vec![Range::new(
start.min(text_end),
end.min(text_end),
)]),
0,
),
);

6
helix-term/src/commands.rs
View File

@ -4422,11 +4422,7 @@ fn dap_start(cx: &mut Context) {
let request = debugger.initialize(config.name);
let _ = block_on(request).unwrap();
let sessions = cx
.editor
.syn_loader
.language_config_for_file_name(&path)
.and_then(|x| x.debug_configs.clone());
let sessions = doc.language_config().and_then(|x| x.debug_configs.clone());
let sessions = match sessions {
Some(c) => c,