Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(commands): move util function to toolbox #416

Closed
wants to merge 1 commit into from
+26 −21
Closed

refactor(commands): move util function to toolbox #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 1 addition & 21 deletions lua/legendary/data/command.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,6 @@ local function exec(impl, args)
end
end

local function parse_modemap(map)
return function(args)
local mode = vim.fn.mode()
local impl = map[mode]
if not impl then
if Toolbox.is_visual_mode(mode) then
impl = impl or map.v or map.x or map.s
elseif mode == 'i' then
impl = impl or map.l
elseif mode == 'c' then
impl = impl or map.l
end
end

if impl then
exec(impl, args)
end
end
end

---Parse a new command table
---@param tbl table
---@param builtin boolean Whether the item is a builtin, defaults to false
Expand Down Expand Up @@ -98,7 +78,7 @@ function Command:parse(tbl, builtin) -- luacheck: no unused
l = { tbl[2].i, { 'string', 'function' }, true },
})

instance.implementation = parse_modemap(instance.implementation)
instance.implementation = Toolbox.map_cur_mode_into_impl(instance.implementation, exec)
end
instance:parse_filters(tbl.filters)

Expand Down
25 changes: 25 additions & 0 deletions lua/legendary/toolbox.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,4 +185,29 @@ function M.table_from_vimscript(vimscript_str, description)
return input
end

--- Takes instance specific mode implementation and executes callback
--- with a instance implementation per current nvim mode
--- @param instanceModeMap table
--- @param callback function
--- @return function
function M.map_cur_mode_into_impl(instanceModeMap, callback)
return function(args)
local mode = vim.fn.mode()
local impl = instanceModeMap[mode]
if not impl then
if Toolbox.is_visual_mode(mode) then
impl = impl or instanceModeMap.v or instanceModeMap.x or instanceModeMap.s
elseif mode == 'i' then
impl = impl or instanceModeMap.l
elseif mode == 'c' then
impl = impl or instanceModeMap.l
end
end

if impl then
callback(impl, args)
end
end
end

return M
Loading