Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-20 00:13:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #87099 from bitwise-aiden/ba-add-trim-newlines

Browse source 
Implement `trim_final_newlines` setting and functionality
This commit is contained in:
Rémi Verschelde 2024-05-30 11:47:28 +02:00
commit 838eb5a0fd
No known key found for this signature in database
GPG key ID: C3336907360768E1
13 changed files with 99 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
editor/plugins/script_editor_plugin.cpp
View file

@ -1008,6 +1008,10 @@ void ScriptEditor::_resave_scripts(const String &p_str) {
se->trim_trailing_whitespace();
}
if (trim_final_newlines_on_save) {
se->trim_final_newlines();
}
se->insert_final_newline();
if (convert_indent_on_save) {
@ -1402,6 +1406,10 @@ void ScriptEditor::_menu_option(int p_option) {
current->trim_trailing_whitespace();
}
if (trim_final_newlines_on_save) {
current->trim_final_newlines();
}
current->insert_final_newline();
if (convert_indent_on_save) {
@ -2602,6 +2610,10 @@ void ScriptEditor::save_current_script() {
current->trim_trailing_whitespace();
}
if (trim_final_newlines_on_save) {
current->trim_final_newlines();
}
current->insert_final_newline();
if (convert_indent_on_save) {
@ -2646,6 +2658,10 @@ void ScriptEditor::save_all_scripts() {
se->trim_trailing_whitespace();
}
if (trim_final_newlines_on_save) {
se->trim_final_newlines();
}
se->insert_final_newline();
if (!se->is_unsaved()) {
@ -2883,6 +2899,7 @@ void ScriptEditor::_apply_editor_settings() {
}
trim_trailing_whitespace_on_save = EDITOR_GET("text_editor/behavior/files/trim_trailing_whitespace_on_save");
trim_final_newlines_on_save = EDITOR_GET("text_editor/behavior/files/trim_final_newlines_on_save");
convert_indent_on_save = EDITOR_GET("text_editor/behavior/files/convert_indent_on_save");
members_overview_enabled = EDITOR_GET("text_editor/script_list/show_members_overview");
@ -4307,6 +4324,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
edit_pass = 0;
trim_trailing_whitespace_on_save = EDITOR_GET("text_editor/behavior/files/trim_trailing_whitespace_on_save");
trim_final_newlines_on_save = EDITOR_GET("text_editor/behavior/files/trim_final_newlines_on_save");
convert_indent_on_save = EDITOR_GET("text_editor/behavior/files/convert_indent_on_save");
ScriptServer::edit_request_func = _open_script_request;