Skip to content

Commit

Permalink
Omit quotes from completion if triggered with quote
Browse files Browse the repository at this point in the history
Typing a single or double quote in an external editor triggers
auto-completion. The returned CompletionItem should not include
quotes since they're already in the editor.

CompletionParams was missing context in to_json() and this is
required to detect whether a quote was typed.
  • Loading branch information
0x4448 committed Sep 22, 2023
1 parent fe5b1c8 commit 7ea4247
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
9 changes: 9 additions & 0 deletions modules/gdscript/language_server/gdscript_text_document.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,15 @@ Dictionary GDScriptTextDocument::resolve(const Dictionary &p_params) {
}
}

if (item.kind == lsp::CompletionItemKind::Method) {
bool is_trigger_character = params.context.triggerKind == lsp::CompletionTriggerKind::TriggerCharacter;
bool is_quote_character = params.context.triggerCharacter == "\"" || params.context.triggerCharacter == "'";

if (is_trigger_character && is_quote_character && item.insertText.is_quoted()) {
item.insertText = item.insertText.unquote();
}
}

return item.to_json(true);
}

Expand Down
11 changes: 11 additions & 0 deletions modules/gdscript/language_server/godot_lsp.h
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,17 @@ struct CompletionParams : public TextDocumentPositionParams {
TextDocumentPositionParams::load(p_params);
context.load(p_params["context"]);
}

Dictionary to_json() {
Dictionary ctx;
ctx["triggerCharacter"] = context.triggerCharacter;
ctx["triggerKind"] = context.triggerKind;

Dictionary dict;
dict = TextDocumentPositionParams::to_json();
dict["context"] = ctx;
return dict;
}
};

/**
Expand Down

0 comments on commit 7ea4247

Please sign in to comment.