Unnamed repository; edit this file 'description' to name the repository.
helix-term: Start feature gating lsp
| -rw-r--r-- | helix-term/src/application.rs | 22 | ||||
| -rw-r--r-- | helix-term/src/commands.rs | 19 | ||||
| -rw-r--r-- | helix-view/Cargo.toml | 2 |
3 files changed, 37 insertions, 6 deletions
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs index 8b8f17e0..22c75336 100644 --- a/helix-term/src/application.rs +++ b/helix-term/src/application.rs @@ -3,13 +3,18 @@ use helix_core::{ config::{default_syntax_loader, user_syntax_loader}, pos_at_coords, syntax, Selection, }; + +#[cfg(feature = "lsp")] +use crate::commands::apply_workspace_edit; +#[cfg(feature = "lsp")] use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap}; -use helix_view::{align_view, editor::ConfigEvent, theme, Align, Editor}; +#[cfg(feature = "lsp")] use serde_json::json; +use helix_view::{align_view, editor::ConfigEvent, theme, Align, Editor}; + use crate::{ args::Args, - commands::apply_workspace_edit, compositor::Compositor, config::Config, job::Jobs, @@ -17,7 +22,6 @@ use crate::{ ui::{self, overlay::overlayed}, }; -use log::{error, warn}; use std::{ io::{stdin, stdout, Write}, sync::Arc, @@ -52,6 +56,7 @@ pub struct Application { signals: Signals, jobs: Jobs, + #[cfg(feature = "lsp")] lsp_progress: LspProgressMap, } @@ -199,6 +204,8 @@ impl Application { signals, jobs: Jobs::new(), + + #[cfg(feature = "lsp")] lsp_progress: LspProgressMap::new(), }; @@ -238,9 +245,12 @@ impl Application { self.handle_signals(signal).await; } Some((id, call)) = self.editor.language_servers.incoming.next() => { + #[cfg(feature = "lsp")] self.handle_language_server_message(call, id).await; // limit render calls for fast language server messages + #[cfg(feature = "lsp")] let last = self.editor.language_servers.incoming.is_empty(); + #[cfg(feature = "lsp")] if last || last_render.elapsed() > deadline { self.render(); last_render = Instant::now(); @@ -388,6 +398,7 @@ impl Application { } } + #[cfg(feature = "lsp")] pub async fn handle_language_server_message( &mut self, call: helix_lsp::Call, @@ -614,7 +625,7 @@ impl Application { let call = match MethodCall::parse(&method, params) { Some(call) => call, None => { - error!("Method not found {}", method); + log::error!("Method not found {}", method); return; } }; @@ -686,7 +697,7 @@ impl Application { let language_server = match self.editor.language_servers.get_by_id(server_id) { Some(language_server) => language_server, None => { - warn!("can't find language server with id `{}`", server_id); + log::warn!("can't find language server with id `{}`", server_id); return; } }; @@ -739,6 +750,7 @@ impl Application { self.jobs.finish().await; + #[cfg(feature = "lsp")] if self.editor.close_language_servers(None).await.is_err() { log::error!("Timed out waiting for language servers to shutdown"); }; diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 5453adeb..0f977737 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -1,10 +1,12 @@ #[cfg(feature = "dap")] pub(crate) mod dap; +#[cfg(feature = "lsp")] pub(crate) mod lsp; pub(crate) mod typed; #[cfg(feature = "dap")] pub use dap::*; +#[cfg(feature = "lsp")] pub use lsp::*; pub use typed::*; @@ -262,9 +264,12 @@ impl MappableCommand { command_mode, "Enter command mode", file_picker, "Open file picker", file_picker_in_current_directory, "Open file picker at current working directory", + #[cfg(feature = "lsp")] code_action, "Perform code action", buffer_picker, "Open buffer picker", + #[cfg(feature = "lsp")] symbol_picker, "Open symbol picker", + #[cfg(feature = "lsp")] workspace_symbol_picker, "Open workspace symbol picker", last_picker, "Open last picker", prepend_to_line, "Insert at start of line", @@ -274,16 +279,20 @@ impl MappableCommand { normal_mode, "Enter normal mode", select_mode, "Enter selection extend mode", exit_select_mode, "Exit selection mode", + #[cfg(feature = "lsp")] goto_definition, "Goto definition", add_newline_above, "Add newline above", add_newline_below, "Add newline below", + #[cfg(feature = "lsp")] goto_type_definition, "Goto type definition", + #[cfg(feature = "lsp")] goto_implementation, "Goto implementation", goto_file_start, "Goto line number <n> else file start", goto_file_end, "Goto file end", goto_file, "Goto files in selection", goto_file_hsplit, "Goto files in selection (hsplit)", goto_file_vsplit, "Goto files in selection (vsplit)", + #[cfg(feature = "lsp")] goto_reference, "Goto references", goto_window_top, "Goto window top", goto_window_center, "Goto window center", @@ -308,6 +317,7 @@ impl MappableCommand { extend_to_line_start, "Extend to line start", extend_to_line_end, "Extend to line end", extend_to_line_end_newline, "Extend to line end", + #[cfg(feature = "lsp")] signature_help, "Show signature help", insert_tab, "Insert tab char", insert_newline, "Insert newline char", @@ -345,6 +355,7 @@ impl MappableCommand { keep_primary_selection, "Keep primary selection", remove_primary_selection, "Remove primary selection", completion, "Invoke completion popup", + #[cfg(feature = "lsp")] hover, "Show docs for item under cursor", toggle_comments, "Comment/uncomment selections", rotate_selections_forward, "Rotate selections forward", @@ -429,6 +440,7 @@ impl MappableCommand { shell_append_output, "Append output of shell command after each selection", shell_keep_pipe, "Filter selections with shell predicate", suspend, "Suspend", + #[cfg(feature = "lsp")] rename_symbol, "Rename symbol", increment, "Increment", decrement, "Decrement", @@ -2669,6 +2681,7 @@ pub mod insert { super::completion(cx); } + #[cfg(feature = "lsp")] fn language_server_completion(cx: &mut Context, ch: char) { use helix_lsp::lsp; // if ch matches completion char, trigger completion @@ -2693,6 +2706,7 @@ pub mod insert { } } + #[cfg(feature = "lsp")] fn signature_help(cx: &mut Context, ch: char) { use helix_lsp::lsp; // if ch matches signature_help char, trigger @@ -2769,6 +2783,7 @@ pub mod insert { // TODO: need a post insert hook too for certain triggers (autocomplete, signature help, etc) // this could also generically look at Transaction, but it's a bit annoying to look at // Operation instead of Change. + #[cfg(feature = "lsp")] for hook in &[language_server_completion, signature_help] { // for hook in &[signature_help] { hook(cx, c); @@ -3402,6 +3417,10 @@ fn unindent(cx: &mut Context) { doc.apply(&transaction, view.id); } +#[cfg(not(feature = "lsp"))] +fn format_selections(_cx: &mut Context) {} + +#[cfg(feature = "lsp")] fn format_selections(cx: &mut Context) { use helix_lsp::{lsp, util::range_to_lsp_range}; diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml index e6729451..76281f8b 100644 --- a/helix-view/Cargo.toml +++ b/helix-view/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/helix-editor/helix" homepage = "https://helix-editor.com" [features] -default = ["dap", "lsp"] +# default = ["dap", "lsp"] lsp = ["helix-lsp"] dap = ["helix-dap", "tokio-stream"] term = ["crossterm"] |