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

Use insertText from the internal autocompletion

Browse Source 
* GDScriptLanguage::complete_code already adds parentheses to function calls, and does this a lot smarter than the language server right now.
* Instead of the previous naive approach we now reuse the same logic as the internal editor.
* For this to have any effect we also have to send the `insertText` field already during the completionRequest and not only during resolve.

(cherry picked from commit bbb07ff8cb)
This commit is contained in:
Kurt Lachmann 2022-03-24 20:24:47 +01:00 committed by Rémi Verschelde
parent d525d902c1
commit c07d1d0de8
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

@ -171,6 +171,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 ScriptCodeCompletionOption::KIND_ENUM: case ScriptCodeCompletionOption::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.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 = quote_style + item.label + quote_style; item.insertText = quote_style + item.label + 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;