diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-15 15:31:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-15 15:31:35 +0200 |
| commit | 9839761e2426265e111d713e51d185074f3603a0 (patch) | |
| tree | c655dcb0244f78b8d11a0e56631d7139171f5c46 /modules | |
| parent | cc6b2f42878656933e7ec2b7a3ad2c5126d56c55 (diff) | |
| parent | bbb07ff8cbd182c46f988b192b2d3882ed78cd5c (diff) | |
Merge pull request #59482 from kurtlachmann/lsp_better_parentheses
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdscript/language_server/gdscript_text_document.cpp | 8 | ||||
| -rw-r--r-- | modules/gdscript/language_server/lsp.hpp | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/modules/gdscript/language_server/gdscript_text_document.cpp b/modules/gdscript/language_server/gdscript_text_document.cpp index d763701911..5ad9680ea0 100644 --- a/modules/gdscript/language_server/gdscript_text_document.cpp +++ b/modules/gdscript/language_server/gdscript_text_document.cpp @@ -169,6 +169,7 @@ Array GDScriptTextDocument::completion(const Dictionary &p_params) { lsp::CompletionItem item; item.label = option.display; item.data = request_data; + item.insertText = option.insert_text; switch (option.kind) { case ScriptLanguage::CODE_COMPLETION_KIND_ENUM: @@ -278,12 +279,7 @@ Dictionary GDScriptTextDocument::resolve(const Dictionary &p_params) { item.documentation = symbol->render(); } - if ((item.kind == lsp::CompletionItemKind::Method || item.kind == lsp::CompletionItemKind::Function) && !item.label.ends_with("):")) { - item.insertText = item.label + "("; - if (symbol && symbol->children.is_empty()) { - item.insertText += ")"; - } - } else if (item.kind == lsp::CompletionItemKind::Event) { + if (item.kind == lsp::CompletionItemKind::Event) { if (params.context.triggerKind == lsp::CompletionTriggerKind::TriggerCharacter && (params.context.triggerCharacter == "(")) { const String quote_style = EDITOR_GET("text_editor/completion/use_single_quotes") ? "'" : "\""; item.insertText = item.label.quote(quote_style); diff --git a/modules/gdscript/language_server/lsp.hpp b/modules/gdscript/language_server/lsp.hpp index d4aa207972..1c9349097f 100644 --- a/modules/gdscript/language_server/lsp.hpp +++ b/modules/gdscript/language_server/lsp.hpp @@ -1004,8 +1004,8 @@ struct CompletionItem { dict["label"] = label; dict["kind"] = kind; dict["data"] = data; + dict["insertText"] = insertText; if (resolved) { - dict["insertText"] = insertText; dict["detail"] = detail; dict["documentation"] = documentation.to_json(); dict["deprecated"] = deprecated; |