mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-10 20:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(lua): simplify vim.gsplit impl

Browse Source 
(cherry picked from commit 824766612d)
This commit is contained in:
Justin M. Keyes
2023-04-21 07:26:44 +02:00
committed by github-actions[bot]
parent 2363d44d5a
commit 127a483142
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
runtime/lua/vim/shared.lua
View File

@@ -100,10 +100,9 @@ function vim.gsplit(s, sep, opts)
local start = 1 local start = 1
local done = false local done = false
-- For `trimempty`: -- For `trimempty`: queue of collected segments, to be emitted at next pass.
local segs = {}
local empty_start = true -- Only empty segments seen so far. local empty_start = true -- Only empty segments seen so far.
local empty_segs = 0 -- Empty segments found between non-empty segments.
local nonemptyseg = nil
local function _pass(i, j, ...) local function _pass(i, j, ...)
if i then if i then
@@ -118,14 +117,9 @@ function vim.gsplit(s, sep, opts)
end end
return function() return function()
if trimempty and empty_segs > 0 then if trimempty and #segs > 0 then
-- trimempty: Pop the collected empty segments. -- trimempty: Pop the collected segments.
empty_segs = empty_segs - 1 return table.remove(segs)
return ''
elseif trimempty and nonemptyseg then
local seg = nonemptyseg
nonemptyseg = nil
return seg
elseif done or (s == '' and sep == '') then elseif done or (s == '' and sep == '') then
return nil return nil
elseif sep == '' then elseif sep == '' then
@@ -138,23 +132,24 @@ function vim.gsplit(s, sep, opts)
local seg = _pass(s:find(sep, start, plain)) local seg = _pass(s:find(sep, start, plain))
-- Trim empty segments from start/end. -- Trim empty segments from start/end.
if seg ~= '' then if trimempty and seg ~= '' then
empty_start = false empty_start = false
elseif trimempty then elseif trimempty and seg == '' then
while not done and seg == '' do while not done and seg == '' do
empty_segs = empty_segs + 1 table.insert(segs, 1, '')
seg = _pass(s:find(sep, start, plain)) seg = _pass(s:find(sep, start, plain))
end end
if done and seg == '' then if done and seg == '' then
return nil return nil
elseif empty_start then elseif empty_start then
empty_start = false empty_start = false
empty_segs = 0 segs = {}
return seg return seg
end end
nonemptyseg = seg ~= '' and seg or nil if seg ~= '' then
seg = '' table.insert(segs, 1, seg)
empty_segs = empty_segs - 1 end
return table.remove(segs)
end end
return seg return seg