mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-04 11:27:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge 8342863876 into 7ebf650029

Browse source
This commit is contained in:
Egor Gladkih 2025-04-01 21:47:00 +09:00 • committed by GitHub
commit aed7c81435
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
book/src/editor.md
View file

@ -148,6 +148,7 @@ The following statusline elements can be configured:
| Key | Description | Default |
| --- | ----------- | ------- |
| `enable` | Enables LSP integration. Setting to false will completely disable language servers regardless of language settings.| `true` |
| `autostart` | Enables LSP autostart on file opening. Setting to false will require running the `:lsp-restart` command to manually start the language server.| `true` |
| `display-messages` | Display LSP `window/showMessage` messages below statusline[^1] | `true` |
| `display-progress-messages` | Display LSP progress messages below statusline[^1] | `false` |
| `auto-signature-help` | Enable automatic popup of signature help (parameter hints) | `true` |

5
helix-lsp/src/lib.rs
View file

@ -682,6 +682,7 @@ impl Registry {
doc_path: Option<&'a std::path::PathBuf>,
root_dirs: &'a [PathBuf],
enable_snippets: bool,
autostart: bool,
) -> impl Iterator<Item = (LanguageServerName, Result<Arc<Client>>)> + 'a {
language_config.language_servers.iter().filter_map(
move |LanguageServerFeatures { name, .. }| {
@ -703,6 +704,10 @@ impl Registry {
}) {
return Some((name.to_owned(), Ok(client.clone())));
}
} else if !autostart {
// If autostart LSP turned off, do not automatically start a client for server
// Try emulate the empty clients list behavior for disable LSP
return None;
}
match self.start_client(
name.clone(),

5
helix-view/src/editor.rs
View file

@ -446,6 +446,8 @@ pub fn get_terminal_provider() -> Option<TerminalConfig> {
pub struct LspConfig {
/// Enables LSP
pub enable: bool,
/// Autostart LSP on open file
pub autostart: bool,
/// Display LSP messagess from $/progress below statusline
pub display_progress_messages: bool,
/// Display LSP messages from window/showMessage below statusline
@ -468,6 +470,7 @@ impl Default for LspConfig {
fn default() -> Self {
Self {
enable: true,
autostart: true,
display_progress_messages: false,
display_messages: true,
auto_signature_help: true,
@ -1502,7 +1505,7 @@ impl Editor {
// store only successfully started language servers
let language_servers = lang.as_ref().map_or_else(HashMap::default, |language| {
self.language_servers
.get(language, path.as_ref(), root_dirs, config.lsp.snippets)
.get(language, path.as_ref(), root_dirs, config.lsp.snippets, config.lsp.autostart)
.filter_map(|(lang, client)| match client {
Ok(client) => Some((lang, client)),
Err(err) => {