From 885d905b0d4d0a1cf51fe72ba5d0b5ffc04bd539 Mon Sep 17 00:00:00 2001 From: Francois Belair Date: Thu, 8 Jul 2021 15:21:14 -0400 Subject: [PATCH] Make LSP send applyEdit to connect editor signals --- .../gdscript_language_protocol.cpp | 17 ++++++ .../gdscript_language_protocol.h | 2 + .../language_server/gdscript_workspace.cpp | 52 +++++++++++++++++++ .../language_server/gdscript_workspace.h | 2 + modules/gdscript/language_server/lsp.hpp | 22 ++++++++ 5 files changed, 95 insertions(+) diff --git a/modules/gdscript/language_server/gdscript_language_protocol.cpp b/modules/gdscript/language_server/gdscript_language_protocol.cpp index 78e5de5f1a3d..1da110242ff0 100644 --- a/modules/gdscript/language_server/gdscript_language_protocol.cpp +++ b/modules/gdscript/language_server/gdscript_language_protocol.cpp @@ -284,6 +284,23 @@ void GDScriptLanguageProtocol::notify_client(const String &p_method, const Varia peer->res_queue.push_back(msg.utf8()); } +void GDScriptLanguageProtocol::request_client(const String &p_method, const Variant &p_params, int p_client_id) { + if (p_client_id == -1) { + ERR_FAIL_COND_MSG(latest_client_id == -1, + "GDScript LSP: Can't notify client as none was connected."); + p_client_id = latest_client_id; + } + ERR_FAIL_COND(!clients.has(p_client_id)); + Ref peer = clients.get(p_client_id); + ERR_FAIL_COND(peer == nullptr); + + Dictionary message = make_request(p_method, p_params, next_server_id); + next_server_id++; + String msg = JSON::print(message); + msg = format_output(msg); + peer->res_queue.push_back(msg.utf8()); +} + bool GDScriptLanguageProtocol::is_smart_resolve_enabled() const { return bool(_EDITOR_GET("network/language_server/enable_smart_resolve")); } diff --git a/modules/gdscript/language_server/gdscript_language_protocol.h b/modules/gdscript/language_server/gdscript_language_protocol.h index 8b08ae0655c8..346473a4f7de 100644 --- a/modules/gdscript/language_server/gdscript_language_protocol.h +++ b/modules/gdscript/language_server/gdscript_language_protocol.h @@ -72,6 +72,7 @@ class GDScriptLanguageProtocol : public JSONRPC { Ref server; int latest_client_id = 0; int next_client_id = 0; + int next_server_id = 0; Ref text_document; Ref workspace; @@ -101,6 +102,7 @@ class GDScriptLanguageProtocol : public JSONRPC { void stop(); void notify_client(const String &p_method, const Variant &p_params = Variant(), int p_client_id = -1); + void request_client(const String &p_method, const Variant &p_params = Variant(), int p_client_id = -1); bool is_smart_resolve_enabled() const; bool is_goto_native_symbols_enabled() const; diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp index 206f5c508f27..3ad467a5f5fc 100644 --- a/modules/gdscript/language_server/gdscript_workspace.cpp +++ b/modules/gdscript/language_server/gdscript_workspace.cpp @@ -49,6 +49,55 @@ void GDScriptWorkspace::_bind_methods() { ClassDB::bind_method(D_METHOD("get_file_uri", "path"), &GDScriptWorkspace::get_file_uri); ClassDB::bind_method(D_METHOD("publish_diagnostics", "path"), &GDScriptWorkspace::publish_diagnostics); ClassDB::bind_method(D_METHOD("generate_script_api", "path"), &GDScriptWorkspace::generate_script_api); + ClassDB::bind_method(D_METHOD("apply_new_signal", "obj", "function", "args"), &GDScriptWorkspace::apply_new_signal); +} + +void GDScriptWorkspace::apply_new_signal(Object *obj, String function, PoolStringArray args) { + String function_signature = "func " + function; + Ref