gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-05 00:30:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85228 from KoBeWi/don't_save_scene_when_saving_script_while_saving_scene

Browse source 
Don't insert newline while saving
This commit is contained in:
Rémi Verschelde 2024-06-26 14:51:06 +02:00
parent 869e33252d b70368b78a
commit b0c7f45a72
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/editor_node.cpp
View file

@ -1812,9 +1812,7 @@ static void _reset_animation_mixers(Node *p_node, List<Pair<AnimationMixer *, Re
}
void EditorNode::_save_scene(String p_file, int idx) {
if (!saving_scene.is_empty() && saving_scene == p_file) {
return;
}
ERR_FAIL_COND_MSG(!saving_scene.is_empty() && saving_scene == p_file, "Scene saved while already being saved!");
Node *scene = editor_data.get_edited_scene_root(idx);

9
editor/plugins/script_editor_plugin.cpp
View file

@ -1012,8 +1012,6 @@ void ScriptEditor::_resave_scripts(const String &p_str) {
se->trim_final_newlines();
}
se->insert_final_newline();
if (convert_indent_on_save) {
se->convert_indent();
}
@ -1410,8 +1408,6 @@ void ScriptEditor::_menu_option(int p_option) {
current->trim_final_newlines();
}
current->insert_final_newline();
if (convert_indent_on_save) {
current->convert_indent();
}
@ -2614,8 +2610,6 @@ void ScriptEditor::save_current_script() {
current->trim_final_newlines();
}
current->insert_final_newline();
if (convert_indent_on_save) {
current->convert_indent();
}
@ -2662,8 +2656,6 @@ void ScriptEditor::save_all_scripts() {
se->trim_final_newlines();
}
se->insert_final_newline();
if (!se->is_unsaved()) {
continue;
}
@ -2713,6 +2705,7 @@ void ScriptEditor::apply_scripts() const {
if (!se) {
continue;
}
se->insert_final_newline();
se->apply_code();
}
}