godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59482 from kurtlachmann/lsp_better_parentheses

This commit is contained in:
Rémi Verschelde 2022-06-15 15:31:35 +02:00 committed by GitHub
parent cc6b2f4287 bbb07ff8cb
commit 9839761e24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gdscript/language_server/gdscript_text_document.cpp
View File

@ -169,6 +169,7 @@ Array GDScriptTextDocument::completion(const Dictionary &p_params) {
lsp::CompletionItem item; lsp::CompletionItem item;
item.label = option.display; item.label = option.display;
item.data = request_data; item.data = request_data;
item.insertText = option.insert_text;
switch (option.kind) { switch (option.kind) {
case ScriptLanguage::CODE_COMPLETION_KIND_ENUM: case ScriptLanguage::CODE_COMPLETION_KIND_ENUM:
@ -278,12 +279,7 @@ Dictionary GDScriptTextDocument::resolve(const Dictionary &p_params) {
item.documentation = symbol->render(); item.documentation = symbol->render();
} }
if ((item.kind == lsp::CompletionItemKind::Method || item.kind == lsp::CompletionItemKind::Function) && !item.label.ends_with("):")) { if (item.kind == lsp::CompletionItemKind::Event) {
item.insertText = item.label + "(";
if (symbol && symbol->children.is_empty()) {
item.insertText += ")";
}
} else if (item.kind == lsp::CompletionItemKind::Event) {
if (params.context.triggerKind == lsp::CompletionTriggerKind::TriggerCharacter && (params.context.triggerCharacter == "(")) { if (params.context.triggerKind == lsp::CompletionTriggerKind::TriggerCharacter && (params.context.triggerCharacter == "(")) {
const String quote_style = EDITOR_GET("text_editor/completion/use_single_quotes") ? "'" : "\""; const String quote_style = EDITOR_GET("text_editor/completion/use_single_quotes") ? "'" : "\"";
item.insertText = item.label.quote(quote_style); item.insertText = item.label.quote(quote_style);

2
modules/gdscript/language_server/lsp.hpp
View File

@ -1004,8 +1004,8 @@ struct CompletionItem {
dict["label"] = label; dict["label"] = label;
dict["kind"] = kind; dict["kind"] = kind;
dict["data"] = data; dict["data"] = data;
if (resolved) {
dict["insertText"] = insertText; dict["insertText"] = insertText;
if (resolved) {
dict["detail"] = detail; dict["detail"] = detail;
dict["documentation"] = documentation.to_json(); dict["documentation"] = documentation.to_json();
dict["deprecated"] = deprecated; dict["deprecated"] = deprecated;