Skip to content

Commit

Permalink
fix: don't deep merge keymaps (#510)
Browse files Browse the repository at this point in the history
  • Loading branch information
stevearc committed Nov 10, 2024
1 parent 52cc8a1 commit 709403c
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion lua/oil/config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -355,9 +355,16 @@ local M = {}
---@field border? string|string[] Window border

M.setup = function(opts)
local new_conf = vim.tbl_deep_extend("keep", opts or {}, default_config)
opts = opts or {}
local new_conf = vim.tbl_deep_extend("keep", opts, default_config)
if not new_conf.use_default_keymaps then
new_conf.keymaps = opts.keymaps or {}
else
-- We don't want to deep merge the keymaps, we want any keymap defined by the user to override
-- everything about the default.
for k, v in pairs(opts.keymaps) do
new_conf.keymaps[k] = v
end
end

if new_conf.lsp_rename_autosave ~= nil then
Expand Down

0 comments on commit 709403c

Please sign in to comment.