From c25a2d832b3d706f6a1ba6cd5135c8213afe172d Mon Sep 17 00:00:00 2001
From: Omar Shehata <omar.sameh.shehata@gmail.com>
Date: Sat, 7 Oct 2023 22:14:54 -0400
Subject: [PATCH] Fix external editor hot reload

---
 editor/plugins/script_editor_plugin.cpp                     | 4 ++--
 editor/plugins/script_editor_plugin.h                       | 3 ++-
 editor/plugins/script_text_editor.cpp                       | 2 +-
 modules/gdscript/language_server/gdscript_text_document.cpp | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp
index c540004d3fc1..ec927f6c5d4b 100644
--- a/editor/plugins/script_editor_plugin.cpp
+++ b/editor/plugins/script_editor_plugin.cpp
@@ -987,7 +987,7 @@ void ScriptEditor::_res_saved_callback(const Ref<Resource> &p_res) {
 	}
 
 	_update_script_names();
-	_trigger_live_script_reload();
+	trigger_live_script_reload();
 }
 
 void ScriptEditor::_scene_saved_callback(const String &p_path) {
@@ -1015,7 +1015,7 @@ void ScriptEditor::_scene_saved_callback(const String &p_path) {
 	}
 }
 
-void ScriptEditor::_trigger_live_script_reload() {
+void ScriptEditor::trigger_live_script_reload() {
 	if (!pending_auto_reload && auto_reload_running_scripts) {
 		call_deferred(SNAME("_live_auto_reload_running_scripts"));
 		pending_auto_reload = true;
diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h
index 0241ca0e3ef5..cf071d182b6e 100644
--- a/editor/plugins/script_editor_plugin.h
+++ b/editor/plugins/script_editor_plugin.h
@@ -378,7 +378,6 @@ class ScriptEditor : public PanelContainer {
 
 	bool pending_auto_reload;
 	bool auto_reload_running_scripts;
-	void _trigger_live_script_reload();
 	void _live_auto_reload_running_scripts();
 
 	void _update_selected_editor_menu();
@@ -538,6 +537,8 @@ public:
 	void clear_docs_from_script(const Ref<Script> &p_script);
 	void update_docs_from_script(const Ref<Script> &p_script);
 
+	void trigger_live_script_reload();
+
 	bool can_take_away_focus() const;
 
 	VSplitContainer *get_left_list_split() { return list_split; }
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 20c4127c1d3b..5322f3c81386 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -809,7 +809,7 @@ void ScriptEditor::_update_modified_scripts_for_external_editor(Ref<Script> p_fo
 			scr->set_last_modified_time(rel_scr->get_last_modified_time());
 			scr->update_exports();
 
-			_trigger_live_script_reload();
+			trigger_live_script_reload();
 		}
 	}
 }
diff --git a/modules/gdscript/language_server/gdscript_text_document.cpp b/modules/gdscript/language_server/gdscript_text_document.cpp
index d6779dc71c6e..44f605232dc5 100644
--- a/modules/gdscript/language_server/gdscript_text_document.cpp
+++ b/modules/gdscript/language_server/gdscript_text_document.cpp
@@ -110,9 +110,11 @@ void GDScriptTextDocument::didSave(const Variant &p_param) {
 		} else {
 			scr->reload(true);
 		}
+
 		scr->update_exports();
 		ScriptEditor::get_singleton()->reload_scripts(true);
 		ScriptEditor::get_singleton()->update_docs_from_script(scr);
+		ScriptEditor::get_singleton()->trigger_live_script_reload();
 	}
 }