Trim whitespace on save #2377
Trim whitespace on save #2377
Conversation
I think people who would use this would rather have it automatically every time you save, instead of having to click a button every time.
|
Seems some platforms don't like my use of min. |
bonjorno7
force-pushed
the
trim-whitespace
branch
from
1c79ea0 to
1b24324
Compare
|
I replaced it with a ternary, so all of the builds work now. |
bonjorno7
force-pushed
the
trim-whitespace
branch
from
1b24324 to
f4c52d3
Compare
|
It calls |
|
Okay I know what's going on. |
bonjorno7
force-pushed
the
trim-whitespace
branch
from
f4c52d3 to
947e2d0
Compare
|
There was even more to it: the loop didn't exit because the null check didn't happen, because the null was overwritten by a newline. |
|
A friend with more C experience tells me I should use memmove rather than memcpy, because memcpy doesn't necessarily copy one byte at a time. |
In my previous PR I didn't commit this file because I didn't know what it was for. I understand now that this is the default config, which gets loaded when you use `config reset` in the console, so it's important that it's up to date.
I'm not too experienced with C so this was tough, but I got it working. It trims spaces at the end of lines, and newlines at the end of the file (except for the last one, if there's space for it). It also updates the cursor position and selection. I increment src after the done check so that its value is correct after the loop; not actually using it after the loop in this version but just in case. That check by the way uses a stored variable because the loop overwrites the buffer, so checking the value of end at the bottom of the loop doesn't work. I'm using memmove instead of memcpy because the data can overlap, and this is apparently still quite fast. I don't zero out garbage data after the terminator because it's apparently unnecessary. After trimming whitespace it calls history and update; hopefully those are the right functions in the right order. One small note: if your selection was entirely trimmed, you're left with a zero length selection. I can fix this by detecting if position and selection are equal, and then setting selection to null. I chose not to do this however, because it's easy to create a zero length selection by hand, and the user might in some cases do so intentionally. If you want to get rid of zero length selections entirely, that should probably be fixed elsewhere, rather than in this function. Another note: trimming only happens with Ctrl + S, not with typing save in the console. Perhaps I should fix this, though I think it has advantages too; I think ideally the trimming should only happen when you can see it happening, which you can't if you're in the console. Also while writing this code it was nice to be able to undo and save my file without running the trimming code, though I suppose now that the code works properly I won't need it anymore.
bonjorno7
force-pushed
the
trim-whitespace
branch
from
947e2d0 to
c86219f
Compare
|
I opted to go with memmove, because it's more efficient than I thought; and I suppose it doesn't matter for a little text editor anyway. |
When you hit Ctrl + S with this option enabled, it will trim spaces from the end of lines, and newlines from the end of the file.
I think this not only looks nice, but actually matters, because spaces count against the file size limit.
It adds a trailing newline at the end of the file if there isn't one.
It respects the file size limit (64kb or 512kb for the pro version).
It updates the cursor position and selection appropriately.
Note: if your selection was entirely trimmed, you're left with a zero length selection.
I decided not to fix this, as the user may have created such a selection intentionally.
Shouldn't be difficult though, if you'd like me to change it.
Another note: trimming only happens with Ctrl + S, not with typing save in the console.
I could try fixing this if you want, but decided not to do it yet, because I feel it's better to only trim if you can see it happen, which you can't from the console (might make sense to only run this when you're actually in the code editor then, but haven't looked into that yet).
Another reason I didn't fix it is because it was convenient being able to save without running the trimming code while I was still developing it.
Unlike my last PR, this time I've included changes to
config.tic.dat, because I now know what it's for.Fixes: #2370