Skip to content

Add allow_nesting config option #4

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add allow_nesting config option #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f16d224
Add allow_nesting config option, explicitly set it to false to avoid …
dengzhizhi Dec 30, 2022
b5e2d19
code clean up
dengzhizhi Dec 30, 2022
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: 16 additions & 6 deletions lua/keymap-layer/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ local Layer = Class()
---@field on_key? function
---@field on_enter? table<integer, function>
---@field on_exit? table<integer, function>
---@field allow_nesting? boolean

---@param input table
function Layer:_constructor(input)
Expand Down Expand Up @@ -65,10 +66,11 @@ function Layer:_constructor(input)
end
if input.config then
vim.validate({
on_enter = { input.config.on_enter, { 'function', 'table' }, true },
on_exit = { input.config.on_exit, { 'function', 'table' }, true },
timeout = { input.config.timeout, { 'boolean', 'number' }, true },
buffer = { input.config.buffer, { 'boolean', 'number' }, true }
on_enter = { input.config.on_enter, { 'function', 'table' }, true },
on_exit = { input.config.on_exit, { 'function', 'table' }, true },
timeout = { input.config.timeout, { 'boolean', 'number' }, true },
buffer = { input.config.buffer, { 'boolean', 'number' }, true },
allow_nesting = { input.config.allow_nesting, { 'boolean' }, true },
})
end

Expand All @@ -88,6 +90,9 @@ function Layer:_constructor(input)
if type(self.config.on_exit) == 'function' then
self.config.on_exit = { self.config.on_exit }
end
if self.config.allow_nesting == nil then
self.config.allow_nesting = true -- Default to true
end

self.namespace_id = vim.api.nvim_create_namespace('hydra.layer')
self.options = options('hydra.layer_options') -- meta-accessors
Expand Down Expand Up @@ -241,8 +246,13 @@ end

---Activate layer
function Layer:activate()
if _G.active_keymap_layer and _G.active_keymap_layer.id == self.id then
return
if _G.active_keymap_layer then
if _G.active_keymap_layer.id == self.id then
return
end
if not self.config.allow_nesting or not _G.active_keymap_layer.config.allow_nesting then
_G.active_keymap_layer:exit()
end
end
_G.active_keymap_layer = self
self.active = true
Expand Down