Changed trimwhitespace to never cause caret to reposition

This commit is contained in:
rxi 2020-06-19 12:09:00 +01:00
parent 6ec8fc5616
commit ae48049695

View file

@ -4,9 +4,16 @@ local Doc = require "core.doc"
local function trim_trailing_whitespace(doc) local function trim_trailing_whitespace(doc)
local cline, ccol = doc:get_selection()
for i = 1, #doc.lines do for i = 1, #doc.lines do
local old_text = doc:get_text(i, 1, i, math.huge) local old_text = doc:get_text(i, 1, i, math.huge)
local new_text = old_text:gsub("%s*$", "") local new_text = old_text:gsub("%s*$", "")
-- don't remove whitespace which would cause the caret to reposition
if cline == i and ccol > #new_text then
new_text = old_text:sub(1, ccol - 1)
end
if old_text ~= new_text then if old_text ~= new_text then
doc:insert(i, 1, new_text) doc:insert(i, 1, new_text)
doc:remove(i, #new_text + 1, i, math.huge) doc:remove(i, #new_text + 1, i, math.huge)