-
-
Notifications
You must be signed in to change notification settings - Fork 66
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Retain whether a file ended with a trailing newline optionally displaying it #687
base: master
Are you sure you want to change the base?
Conversation
…e should be hidden if present
…ing to determine whether the trailing newline should be hidden
…den when loading the document
…o documents that previously had one or were empty
@mbkma |
I simply don't know anything about how to actually use this in production, but will give it a test build and run |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This works as intended, including adding the trailing newline to a document that did not contain one if hide-trailing-newline is not checked (defaults to checked/FALSE). Nice work including this in Pluma Preferences so it can be changed w/o having to have dconf-editor installed or using gsettings from the command line
A few comments from my side:
Sorry if some of my statements are wrong, I just quickly scanned the changes :) |
I have never seen this MR in gedit, I wrote this code entirely based on how pluma works today. Quickly scanning that code however, I think I get the confusion here. Most importantly consider what happens when you change the setting while a document is open: In the gedit MR you linked (unless I’m mistaken) opening a document with a trailing newline, then enabling the option, then saving it will cause the file to be saved without the trailing newline (ie: the newline will be lost). In my PR the document remembers whether it has previously hidden (removed) the trailing newline and will therefor correctly add it again when the document is saved even if the setting was changed in the mean time. This state (newline removed from the editing buffer or not) is what is stored in the “trimmed-trailing-newline” property – without retaining this information Pluma would also lose the newline if the setting is changed while a document with trailing newline is open and this is a lot more problematic for Pluma with this PR since the setting is visible and reachable in the UI.
As should be apparent from the previous answer, something is indeed “there but not show”: It’s just the extra information on whether the document has a trailing newline is not stored in the editing buffer (where the user would see it) but in a separate property (“trimmed-trailing-newline”).
That is indeed a valid concern: It would be nice if the hidden newline got shown/hidden as the checkbox in the settings is unchecked/checked. So basically you’re saying I should fix this todo: https://github.com/mate-desktop/pluma/pull/687/files#diff-5c01dc24a248053550fb8911bec3b952aefb442ca20c6d0647a12c6e41346532R402-R406 😉
I looked into that and it appears the way to fix that is to let GtkSourceView know whether the file is intended to contain a trailing newline or not using That option got added in GtkSourceView 3.14, is that old enough for Pluma to hard-depend on it?
I’ll look into this one, once it is clear whether we agree on the fundamentals. |
@mbkma |
For some reason I felt the need to rewrite #388 after all these years and the result is this.
A lot of the discussion of the old PR still applies, but instead of always having the trailing newline visible (like in that PR), having the trailing newline is now optional.
Details: