Skip to content

Commit

Permalink
refactor: Use custom vim.split without validate
Browse files Browse the repository at this point in the history
fix #839
  • Loading branch information
lukas-reineke committed Feb 13, 2024
1 parent 12e9204 commit 821a7ac
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lua/ibl/hooks.lua
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ end
---@param id string
M.clear = function(id)
vim.validate { id = { id, "string" } }
local type, hook_id = unpack(vim.split(id, "_"))
local type, hook_id = unpack(utils.split(id, "_"))
if not type or not hook_id or not utils.tbl_contains(M.type, type) then
return
end
Expand Down
2 changes: 1 addition & 1 deletion lua/ibl/indent.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ M.get = function(whitespace, opts, indent_state)
indent_cap = indent_state.stack[1] or 0
indent_state.cap = false
end
local varts = utils.tbl_map(tonumber, vim.split(vartabstop, ",", { trimempty = true }))
local varts = utils.tbl_map(tonumber, utils.split(vartabstop, ",", { trimempty = true }))
if shiftwidth == 0 then
shiftwidth = tabstop
end
Expand Down
102 changes: 96 additions & 6 deletions lua/ibl/utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,97 @@ M.validate = function(opt, input, path)
end
end

--- copy of vim.spit without vim.validate
---
---@param s string String to split
---@param sep string Separator or pattern
---@param opts (table|nil) Keyword arguments |kwargs| accepted by |vim.gsplit()|
---@return string[] List of split components
function M.split(s, sep, opts)
local t = {}
for c in M.gsplit(s, sep, opts) do
table.insert(t, c)
end
return t
end

--- copy of vim.gsplit without vim.validate
---
--- @param s string String to split
--- @param sep string Separator or pattern
--- @param opts (table|nil) Keyword arguments |kwargs|:
--- - plain: (boolean) Use `sep` literally (as in string.find).
--- - trimempty: (boolean) Discard empty segments at start and end of the sequence.
---@return fun():string|nil (function) Iterator over the split components
function M.gsplit(s, sep, opts)
local plain
local trimempty = false
if type(opts) == "boolean" then
plain = opts -- For backwards compatibility.
else
opts = opts or {}
plain, trimempty = opts.plain, opts.trimempty
end

local start = 1
local done = false

-- 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 function _pass(i, j, ...)
if i then
assert(j + 1 > start, "Infinite loop detected")
local seg = s:sub(start, i - 1)
start = j + 1
return seg, ...
else
done = true
return s:sub(start)
end
end

return function()
if trimempty and #segs > 0 then
-- trimempty: Pop the collected segments.
return table.remove(segs)
elseif done or (s == "" and sep == "") then
return nil
elseif sep == "" then
if start == #s then
done = true
end
return _pass(start + 1, start)
end

local seg = _pass(s:find(sep, start, plain))

-- Trim empty segments from start/end.
if trimempty and seg ~= "" then
empty_start = false
elseif trimempty and seg == "" then
while not done and seg == "" do
table.insert(segs, 1, "")
seg = _pass(s:find(sep, start, plain))
end
if done and seg == "" then
return nil
elseif empty_start then
empty_start = false
segs = {}
return seg
end
if seg ~= "" then
table.insert(segs, 1, seg)
end
return table.remove(segs)
end

return seg
end
end

--- copy of vim.tbl_contains without vim.validate
---
---@param t table Table to check
Expand All @@ -31,7 +122,6 @@ end
M.tbl_contains = function(t, value, opts)
local pred
if opts and opts.predicate then
vim.validate { value = { value, "c" } }
pred = value
else
pred = function(v)
Expand Down Expand Up @@ -169,8 +259,8 @@ M.get_listchars = function(bufnr)
if list then
local raw_value = vim.api.nvim_get_option_value("listchars", { win = win })
listchars = {}
for _, key_value_str in ipairs(vim.split(raw_value, ",")) do
local key, value = unpack(vim.split(key_value_str, ":"))
for _, key_value_str in ipairs(M.split(raw_value, ",")) do
local key, value = unpack(M.split(key_value_str, ":"))
listchars[vim.trim(key)] = value
end
end
Expand Down Expand Up @@ -226,7 +316,7 @@ M.get_filetypes = function(bufnr)
if filetype == "" then
return { "" }
end
return vim.split(filetype, ".", { plain = true, trimempty = true })
return M.split(filetype, ".", { plain = true, trimempty = true })
end

local has_end_reg = vim.regex "^\\s*\\(}\\|]\\|)\\|end\\)"
Expand Down Expand Up @@ -378,8 +468,8 @@ M.has_repeat_indent = function(bufnr, config)
end

local raw_value = vim.api.nvim_get_option_value("breakindentopt", { win = win })
for _, key_value_str in ipairs(vim.split(raw_value, ",")) do
local key, value = unpack(vim.split(key_value_str, ":"))
for _, key_value_str in ipairs(M.split(raw_value, ",")) do
local key, value = unpack(M.split(key_value_str, ":"))
key = vim.trim(key)

if key == "column" then
Expand Down

0 comments on commit 821a7ac

Please sign in to comment.