diff options
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | helix-dap/src/client.rs | 4 | ||||
| -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 |
5 files changed, 9 insertions, 19 deletions
@@ -390,7 +390,6 @@ dependencies = [ "serde_json", "signal-hook", "signal-hook-tokio", - "smallvec", "tokio", "tokio-stream", "toml", diff --git a/helix-dap/src/client.rs b/helix-dap/src/client.rs index 43afc4c6..ed4f8ed5 100644 --- a/helix-dap/src/client.rs +++ b/helix-dap/src/client.rs @@ -225,9 +225,7 @@ impl Client { } 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<()> { 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, |