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

Jump to bottom

fix: use v:count if not empty #30

Merged
merged 2 commits into from
May 9, 2024
Merged

fix: use v:count if not empty #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f765ef0
fix: use `vim.v.count` if not empty
Wansmer May 9, 2024
4f8dde0
refactor: remove extra `if` statement
Wansmer May 9, 2024
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
35 changes: 18 additions & 17 deletions lua/langmapper/utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ end
local function feed_nmap(keys)
keys = vim.api.nvim_replace_termcodes(keys, true, true, true)
-- Mode always should be noremap to avoid recursion
vim.api.nvim_feedkeys(keys, 'n', true)
local count = vim.v.count > 0 and vim.v.count or ''
vim.api.nvim_feedkeys(count .. keys, 'nix', true)
end

local function collect_variant_commands(from, to)
Expand All @@ -242,23 +243,23 @@ function M._set_variant_commands()
local get_layout_id = c.config.os[os] and c.config.os[os].get_current_layout_id
local can_check_layout = get_layout_id and type(get_layout_id) == 'function'

if can_check_layout then
for _, lang in ipairs(c.config.use_layouts) do
local from = c.config.layouts[lang].default_layout or c.config.default_layout
local to = c.config.layouts[lang].layout

local to_check = collect_variant_commands(from, to)
if can_check_layout then
for key, value in pairs(to_check) do
vim.keymap.set('n', key, function()
if get_layout_id() == c.config.layouts[lang].id then
feed_nmap(value.on_layout)
else
feed_nmap(value.on_default)
end
end)
if not can_check_layout then
return
end

for _, lang in ipairs(c.config.use_layouts) do
local from = c.config.layouts[lang].default_layout or c.config.default_layout
local to = c.config.layouts[lang].layout

local to_check = collect_variant_commands(from, to)
for key, value in pairs(to_check) do
vim.keymap.set('n', key, function()
if get_layout_id() == c.config.layouts[lang].id then
feed_nmap(value.on_layout)
else
feed_nmap(value.on_default)
end
end
end)
end
end
end
Expand Down
Loading