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

Merge 2fb78aa1da into a219d5aabb

Browse Source
This commit is contained in:
Egor Gladkih 2024-11-20 17:46:10 +00:00 committed by GitHub
commit dbefb33855
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
book/src/editor.md
View File

@ -116,6 +116,7 @@ ### `[editor.lsp]` Section
| 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 progress messages below statusline[^1] | `false` |
| `auto-signature-help` | Enable automatic popup of signature help (parameter hints) | `true` |
| `display-inlay-hints` | Display inlay hints[^2] | `false` |

7
helix-lsp/src/lib.rs
View File

@ -790,6 +790,7 @@ pub fn get<'a>(
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, .. }| {
@ -807,6 +808,12 @@ pub fn get<'a>(
}) {
return Some((name.to_owned(), Ok(client.clone())));
}
} else {
// If autostart LSP turned off, do not automatically start a client for server
// Try emulate the empty clients list behavior for disable LSP
if !autostart {
return None;
}
}
match self.start_client(
name.clone(),

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

@ -421,6 +421,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
@ -441,6 +443,7 @@ impl Default for LspConfig {
fn default() -> Self {
Self {
enable: true,
autostart: true,
display_progress_messages: false,
display_messages: true,
auto_signature_help: true,
@ -1459,7 +1462,7 @@ fn launch_language_servers(&mut self, doc_id: DocumentId) {
// 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) => {