foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 17:34:47 -05:00
Code Issues Packages 1 Wiki Activity

feat(lsp): complete parameters as tab stops and placeholders (#22126)

Browse source
This commit is contained in:
Nayeem Rahman 2024-01-26 13:41:12 +00:00 • committed by GitHub
parent 9951506506
commit 9a5b4b0395
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cli/lsp/tsc.rs
View file

@ -3057,7 +3057,11 @@ fn get_parameters_from_parts(parts: &[SymbolDisplayPart]) -> Vec<String> {
matches!(parts.get(idx + 1), Some(next) if next.text == "?"); matches!(parts.get(idx + 1), Some(next) if next.text == "?");
// Skip `this` and optional parameters. // Skip `this` and optional parameters.
if !is_optional && part.text != "this" { if !is_optional && part.text != "this" {
parameters.push(part.text.clone()); parameters.push(format!(
"${{{}:{}}}",
parameters.len() + 1,
&part.text
));
} }
} }
} else if part.kind == "punctuation" { } else if part.kind == "punctuation" {
@ -3165,7 +3169,9 @@ impl CompletionEntryDetails {
specifier, specifier,
language_server, language_server,
)?; )?;
let mut insert_text_format = original_item.insert_text_format;
let insert_text = if data.use_code_snippet { let insert_text = if data.use_code_snippet {
insert_text_format = Some(lsp::InsertTextFormat::SNIPPET);
Some(format!( Some(format!(
"{}({})", "{}({})",
original_item original_item
@ -3186,6 +3192,7 @@ impl CompletionEntryDetails {
text_edit, text_edit,
additional_text_edits, additional_text_edits,
insert_text, insert_text,
insert_text_format,
// NOTE(bartlomieju): it's not entirely clear to me why we need to do that, // NOTE(bartlomieju): it's not entirely clear to me why we need to do that,
// but when `completionItem/resolve` is called, we get a list of commit chars // but when `completionItem/resolve` is called, we get a list of commit chars
// even though we might have returned an empty list in `completion` request. // even though we might have returned an empty list in `completion` request.

4
cli/tests/integration/lsp_tests.rs
View file

@ -9037,8 +9037,8 @@ fn lsp_completions_complete_function_calls() {
"value": "Calls a defined callback function on each element of an array, and returns an array that contains the results.\n\n*@param* - callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array.*@param* - thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value." "value": "Calls a defined callback function on each element of an array, and returns an array that contains the results.\n\n*@param* - callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array.*@param* - thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value."
}, },
"sortText": "1", "sortText": "1",
"insertText": "map(callbackfn)", "insertText": "map(${1:callbackfn})",
"insertTextFormat": 1 "insertTextFormat": 2,
}) })
); );
client.shutdown(); client.shutdown();