hiifong/LazyVim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(vscode): allow overriding default vscode keymaps. Fixes #3950

Browse Source
This commit is contained in:
Folke Lemaitre
2024-07-08 07:52:18 +02:00
parent bf9887adac
commit 67650528e4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lua/lazyvim/config/init.lua
View File

@ -248,16 +248,17 @@ function M.load(name)
end, { msg = "Failed loading " .. mod }) end, { msg = "Failed loading " .. mod })
end end
end end
local pattern = "LazyVim" .. name:sub(1, 1):upper() .. name:sub(2)
-- always load lazyvim, then user file -- always load lazyvim, then user file
if M.defaults[name] or name == "options" then if M.defaults[name] or name == "options" then
_load("lazyvim.config." .. name) _load("lazyvim.config." .. name)
vim.api.nvim_exec_autocmds("User", { pattern = pattern .. "Defaults", modeline = false })
end end
_load("config." .. name) _load("config." .. name)
if vim.bo.filetype == "lazy" then if vim.bo.filetype == "lazy" then
-- HACK: LazyVim may have overwritten options of the Lazy ui, so reset this here -- HACK: LazyVim may have overwritten options of the Lazy ui, so reset this here
vim.cmd([[do VimResized]]) vim.cmd([[do VimResized]])
end end
local pattern = "LazyVim" .. name:sub(1, 1):upper() .. name:sub(2)
vim.api.nvim_exec_autocmds("User", { pattern = pattern, modeline = false }) vim.api.nvim_exec_autocmds("User", { pattern = pattern, modeline = false })
end end

2
lua/lazyvim/plugins/extras/vscode.lua
View File

@ -30,7 +30,7 @@ end
-- Add some vscode specific keymaps -- Add some vscode specific keymaps
vim.api.nvim_create_autocmd("User", { vim.api.nvim_create_autocmd("User", {
pattern = "LazyVimKeymaps", pattern = "LazyVimKeymapsDefaults",
callback = function() callback = function()
vim.keymap.set("n", "<leader><space>", "<cmd>Find<cr>") vim.keymap.set("n", "<leader><space>", "<cmd>Find<cr>")
vim.keymap.set("n", "<leader>/", [[<cmd>call VSCodeNotify('workbench.action.findInFiles')<cr>]]) vim.keymap.set("n", "<leader>/", [[<cmd>call VSCodeNotify('workbench.action.findInFiles')<cr>]])