diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-19 21:45:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-19 21:45:34 +0200 |
commit | d88be9b70cfecb0ec525216c1bb6267c9d1aa17d (patch) | |
tree | f0493f77faaea415faab110fe00cb71d27ebea0e /modules/gdscript/language_server/gdscript_language_protocol.cpp | |
parent | d7a42a44be107d048447dcaeba7c508402096d90 (diff) | |
parent | 2bafcd3422bea8baf2282f5de87538a59f0bb254 (diff) | |
download | redot-engine-d88be9b70cfecb0ec525216c1bb6267c9d1aa17d.tar.gz |
Merge pull request #44806 from madmiraal/consolidate_json
Consolidate JSON, JSONParseResults and JSONParser into JSON
Diffstat (limited to 'modules/gdscript/language_server/gdscript_language_protocol.cpp')
-rw-r--r-- | modules/gdscript/language_server/gdscript_language_protocol.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/gdscript/language_server/gdscript_language_protocol.cpp b/modules/gdscript/language_server/gdscript_language_protocol.cpp index c16a7fa889..42ff8bb5b3 100644 --- a/modules/gdscript/language_server/gdscript_language_protocol.cpp +++ b/modules/gdscript/language_server/gdscript_language_protocol.cpp @@ -31,7 +31,6 @@ #include "gdscript_language_protocol.h" #include "core/config/project_settings.h" -#include "core/io/json.h" #include "editor/doc_tools.h" #include "editor/editor_log.h" #include "editor/editor_node.h" @@ -194,7 +193,7 @@ Dictionary GDScriptLanguageProtocol::initialize(const Dictionary &p_params) { vformat("GDScriptLanguageProtocol: Can't initialize invalid peer '%d'.", latest_client_id)); Ref<LSPeer> peer = clients.get(latest_client_id); if (peer != nullptr) { - String msg = JSON::print(request); + String msg = Variant(request).to_json_string(); msg = format_output(msg); (*peer)->res_queue.push_back(msg.utf8()); } @@ -280,7 +279,7 @@ void GDScriptLanguageProtocol::notify_client(const String &p_method, const Varia ERR_FAIL_COND(peer == nullptr); Dictionary message = make_notification(p_method, p_params); - String msg = JSON::print(message); + String msg = Variant(message).to_json_string(); msg = format_output(msg); peer->res_queue.push_back(msg.utf8()); } |