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

Merge pull request #38767 from ofrank123/bug/lsp-save-error 

[3.2.2] Fix incorrect initialize notification in language server
This commit is contained in:
Rémi Verschelde 2020-05-15 23:55:07 +02:00 committed by GitHub
parent 0556a48bf9 2173d041af
commit 000899647a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -486,7 +486,7 @@ struct TextDocumentSyncOptions {
* If present save notifications are sent to the server. If omitted the notification should not be * If present save notifications are sent to the server. If omitted the notification should not be
* sent. * sent.
*/ */
SaveOptions save; bool save = false;
Dictionary to_json() { Dictionary to_json() {
Dictionary dict; Dictionary dict;
@ -494,7 +494,7 @@ struct TextDocumentSyncOptions {
dict["willSave"] = willSave; dict["willSave"] = willSave;
dict["openClose"] = openClose; dict["openClose"] = openClose;
dict["change"] = change; dict["change"] = change;
dict["save"] = save.to_json(); dict["save"] = save;
return dict; return dict;
} }
}; };
@ -1642,7 +1642,7 @@ struct ServerCapabilities {
_FORCE_INLINE_ Dictionary to_json() { _FORCE_INLINE_ Dictionary to_json() {
Dictionary dict; Dictionary dict;
dict["textDocumentSync"] = (int)textDocumentSync.change; dict["textDocumentSync"] = textDocumentSync.to_json();
dict["completionProvider"] = completionProvider.to_json(); dict["completionProvider"] = completionProvider.to_json();
signatureHelpProvider.triggerCharacters.push_back(","); signatureHelpProvider.triggerCharacters.push_back(",");
signatureHelpProvider.triggerCharacters.push_back("("); signatureHelpProvider.triggerCharacters.push_back("(");

2
modules/jsonrpc/jsonrpc.cpp
View File

@ -120,7 +120,7 @@ Variant JSONRPC::process_action(const Variant &p_action, bool p_process_arr_elem
} }
if (object == NULL || !object->has_method(method)) { if (object == NULL || !object->has_method(method)) {
ret = make_response_error(JSONRPC::METHOD_NOT_FOUND, "Method not found", id); ret = make_response_error(JSONRPC::METHOD_NOT_FOUND, "Method not found: " + method, id);
} else { } else {
Variant call_ret = object->callv(method, args); Variant call_ret = object->callv(method, args);
if (id.get_type() != Variant::NIL) { if (id.get_type() != Variant::NIL) {