mirror of
https://github.com/LazyVim/LazyVim.git
synced 2025-08-28 13:58:12 +02:00
fix printable characters being mapped in select mode
most of the "visual mode" mappings use "v" instead of "x", affecting select mode, which should not have printable characters remapped. (this is felt when e.g. using snippets)
This commit is contained in:
parent
25abbf546d
commit
fa94c73362
13 changed files with 27 additions and 27 deletions
|
@ -81,8 +81,8 @@ map({ "i", "x", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save File" })
|
||||||
map("n", "<leader>K", "<cmd>norm! K<cr>", { desc = "Keywordprg" })
|
map("n", "<leader>K", "<cmd>norm! K<cr>", { desc = "Keywordprg" })
|
||||||
|
|
||||||
-- better indenting
|
-- better indenting
|
||||||
map("v", "<", "<gv")
|
map("x", "<", "<gv")
|
||||||
map("v", ">", ">gv")
|
map("x", ">", ">gv")
|
||||||
|
|
||||||
-- commenting
|
-- commenting
|
||||||
map("n", "gco", "o<esc>Vcx<esc><cmd>normal gcc<cr>fxa<bs>", { desc = "Add Comment Below" })
|
map("n", "gco", "o<esc>Vcx<esc><cmd>normal gcc<cr>fxa<bs>", { desc = "Add Comment Below" })
|
||||||
|
@ -114,7 +114,7 @@ map("n", "[q", vim.cmd.cprev, { desc = "Previous Quickfix" })
|
||||||
map("n", "]q", vim.cmd.cnext, { desc = "Next Quickfix" })
|
map("n", "]q", vim.cmd.cnext, { desc = "Next Quickfix" })
|
||||||
|
|
||||||
-- formatting
|
-- formatting
|
||||||
map({ "n", "v" }, "<leader>cf", function()
|
map({ "n", "x" }, "<leader>cf", function()
|
||||||
LazyVim.format({ force = true })
|
LazyVim.format({ force = true })
|
||||||
end, { desc = "Format" })
|
end, { desc = "Format" })
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ return {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
mode = { "n", "v" },
|
mode = { "n", "x" },
|
||||||
desc = "Search and Replace",
|
desc = "Search and Replace",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -163,8 +163,8 @@ return {
|
||||||
end, "Prev Hunk")
|
end, "Prev Hunk")
|
||||||
map("n", "]H", function() gs.nav_hunk("last") end, "Last Hunk")
|
map("n", "]H", function() gs.nav_hunk("last") end, "Last Hunk")
|
||||||
map("n", "[H", function() gs.nav_hunk("first") end, "First Hunk")
|
map("n", "[H", function() gs.nav_hunk("first") end, "First Hunk")
|
||||||
map({ "n", "v" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
|
map({ "n", "x" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
|
||||||
map({ "n", "v" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
|
map({ "n", "x" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
|
||||||
map("n", "<leader>ghS", gs.stage_buffer, "Stage Buffer")
|
map("n", "<leader>ghS", gs.stage_buffer, "Stage Buffer")
|
||||||
map("n", "<leader>ghu", gs.undo_stage_hunk, "Undo Stage Hunk")
|
map("n", "<leader>ghu", gs.undo_stage_hunk, "Undo Stage Hunk")
|
||||||
map("n", "<leader>ghR", gs.reset_buffer, "Reset Buffer")
|
map("n", "<leader>ghR", gs.reset_buffer, "Reset Buffer")
|
||||||
|
|
|
@ -17,14 +17,14 @@ return {
|
||||||
end,
|
end,
|
||||||
keys = {
|
keys = {
|
||||||
{ "<c-s>", "<CR>", ft = "copilot-chat", desc = "Submit Prompt", remap = true },
|
{ "<c-s>", "<CR>", ft = "copilot-chat", desc = "Submit Prompt", remap = true },
|
||||||
{ "<leader>a", "", desc = "+ai", mode = { "n", "v" } },
|
{ "<leader>a", "", desc = "+ai", mode = { "n", "x" } },
|
||||||
{
|
{
|
||||||
"<leader>aa",
|
"<leader>aa",
|
||||||
function()
|
function()
|
||||||
return require("CopilotChat").toggle()
|
return require("CopilotChat").toggle()
|
||||||
end,
|
end,
|
||||||
desc = "Toggle (CopilotChat)",
|
desc = "Toggle (CopilotChat)",
|
||||||
mode = { "n", "v" },
|
mode = { "n", "x" },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"<leader>ax",
|
"<leader>ax",
|
||||||
|
@ -32,7 +32,7 @@ return {
|
||||||
return require("CopilotChat").reset()
|
return require("CopilotChat").reset()
|
||||||
end,
|
end,
|
||||||
desc = "Clear (CopilotChat)",
|
desc = "Clear (CopilotChat)",
|
||||||
mode = { "n", "v" },
|
mode = { "n", "x" },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"<leader>aq",
|
"<leader>aq",
|
||||||
|
@ -46,7 +46,7 @@ return {
|
||||||
end)
|
end)
|
||||||
end,
|
end,
|
||||||
desc = "Quick Chat (CopilotChat)",
|
desc = "Quick Chat (CopilotChat)",
|
||||||
mode = { "n", "v" },
|
mode = { "n", "x" },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"<leader>ap",
|
"<leader>ap",
|
||||||
|
@ -54,7 +54,7 @@ return {
|
||||||
require("CopilotChat").select_prompt()
|
require("CopilotChat").select_prompt()
|
||||||
end,
|
end,
|
||||||
desc = "Prompt Actions (CopilotChat)",
|
desc = "Prompt Actions (CopilotChat)",
|
||||||
mode = { "n", "v" },
|
mode = { "n", "x" },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
config = function(_, opts)
|
config = function(_, opts)
|
||||||
|
|
|
@ -8,7 +8,7 @@ return {
|
||||||
-- Populate the keys based on the user's options
|
-- Populate the keys based on the user's options
|
||||||
local opts = LazyVim.opts("mini.surround")
|
local opts = LazyVim.opts("mini.surround")
|
||||||
local mappings = {
|
local mappings = {
|
||||||
{ opts.mappings.add, desc = "Add Surrounding", mode = { "n", "v" } },
|
{ opts.mappings.add, desc = "Add Surrounding", mode = { "n", "x" } },
|
||||||
{ opts.mappings.delete, desc = "Delete Surrounding" },
|
{ opts.mappings.delete, desc = "Delete Surrounding" },
|
||||||
{ opts.mappings.find, desc = "Find Right Surrounding" },
|
{ opts.mappings.find, desc = "Find Right Surrounding" },
|
||||||
{ opts.mappings.find_left, desc = "Find Left Surrounding" },
|
{ opts.mappings.find_left, desc = "Find Left Surrounding" },
|
||||||
|
|
|
@ -84,7 +84,7 @@ return {
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
keys = {
|
keys = {
|
||||||
{ "<leader>du", function() require("dapui").toggle({ }) end, desc = "Dap UI" },
|
{ "<leader>du", function() require("dapui").toggle({ }) end, desc = "Dap UI" },
|
||||||
{ "<leader>de", function() require("dapui").eval() end, desc = "Eval", mode = {"n", "v"} },
|
{ "<leader>de", function() require("dapui").eval() end, desc = "Eval", mode = {"n", "x"} },
|
||||||
},
|
},
|
||||||
opts = {},
|
opts = {},
|
||||||
config = function(_, opts)
|
config = function(_, opts)
|
||||||
|
|
|
@ -19,8 +19,8 @@ return {
|
||||||
keys = {
|
keys = {
|
||||||
{ "<C-a>", function() return M.dial(true) end, expr = true, desc = "Increment", mode = {"n", "v"} },
|
{ "<C-a>", function() return M.dial(true) end, expr = true, desc = "Increment", mode = {"n", "v"} },
|
||||||
{ "<C-x>", function() return M.dial(false) end, expr = true, desc = "Decrement", mode = {"n", "v"} },
|
{ "<C-x>", function() return M.dial(false) end, expr = true, desc = "Decrement", mode = {"n", "v"} },
|
||||||
{ "g<C-a>", function() return M.dial(true, true) end, expr = true, desc = "Increment", mode = {"n", "v"} },
|
{ "g<C-a>", function() return M.dial(true, true) end, expr = true, desc = "Increment", mode = {"n", "x"} },
|
||||||
{ "g<C-x>", function() return M.dial(false, true) end, expr = true, desc = "Decrement", mode = {"n", "v"} },
|
{ "g<C-x>", function() return M.dial(false, true) end, expr = true, desc = "Decrement", mode = {"n", "x"} },
|
||||||
},
|
},
|
||||||
opts = function()
|
opts = function()
|
||||||
local augend = require("dial.augend")
|
local augend = require("dial.augend")
|
||||||
|
|
|
@ -248,8 +248,8 @@ return {
|
||||||
{ "<leader>sq", "<cmd>FzfLua quickfix<cr>", desc = "Quickfix List" },
|
{ "<leader>sq", "<cmd>FzfLua quickfix<cr>", desc = "Quickfix List" },
|
||||||
{ "<leader>sw", LazyVim.pick("grep_cword"), desc = "Word (Root Dir)" },
|
{ "<leader>sw", LazyVim.pick("grep_cword"), desc = "Word (Root Dir)" },
|
||||||
{ "<leader>sW", LazyVim.pick("grep_cword", { root = false }), desc = "Word (cwd)" },
|
{ "<leader>sW", LazyVim.pick("grep_cword", { root = false }), desc = "Word (cwd)" },
|
||||||
{ "<leader>sw", LazyVim.pick("grep_visual"), mode = "v", desc = "Selection (Root Dir)" },
|
{ "<leader>sw", LazyVim.pick("grep_visual"), mode = "x", desc = "Selection (Root Dir)" },
|
||||||
{ "<leader>sW", LazyVim.pick("grep_visual", { root = false }), mode = "v", desc = "Selection (cwd)" },
|
{ "<leader>sW", LazyVim.pick("grep_visual", { root = false }), mode = "x", desc = "Selection (cwd)" },
|
||||||
{ "<leader>uC", LazyVim.pick("colorschemes"), desc = "Colorscheme with Preview" },
|
{ "<leader>uC", LazyVim.pick("colorschemes"), desc = "Colorscheme with Preview" },
|
||||||
{
|
{
|
||||||
"<leader>ss",
|
"<leader>ss",
|
||||||
|
|
|
@ -132,8 +132,8 @@ return {
|
||||||
{ "<leader>sq", "<cmd>Telescope quickfix<cr>", desc = "Quickfix List" },
|
{ "<leader>sq", "<cmd>Telescope quickfix<cr>", desc = "Quickfix List" },
|
||||||
{ "<leader>sw", LazyVim.pick("grep_string", { word_match = "-w" }), desc = "Word (Root Dir)" },
|
{ "<leader>sw", LazyVim.pick("grep_string", { word_match = "-w" }), desc = "Word (Root Dir)" },
|
||||||
{ "<leader>sW", LazyVim.pick("grep_string", { root = false, word_match = "-w" }), desc = "Word (cwd)" },
|
{ "<leader>sW", LazyVim.pick("grep_string", { root = false, word_match = "-w" }), desc = "Word (cwd)" },
|
||||||
{ "<leader>sw", LazyVim.pick("grep_string"), mode = "v", desc = "Selection (Root Dir)" },
|
{ "<leader>sw", LazyVim.pick("grep_string"), mode = "x", desc = "Selection (Root Dir)" },
|
||||||
{ "<leader>sW", LazyVim.pick("grep_string", { root = false }), mode = "v", desc = "Selection (cwd)" },
|
{ "<leader>sW", LazyVim.pick("grep_string", { root = false }), mode = "x", desc = "Selection (cwd)" },
|
||||||
{ "<leader>uC", LazyVim.pick("colorscheme", { enable_preview = true }), desc = "Colorscheme with Preview" },
|
{ "<leader>uC", LazyVim.pick("colorscheme", { enable_preview = true }), desc = "Colorscheme with Preview" },
|
||||||
{
|
{
|
||||||
"<leader>ss",
|
"<leader>ss",
|
||||||
|
|
|
@ -76,13 +76,13 @@ return {
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.keymap.set(
|
vim.keymap.set(
|
||||||
{ "n", "v" },
|
{ "n", "x" },
|
||||||
"[c",
|
"[c",
|
||||||
"<CMD>call search('^; -\\+$', 'bw')<CR>",
|
"<CMD>call search('^; -\\+$', 'bw')<CR>",
|
||||||
{ silent = true, buffer = true, desc = "Jumps to the begining of previous evaluation output." }
|
{ silent = true, buffer = true, desc = "Jumps to the begining of previous evaluation output." }
|
||||||
)
|
)
|
||||||
vim.keymap.set(
|
vim.keymap.set(
|
||||||
{ "n", "v" },
|
{ "n", "x" },
|
||||||
"]c",
|
"]c",
|
||||||
"<CMD>call search('^; -\\+$', 'w')<CR>",
|
"<CMD>call search('^; -\\+$', 'w')<CR>",
|
||||||
{ silent = true, buffer = true, desc = "Jumps to the begining of next evaluation output." }
|
{ silent = true, buffer = true, desc = "Jumps to the begining of next evaluation output." }
|
||||||
|
|
|
@ -221,7 +221,7 @@ return {
|
||||||
})
|
})
|
||||||
wk.add({
|
wk.add({
|
||||||
{
|
{
|
||||||
mode = "v",
|
mode = "x",
|
||||||
buffer = args.buf,
|
buffer = args.buf,
|
||||||
{ "<leader>cx", group = "extract" },
|
{ "<leader>cx", group = "extract" },
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,12 +17,12 @@ return {
|
||||||
-- of files supported by R.nvim. This is an
|
-- of files supported by R.nvim. This is an
|
||||||
-- opportunity to create mappings local to buffers.
|
-- opportunity to create mappings local to buffers.
|
||||||
vim.keymap.set("n", "<Enter>", "<Plug>RDSendLine", { buffer = true })
|
vim.keymap.set("n", "<Enter>", "<Plug>RDSendLine", { buffer = true })
|
||||||
vim.keymap.set("v", "<Enter>", "<Plug>RSendSelection", { buffer = true })
|
vim.keymap.set("x", "<Enter>", "<Plug>RSendSelection", { buffer = true })
|
||||||
|
|
||||||
local wk = require("which-key")
|
local wk = require("which-key")
|
||||||
wk.add({
|
wk.add({
|
||||||
buffer = true,
|
buffer = true,
|
||||||
mode = { "n", "v" },
|
mode = { "n", "x" },
|
||||||
{ "<localleader>a", group = "all" },
|
{ "<localleader>a", group = "all" },
|
||||||
{ "<localleader>b", group = "between marks" },
|
{ "<localleader>b", group = "between marks" },
|
||||||
{ "<localleader>c", group = "chunks" },
|
{ "<localleader>c", group = "chunks" },
|
||||||
|
|
|
@ -29,7 +29,7 @@ return {
|
||||||
function()
|
function()
|
||||||
require("conform").format({ formatters = { "injected" }, timeout_ms = 3000 })
|
require("conform").format({ formatters = { "injected" }, timeout_ms = 3000 })
|
||||||
end,
|
end,
|
||||||
mode = { "n", "v" },
|
mode = { "n", "x" },
|
||||||
desc = "Format Injected Langs",
|
desc = "Format Injected Langs",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -22,8 +22,8 @@ function M.get()
|
||||||
{ "K", function() return vim.lsp.buf.hover() end, desc = "Hover" },
|
{ "K", function() return vim.lsp.buf.hover() end, desc = "Hover" },
|
||||||
{ "gK", function() return vim.lsp.buf.signature_help() end, desc = "Signature Help", has = "signatureHelp" },
|
{ "gK", function() return vim.lsp.buf.signature_help() end, desc = "Signature Help", has = "signatureHelp" },
|
||||||
{ "<c-k>", function() return vim.lsp.buf.signature_help() end, mode = "i", desc = "Signature Help", has = "signatureHelp" },
|
{ "<c-k>", function() return vim.lsp.buf.signature_help() end, mode = "i", desc = "Signature Help", has = "signatureHelp" },
|
||||||
{ "<leader>ca", vim.lsp.buf.code_action, desc = "Code Action", mode = { "n", "v" }, has = "codeAction" },
|
{ "<leader>ca", vim.lsp.buf.code_action, desc = "Code Action", mode = { "n", "x" }, has = "codeAction" },
|
||||||
{ "<leader>cc", vim.lsp.codelens.run, desc = "Run Codelens", mode = { "n", "v" }, has = "codeLens" },
|
{ "<leader>cc", vim.lsp.codelens.run, desc = "Run Codelens", mode = { "n", "x" }, has = "codeLens" },
|
||||||
{ "<leader>cC", vim.lsp.codelens.refresh, desc = "Refresh & Display Codelens", mode = { "n" }, has = "codeLens" },
|
{ "<leader>cC", vim.lsp.codelens.refresh, desc = "Refresh & Display Codelens", mode = { "n" }, has = "codeLens" },
|
||||||
{ "<leader>cR", function() Snacks.rename.rename_file() end, desc = "Rename File", mode ={"n"}, has = { "workspace/didRenameFiles", "workspace/willRenameFiles" } },
|
{ "<leader>cR", function() Snacks.rename.rename_file() end, desc = "Rename File", mode ={"n"}, has = { "workspace/didRenameFiles", "workspace/willRenameFiles" } },
|
||||||
{ "<leader>cr", vim.lsp.buf.rename, desc = "Rename", has = "rename" },
|
{ "<leader>cr", vim.lsp.buf.rename, desc = "Rename", has = "rename" },
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue