Merge pull request #29262 from DarknessCatt/issue-27476

Automatically add new line to scripts
This commit is contained in:
Rémi Verschelde 2019-06-11 15:07:09 +02:00 committed by GitHub
commit 7842f4ca5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 46 additions and 1 deletions

View file

@ -723,6 +723,8 @@ void ScriptEditor::_resave_scripts(const String &p_str) {
se->trim_trailing_whitespace();
}
se->insert_final_newline();
if (convert_indent_on_save) {
if (use_space_indentation) {
se->convert_indent_to_spaces();
@ -1078,6 +1080,8 @@ void ScriptEditor::_menu_option(int p_option) {
if (trim_trailing_whitespace_on_save)
current->trim_trailing_whitespace();
current->insert_final_newline();
if (convert_indent_on_save) {
if (use_space_indentation) {
current->convert_indent_to_spaces();
@ -1097,7 +1101,10 @@ void ScriptEditor::_menu_option(int p_option) {
} break;
case FILE_SAVE_AS: {
current->trim_trailing_whitespace();
if (trim_trailing_whitespace_on_save)
current->trim_trailing_whitespace();
current->insert_final_newline();
if (convert_indent_on_save) {
if (use_space_indentation) {
@ -2121,6 +2128,8 @@ void ScriptEditor::save_all_scripts() {
se->trim_trailing_whitespace();
}
se->insert_final_newline();
if (!se->is_unsaved())
continue;