diff options
| author | Dmitry Sharshakov | 2021-08-24 08:32:44 +0000 |
|---|---|---|
| committer | Dmitry Sharshakov | 2021-08-24 08:32:44 +0000 |
| commit | 34c6094604cfeca0c1338a20cf9e85bcd8d9b68b (patch) | |
| tree | 14fdfd3df3619fde77619cde828670f973497ace /helix-term | |
| parent | 2158366b24da8229e743546ccedc5cd05292e254 (diff) | |
refactor
Diffstat (limited to 'helix-term')
| -rw-r--r-- | helix-term/Cargo.toml | 2 | ||||
| -rw-r--r-- | helix-term/src/application.rs | 15 | ||||
| -rw-r--r-- | helix-term/src/commands.rs | 6 |
3 files changed, 8 insertions, 15 deletions
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml index 63856585..c0b2cfe5 100644 --- a/helix-term/Cargo.toml +++ b/helix-term/Cargo.toml @@ -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"] } diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs index 72f3a125..3f911195 100644 --- a/helix-term/src/application.rs +++ b/helix-term/src/application.rs @@ -13,7 +13,6 @@ use crate::{ }; use log::error; -use smallvec::smallvec; use std::{ io::{stdout, Write}, sync::Arc, @@ -305,20 +304,17 @@ impl Application { 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 @@ impl Application { 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, ), ); diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 74466e7e..8c1cd5d8 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -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, |