Save scene together with script/shader when ctrl-s is pressed.

Fixes godotengine#84601.

The scene will also silently be saved (just like before), since many users
are not necessarily aware that the script or shader editor editors are focused
at the time of saving. Now, however, if something causes the save to fail it
will not be notified to the user, in case the user to avoid the annoyance
caused by godotengine#84039.

Author: reduz

core/input/shortcut.cpp

@@ -86,6 +86,30 @@ String Shortcut::get_as_text() const {
 	return "None";
 }
 
+bool Shortcut::is_match(const Ref<Shortcut> &p_shortcut) const {
+	if (p_shortcut.is_null()) {
+		return false;
+	}
+
+	for (int i = 0; i < events.size(); i++) {
+		Ref<InputEvent> ie = events[i];
+		if (!ie.is_valid()) {
+			continue;
+		}
+		for (int j = 0; j < p_shortcut->events.size(); j++) {
+			Ref<InputEvent> ie_overlap = p_shortcut->events[i];
+			if (!ie_overlap.is_valid()) {
+				continue;
+			}
+
+			if (ie->is_match(ie_overlap)) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
 bool Shortcut::has_valid_event() const {
 	// Tests if there is ANY input event which is valid.
 	for (int i = 0; i < events.size(); i++) {

core/input/shortcut.h

@@ -51,6 +51,8 @@ class Shortcut : public Resource {
 	bool matches_event(const Ref<InputEvent> &p_event) const;
 	bool has_valid_event() const;
 
+	bool is_match(const Ref<Shortcut> &p_shortcut) const;
+
 	String get_as_text() const;
 
 	static bool is_event_array_equal(const Array &p_event_array1, const Array &p_event_array2);

editor/editor_node.cpp

@@ -1579,7 +1579,7 @@ void EditorNode::_find_node_types(Node *p_node, int &count_2d, int &count_3d) {
 	}
 }
 
-void EditorNode::_save_scene_with_preview(String p_file, int p_idx) {
+void EditorNode::_save_scene_with_preview(String p_file, int p_idx, bool p_show_error_dialogs) {
 	EditorProgress save("save", TTR("Saving Scene"), 4);
 
 	if (editor_data.get_edited_scene_root() != nullptr) {
@@ -1656,7 +1656,7 @@ void EditorNode::_save_scene_with_preview(String p_file, int p_idx) {
 	}
 
 	save.step(TTR("Saving Scene"), 4);
-	_save_scene(p_file, p_idx);
+	_save_scene(p_file, p_idx, p_show_error_dialogs);
 
 	if (!singleton->cmdline_export_mode) {
 		EditorResourcePreview::get_singleton()->check_for_invalidation(p_file);
@@ -1745,16 +1745,40 @@ static void _reset_animation_mixers(Node *p_node, List<Pair<AnimationMixer *, Re
 	}
 }
 
-void EditorNode::_save_scene(String p_file, int idx) {
+void EditorNode::save_scene_if_valid() {
+	// Do not save if no editing was made.
+	if (!EditorUndoRedoManager::get_singleton()->is_history_unsaved(editor_data.get_current_edited_scene_history_id())) {
+		return;
+	}
+	// Do not save if not saved before.
+	Node *scene = editor_data.get_edited_scene_root();
+	if (!scene || scene->get_scene_file_path().is_empty()) {
+		return;
+	}
+
+	// Do not save if path gone.
+	if (!DirAccess::exists(scene->get_scene_file_path().get_base_dir())) {
+		return;
+	}
+
+	_save_scene(scene->get_scene_file_path(), -1, false);
+	save_editor_layout_delayed();
+}
+
+void EditorNode::_save_scene(String p_file, int idx, bool p_show_error_dialogs) {
 	Node *scene = editor_data.get_edited_scene_root(idx);
 
 	if (!scene) {
-		show_accept(TTR("This operation can't be done without a tree root."), TTR("OK"));
+		if (p_show_error_dialogs) {
+			show_accept(TTR("This operation can't be done without a tree root."), TTR("OK"));
+		}
 		return;
 	}
 
 	if (!scene->get_scene_file_path().is_empty() && _validate_scene_recursive(scene->get_scene_file_path(), scene)) {
-		show_accept(TTR("This scene can't be saved because there is a cyclic instance inclusion.\nPlease resolve it and then attempt to save again."), TTR("OK"));
+		if (p_show_error_dialogs) {
+			show_accept(TTR("This scene can't be saved because there is a cyclic instance inclusion.\nPlease resolve it and then attempt to save again."), TTR("OK"));
+		}
 		return;
 	}
 
@@ -1786,7 +1810,9 @@ void EditorNode::_save_scene(String p_file, int idx) {
 	Error err = sdata->pack(scene);
 
 	if (err != OK) {
-		show_accept(TTR("Couldn't save scene. Likely dependencies (instances or inheritance) couldn't be satisfied."), TTR("OK"));
+		if (p_show_error_dialogs) {
+			show_accept(TTR("Couldn't save scene. Likely dependencies (instances or inheritance) couldn't be satisfied."), TTR("OK"));
+		}
 		return;
 	}
 
@@ -1818,7 +1844,9 @@ void EditorNode::_save_scene(String p_file, int idx) {
 		_update_title();
 		scene_tabs->update_scene_tabs();
 	} else {
-		_dialog_display_save_error(p_file, err);
+		if (p_show_error_dialogs) {
+			_dialog_display_save_error(p_file, err);
+		}
 	}
 
 	scene->propagate_notification(NOTIFICATION_EDITOR_POST_SAVE);

editor/editor_node.h

@@ -581,7 +581,7 @@ class EditorNode : public Node {
 	void _set_current_scene(int p_idx);
 	void _set_current_scene_nocheck(int p_idx);
 	bool _validate_scene_recursive(const String &p_filename, Node *p_node);
-	void _save_scene(String p_file, int idx = -1);
+	void _save_scene(String p_file, int idx = -1, bool p_show_error_dialogs = true);
 	void _save_all_scenes();
 	int _next_unsaved_scene(bool p_valid_filename, int p_start = 0);
 	void _discard_changes(const String &p_str = String());
@@ -622,7 +622,7 @@ class EditorNode : public Node {
 	void _mark_unsaved_scenes();
 
 	void _find_node_types(Node *p_node, int &count_2d, int &count_3d);
-	void _save_scene_with_preview(String p_file, int p_idx = -1);
+	void _save_scene_with_preview(String p_file, int p_idx = -1, bool p_show_error_dialogs = true);
 
 	bool _find_scene_in_use(Node *p_node, const String &p_path) const;
 
@@ -878,6 +878,8 @@ class EditorNode : public Node {
 
 	Control *get_gui_base() { return gui_base; }
 
+	void save_scene_if_valid();
+
 	void save_scene_to_path(String p_file, bool p_with_preview = true) {
 		if (p_with_preview) {
 			_save_scene_with_preview(p_file);

editor/plugins/script_editor_plugin.cpp

@@ -1311,6 +1311,18 @@ void ScriptEditor::_menu_option(int p_option) {
 		switch (p_option) {
 			case FILE_SAVE: {
 				save_current_script();
+				{
+					// If both scene and script use same shortcut to save (most likely ctrl-s),
+					// save the current scene silently (omitting error dialogs if any).
+					Ref<Shortcut> save_shortcut = ED_GET_SHORTCUT("script_editor/save");
+					Ref<Shortcut> scene_save_shortcut = ED_GET_SHORTCUT("editor/save_scene");
+					if (save_shortcut.is_valid()) {
+						if (save_shortcut->is_match(scene_save_shortcut)) {
+							EditorNode::get_singleton()->save_scene_if_valid();
+						}
+					}
+				}
+
 			} break;
 			case FILE_SAVE_AS: {
 				if (trim_trailing_whitespace_on_save) {

editor/plugins/shader_editor_plugin.cpp

@@ -413,11 +413,29 @@ void ShaderEditorPlugin::_menu_item_pressed(int p_index) {
 			if (editor && editor->get_trim_trailing_whitespace_on_save()) {
 				editor->trim_trailing_whitespace();
 			}
+
+			Ref<Resource> resource;
 			if (edited_shaders[index].shader.is_valid()) {
-				EditorNode::get_singleton()->save_resource(edited_shaders[index].shader);
+				resource = edited_shaders[index].shader;
 			} else {
-				EditorNode::get_singleton()->save_resource(edited_shaders[index].shader_inc);
+				resource = edited_shaders[index].shader_inc;
 			}
+
+			EditorNode::get_singleton()->save_resource(resource);
+
+			if (resource->get_path().is_resource_file()) {
+				// If resource file exists, this means that the shader will not trigger a save-as popup-up.
+				// If both scene and script use same shortcut to save (most likely ctrl-s),
+				// save the current scene silently (omitting error dialogs if any).
+				Ref<Shortcut> save_shortcut = ED_GET_SHORTCUT("shader_editor/save");
+				Ref<Shortcut> scene_save_shortcut = ED_GET_SHORTCUT("editor/save_scene");
+				if (save_shortcut.is_valid()) {
+					if (save_shortcut->is_match(scene_save_shortcut)) {
+						EditorNode::get_singleton()->save_scene_if_valid();
+					}
+				}
+			}
+
 			if (editor) {
 				editor->tag_saved_version();
 			}