Skip to content

Commit

Permalink
add option to hide snippets
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalkuthe committed Mar 30, 2023
1 parent 8b3a386 commit b559129
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 7 deletions.
1 change: 1 addition & 0 deletions book/src/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ The following statusline elements can be configured:
| `auto-signature-help` | Enable automatic popup of signature help (parameter hints) | `true` |
| `display-inlay-hints` | Display inlay hints[^2] | `false` |
| `display-signature-help-docs` | Display docs under signature help popup | `true` |
| `show-snippet-completions` | Whether to show snippets as completion options | `true` |

[^1]: By default, a progress spinner is shown in the statusline beside the file path.
[^2]: You may also have to activate them in the LSP config for them to appear, not just in Helix.
Expand Down
8 changes: 8 additions & 0 deletions helix-lsp/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,14 @@ pub mod util {
transaction.with_selection(selection)
}

pub fn is_snippet(item: &lsp::CompletionItem) -> bool {
matches!(item.kind, Some(lsp::CompletionItemKind::SNIPPET))
|| matches!(
item.insert_text_format,
Some(lsp::InsertTextFormat::SNIPPET)
)
}

/// Creates a [Transaction] from the [snippet::Snippet] in a completion response.
/// The transaction applies the edit to all cursors.
#[allow(clippy::too_many_arguments)]
Expand Down
16 changes: 9 additions & 7 deletions helix-term/src/ui/completion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ use helix_view::{graphics::Rect, Document, Editor};
use crate::commands;
use crate::ui::{menu, Markdown, Menu, Popup, PromptEvent};

use helix_lsp::{lsp, util};
use helix_lsp::{
lsp,
util::{self, is_snippet},
};
use lsp::CompletionItem;

impl menu::Item for CompletionItem {
Expand Down Expand Up @@ -107,8 +110,12 @@ impl Completion {
offset_encoding: helix_lsp::OffsetEncoding,
start_offset: usize,
trigger_offset: usize,
show_snippets: bool,
) -> Self {
let replace_mode = editor.config().completion_replace;
if !show_snippets {
items.retain(|completion| !is_snippet(completion))
}
// Sort completion items according to their preselect status (given by the LSP server)
items.sort_by_key(|item| !item.preselect.unwrap_or(false));

Expand Down Expand Up @@ -166,12 +173,7 @@ impl Completion {
(None, new_text)
};

if matches!(item.kind, Some(lsp::CompletionItemKind::SNIPPET))
|| matches!(
item.insert_text_format,
Some(lsp::InsertTextFormat::SNIPPET)
)
{
if is_snippet(item) {
match snippet::parse(&new_text) {
Ok(snippet) => util::generate_transaction_from_snippet(
doc.text(),
Expand Down
1 change: 1 addition & 0 deletions helix-term/src/ui/editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,7 @@ impl EditorView {
offset_encoding,
start_offset,
trigger_offset,
editor.config().lsp.show_snippet_completions,
);

if completion.is_empty() {
Expand Down
3 changes: 3 additions & 0 deletions helix-view/src/editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,8 @@ pub struct LspConfig {
pub display_signature_help_docs: bool,
/// Display inlay hints
pub display_inlay_hints: bool,
/// Whether to enable snippet support
pub show_snippet_completions: bool,
}

impl Default for LspConfig {
Expand All @@ -362,6 +364,7 @@ impl Default for LspConfig {
auto_signature_help: true,
display_signature_help_docs: true,
display_inlay_hints: false,
show_snippet_completions: true,
}
}
}
Expand Down

0 comments on commit b559129

Please sign in to comment.