Merge lp:~trojan295/scratch/Bugfix-1352324 into lp:~elementary-apps/scratch/scratch

[Damian Czaja]

Adding a '\n' byte to the end of the file when saving.

Adding a '\n' byte to the end of the file when saving.

I have analyzed how looks a text file with multiple empty lines at the end in Vim and it looked like Scratch was losing the last '\n' byte. In Vim the '\n' is added at every end of a file, even without a empty line at the end. Now when you save a file in Scratch, it looks exactly like when you have done it in Vim. None empty line is lost.

[Raphael Isemann (teemperor)]

Does this happen everytime or just with the trim-trailing-whitespace plugin activated?

Anyway, if we could get this fixed it would be cool as it's so annoying to have all those "No new-line at the end of the file" messages in bzr.

[Damian Czaja (trojan295)]

This fix simply adds a '\n' byte at the end of the file, when you save it. When you put two empty line at the end of the file, save it and reopen, then no lines are removed. As I checked it work with and without the trim-trailing-whitespace plugin. So you can a newline at the end and it will not be removed.

[Artem Anufrij (artem-anufrij)]

Works as expected. I tested it with plug in and without.

[Artem Anufrij (artem-anufrij)]

Works as expected. I tested it with plug in and without.

review: Approve

[Sergey "Shnatsel" Davidoff (shnatsel)]

The "eof" name is confusing: it is usually used to denote the EOF character code, that typically equals to -1 and not the \n character code. Please rename it to "trailing_newline" or some such.

Other than that - great work, thanks!

review: Needs Fixing

=== modified file 'src/Services/Document.vala'
--- src/Services/Document.vala	2014-10-18 19:49:49 +0000
+++ src/Services/Document.vala	2014-11-03 21:30:17 +0000
@@ -276,8 +276,10 @@
 
             // Replace old content with the new one
             try {
-                string s;
-                file.replace_contents (this.source_view.buffer.text.data, null, false, 0, out s);
+                FileOutputStream fostream = file.replace (null, false, 0);
+                fostream.write (this.source_view.buffer.text.data);              
+                uint8[] eof = { '\n' };
+                fostream.write (eof);
             } catch (Error e) {
                 warning ("Cannot save \"%s\": %s", get_basename (), e.message);
                 return false;
@@ -724,4 +726,4 @@
             mounted = false;
         }
     }
-}
\ No newline at end of file
+}