Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-10 21:09:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added setting to enable / disable gdscript's language server.

Browse Source
This commit is contained in:
Relintai 2023-10-02 19:37:38 +02:00
parent 19d2c42c46
commit d4b82d2724
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/gdscript/language_server/gdscript_language_server.cpp
View File

@ -45,6 +45,7 @@ GDScriptLanguageServer::GDScriptLanguageServer() {
host = "127.0.0.1"; host = "127.0.0.1";
port = 6008; port = 6008;
_EDITOR_DEF("network/language_server/enabled", enabled, true);
_EDITOR_DEF("network/language_server/remote_host", host); _EDITOR_DEF("network/language_server/remote_host", host);
_EDITOR_DEF("network/language_server/remote_port", port); _EDITOR_DEF("network/language_server/remote_port", port);
_EDITOR_DEF("network/language_server/enable_smart_resolve", true); _EDITOR_DEF("network/language_server/enable_smart_resolve", true);
@ -66,6 +67,10 @@ void GDScriptLanguageServer::_notification(int p_what) {
} }
} break; } break;
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
if (!enabled) {
return;
}
String host = String(_EDITOR_GET("network/language_server/remote_host")); String host = String(_EDITOR_GET("network/language_server/remote_host"));
int port = (GDScriptLanguageServer::port_override > -1) ? GDScriptLanguageServer::port_override : (int)_EDITOR_GET("network/language_server/remote_port"); int port = (GDScriptLanguageServer::port_override > -1) ? GDScriptLanguageServer::port_override : (int)_EDITOR_GET("network/language_server/remote_port");
bool use_thread = (bool)_EDITOR_GET("network/language_server/use_thread"); bool use_thread = (bool)_EDITOR_GET("network/language_server/use_thread");
@ -87,9 +92,15 @@ void GDScriptLanguageServer::thread_main(void *p_userdata) {
} }
void GDScriptLanguageServer::start() { void GDScriptLanguageServer::start() {
enabled = _EDITOR_GET("network/language_server/enabled");
host = String(_EDITOR_GET("network/language_server/remote_host")); host = String(_EDITOR_GET("network/language_server/remote_host"));
port = (GDScriptLanguageServer::port_override > -1) ? GDScriptLanguageServer::port_override : (int)_EDITOR_GET("network/language_server/remote_port"); port = (GDScriptLanguageServer::port_override > -1) ? GDScriptLanguageServer::port_override : (int)_EDITOR_GET("network/language_server/remote_port");
use_thread = (bool)_EDITOR_GET("network/language_server/use_thread"); use_thread = (bool)_EDITOR_GET("network/language_server/use_thread");
if (!enabled) {
return;
}
if (protocol.start(port, IP_Address(host)) == OK) { if (protocol.start(port, IP_Address(host)) == OK) {
EditorNode::get_log()->add_message("--- GDScript language server started on port " + itos(port) + " ---", EditorLog::MSG_TYPE_EDITOR); EditorNode::get_log()->add_message("--- GDScript language server started on port " + itos(port) + " ---", EditorLog::MSG_TYPE_EDITOR);
if (use_thread) { if (use_thread) {
@ -102,6 +113,10 @@ void GDScriptLanguageServer::start() {
} }
void GDScriptLanguageServer::stop() { void GDScriptLanguageServer::stop() {
if (!enabled) {
return;
}
if (use_thread) { if (use_thread) {
ERR_FAIL_COND(!thread.is_started()); ERR_FAIL_COND(!thread.is_started());
thread_running = false; thread_running = false;

2
modules/gdscript/language_server/gdscript_language_server.h
View File

@ -46,6 +46,8 @@ class GDScriptLanguageServer : public EditorPlugin {
bool use_thread; bool use_thread;
String host; String host;
int port; int port;
bool enabled;
static void thread_main(void *p_userdata); static void thread_main(void *p_userdata);
private: private: