Skip to content

1676 case insensitive mappings #1682

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
Oct 24, 2022
Merged

1676 case insensitive mappings #1682

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7007436
fix(#1676): remove_keymaps matches case insensitively
alex-courtis Oct 24, 2022
0e53db1
fix(#1676): mappings.list.n.key matches case insensitively for overrides
alex-courtis Oct 24, 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
32 changes: 22 additions & 10 deletions lua/nvim-tree/actions/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,15 +291,19 @@ local function merge_mappings(user_mappings)
for _, map in pairs(user_mappings) do
if type(map.key) == "table" then
for _, key in pairs(map.key) do
table.insert(user_keys, key)
if is_empty(map.action) then
table.insert(removed_keys, key)
if type(key) == "string" then
table.insert(user_keys, key:lower())
if is_empty(map.action) then
table.insert(removed_keys, key:lower())
end
end
end
else
table.insert(user_keys, map.key)
if is_empty(map.action) then
table.insert(removed_keys, map.key)
if type(map.key) == "string" then
table.insert(user_keys, map.key:lower())
if is_empty(map.action) then
table.insert(removed_keys, map.key:lower())
end
end
end

Expand All @@ -316,14 +320,19 @@ local function merge_mappings(user_mappings)
if type(map.key) == "table" then
local filtered_keys = {}
for _, key in pairs(map.key) do
if not vim.tbl_contains(user_keys, key) and not vim.tbl_contains(removed_keys, key) then
if
type(key) == "string"
and not vim.tbl_contains(user_keys, key:lower())
and not vim.tbl_contains(removed_keys, key:lower())
then
table.insert(filtered_keys, key)
end
end
map.key = filtered_keys
return not vim.tbl_isempty(map.key)
else
return not vim.tbl_contains(user_keys, map.key) and not vim.tbl_contains(removed_keys, map.key)
return type(map.key) ~= "string"
or not vim.tbl_contains(user_keys, map.key:lower()) and not vim.tbl_contains(removed_keys, map.key:lower())
end
end, M.mappings)

Expand Down Expand Up @@ -366,14 +375,17 @@ local function filter_mappings(mappings, keys)
if type(keys) == "boolean" and keys then
return {}
elseif type(keys) == "table" then
local keys_lower = vim.tbl_map(function(k)
return type(k) == "string" and k:lower() or nil
end, keys)
return vim.tbl_filter(function(m)
if type(m.key) == "table" then
m.key = vim.tbl_filter(function(k)
return not vim.tbl_contains(keys, k)
return type(k) ~= "string" or not vim.tbl_contains(keys_lower, k:lower())
end, m.key)
return #m.key > 0
else
return not vim.tbl_contains(keys, m.key)
return type(m.key) ~= "string" or not vim.tbl_contains(keys_lower, m.key:lower())
end
end, vim.deepcopy(mappings))
else
Expand Down