mirror/LazyVim.LazyVim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2025-06-28 03:30:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(lazygit): dont use <esc><esc> for normal more for laygit to prevent delays on <esc>. Fixes #567

Browse source
This commit is contained in:
Folke Lemaitre 2023-04-16 11:18:44 +02:00
parent 2d8116ef67
commit a9e9204dae
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lua/lazyvim/config/keymaps.lua
View file

@ -112,8 +112,8 @@ local conceallevel = vim.o.conceallevel > 0 and vim.o.conceallevel or 3
map("n", "<leader>uc", function() Util.toggle("conceallevel", false, {0, conceallevel}) end, { desc = "Toggle Conceal" }) map("n", "<leader>uc", function() Util.toggle("conceallevel", false, {0, conceallevel}) end, { desc = "Toggle Conceal" })
-- lazygit -- lazygit
map("n", "<leader>gg", function() Util.float_term({ "lazygit" }, { cwd = Util.get_root() }) end, { desc = "Lazygit (root dir)" }) map("n", "<leader>gg", function() Util.float_term({ "lazygit" }, { cwd = Util.get_root(), esc_esc = false }) end, { desc = "Lazygit (root dir)" })
map("n", "<leader>gG", function() Util.float_term({ "lazygit" }) end, { desc = "Lazygit (cwd)" }) map("n", "<leader>gG", function() Util.float_term({ "lazygit" }, {esc_esc = false}) end, { desc = "Lazygit (cwd)" })
-- quit -- quit
map("n", "<leader>qq", "<cmd>qa<cr>", { desc = "Quit all" }) map("n", "<leader>qq", "<cmd>qa<cr>", { desc = "Quit all" })
@ -126,7 +126,7 @@ end
-- floating terminal -- floating terminal
map("n", "<leader>ft", function() Util.float_term(nil, { cwd = Util.get_root() }) end, { desc = "Terminal (root dir)" }) map("n", "<leader>ft", function() Util.float_term(nil, { cwd = Util.get_root() }) end, { desc = "Terminal (root dir)" })
map("n", "<leader>fT", function() Util.float_term() end, { desc = "Terminal (cwd)" }) map("n", "<leader>fT", function() Util.float_term() end, { desc = "Terminal (cwd)" })
map("t", "<esc><esc>", "<c-\\><c-n>", {desc = "Enter Normal Mode"}) map("t", "<esc><esc>", "<c-\\><c-n>", { desc = "Enter Normal Mode" })
-- windows -- windows
map("n", "<leader>ww", "<C-W>p", { desc = "Other window" }) map("n", "<leader>ww", "<C-W>p", { desc = "Other window" })

8
lua/lazyvim/util/init.lua
View file

@ -102,15 +102,17 @@ function M.telescope(builtin, opts)
end end
end end
-- FIXME: create a togglable terminal
-- Opens a floating terminal (interactive by default) -- Opens a floating terminal (interactive by default)
---@param cmd? string[]|string ---@param cmd? string[]|string
---@param opts? LazyCmdOptions|{interactive?:boolean} ---@param opts? LazyCmdOptions|{interactive?:boolean, esc_esc?:false}
function M.float_term(cmd, opts) function M.float_term(cmd, opts)
opts = vim.tbl_deep_extend("force", { opts = vim.tbl_deep_extend("force", {
size = { width = 0.9, height = 0.9 }, size = { width = 0.9, height = 0.9 },
}, opts or {}) }, opts or {})
require("lazy.util").float_term(cmd, opts) local float = require("lazy.util").float_term(cmd, opts)
if opts.esc_esc == false then
vim.keymap.set("t", "<esc>", "<esc>", { buffer = float.buf, nowait = true })
end
end end
---@param silent boolean? ---@param silent boolean?