From 6ec8fc5616ef616dcf84ce028bc220468c4255ca Mon Sep 17 00:00:00 2001 From: rxi Date: Thu, 18 Jun 2020 16:48:05 +0100 Subject: [PATCH 1/2] Create FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..375655ac --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +github: rxi From ae48049695e2a74721323f608e439fb5f5b89da4 Mon Sep 17 00:00:00 2001 From: rxi Date: Fri, 19 Jun 2020 12:09:00 +0100 Subject: [PATCH 2/2] Changed `trimwhitespace` to never cause caret to reposition --- data/plugins/trimwhitespace.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/plugins/trimwhitespace.lua b/data/plugins/trimwhitespace.lua index ace1b0f8..d4d25c8f 100644 --- a/data/plugins/trimwhitespace.lua +++ b/data/plugins/trimwhitespace.lua @@ -4,9 +4,16 @@ local Doc = require "core.doc" local function trim_trailing_whitespace(doc) + local cline, ccol = doc:get_selection() for i = 1, #doc.lines do local old_text = doc:get_text(i, 1, i, math.huge) 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 doc:insert(i, 1, new_text) doc:remove(i, #new_text + 1, i, math.huge)