extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-15 00:52:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(completion, lsp): include decl_id in suggetion_kind for later usage (#15536)

Browse Source 
# Description

Should be more performant, calling for `find_decl` by name for all
entries is generally a heavy op.

# User-Facing Changes

NA

# Tests + Formatting

# After Submitting
This commit is contained in:
zc he
2025-04-15 20:24:56 +08:00
committed by GitHub
parent e5f589ccdd
commit 56d7e4bb89
7 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/nu-lsp/src/completion.rs
View File

@ -62,17 +62,12 @@ impl LanguageServer {
suggestion: SemanticSuggestion,
range: Range,
) -> CompletionItem {
let decl_id = suggestion.kind.as_ref().and_then(|kind| {
matches!(kind, SuggestionKind::Command(_))
.then_some(engine_state.find_decl(suggestion.suggestion.value.as_bytes(), &[])?)
});
let mut snippet_text = suggestion.suggestion.value.clone();
let mut doc_string = suggestion.suggestion.extra.map(|ex| ex.join("\n"));
let mut insert_text_format = None;
let mut idx = 0;
// use snippet as `insert_text_format` for command argument completion
if let Some(decl_id) = decl_id {
if let Some(SuggestionKind::Command(_, Some(decl_id))) = suggestion.kind {
let cmd = engine_state.get_decl(decl_id);
doc_string = Some(Self::get_decl_description(cmd, true));
insert_text_format = Some(InsertTextFormat::SNIPPET);
@ -138,7 +133,7 @@ impl LanguageServer {
.as_ref()
.map(|kind| match kind {
SuggestionKind::Value(t) => t.to_string(),
SuggestionKind::Command(cmd) => cmd.to_string(),
SuggestionKind::Command(cmd, _) => cmd.to_string(),
SuggestionKind::Module => "module".to_string(),
SuggestionKind::Operator => "operator".to_string(),
SuggestionKind::Variable => "variable".to_string(),
@ -172,7 +167,7 @@ impl LanguageServer {
_ => None,
},
SuggestionKind::CellPath => Some(CompletionItemKind::PROPERTY),
SuggestionKind::Command(c) => match c {
SuggestionKind::Command(c, _) => match c {
CommandType::Keyword => Some(CompletionItemKind::KEYWORD),
CommandType::Builtin => Some(CompletionItemKind::FUNCTION),
CommandType::Alias => Some(CompletionItemKind::REFERENCE),