Skip to content

Disambiguage field and method "keys" with the same name #1

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

Merged
merged 2 commits into from
May 18, 2025
Merged

Disambiguage field and method "keys" with the same name #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e268601
Disambiguate field "keys" from method with the same name.
May 16, 2025
db3dba4
Allow mapping to be created inside plugin setup, but still specified as
May 16, 2025
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
25 changes: 15 additions & 10 deletions lua/strive/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ function Plugin.new(spec)
events = {}, -- Events to trigger loading
filetypes = {}, -- Filetypes to trigger loading
commands = {}, -- Commands to trigger loading
keys = {}, -- Keys to trigger loading
mappings = {}, -- Keys to trigger loading

-- Configuration
setup_opts = spec.setup or {}, -- Options for plugin setup()
Expand Down Expand Up @@ -924,29 +924,34 @@ end
-- Set up lazy loading for specific keymaps
function Plugin:keys(mappings)
self.is_lazy = true
self.keys = type(mappings) ~= 'table' and { mappings } or mappings
self.mappings = type(mappings) ~= 'table' and { mappings } or mappings

for _, mapping in ipairs(self.keys) do
for _, mapping in ipairs(self.mappings) do
local mode, lhs, rhs, opts

if type(mapping) == 'table' then
mode = mapping[1] or 'n'
lhs = mapping[2]
rhs = mapping[3] or function() end
rhs = mapping[3]
opts = mapping[4] or {}
else
mode, lhs = 'n', mapping
rhs = function() end
opts = {}
end

-- Create a keymap that loads the plugin first
vim.keymap.set(mode, lhs, function()
if self:load() and type(rhs) == 'function' then
rhs()
elseif self:load() and type(rhs) == 'string' then
-- If rhs is a string command
vim.cmd(rhs)
if type(rhs) == 'function' then
self:load(nil, rhs)
elseif type(rhs) == 'string' then
self:load(nil, function() vim.cmd(rhs) end)
elseif type(rhs) == 'nil' then
-- If rhs not specified, it should be defined in plugin config
-- In this case, we need to pass a callback
self:load(nil, function()
vim.schedule(function()
vim.fn.feedkeys(lhs)
end) end)
end
end, opts)
end
Expand Down