Refine keymap descriptions for clarity and consistency
Updated keymap descriptions across various plugins to include specific prefixes for better identification and organization.
This commit is contained in:
parent
99ea741fbb
commit
f4f6260b20
9 changed files with 83 additions and 66 deletions
|
|
@ -30,28 +30,28 @@ return {
|
|||
if vim.wo.diff then return ']c' end
|
||||
vim.schedule(function() gs.next_hunk() end)
|
||||
return '<Ignore>'
|
||||
end, { expr = true, desc = 'Next hunk' })
|
||||
end, { expr = true, desc = 'Gitsigns: Next hunk' })
|
||||
|
||||
map('n', '[h', function()
|
||||
if vim.wo.diff then return '[c' end
|
||||
vim.schedule(function() gs.prev_hunk() end)
|
||||
return '<Ignore>'
|
||||
end, { expr = true, desc = 'Previous hunk' })
|
||||
end, { expr = true, desc = 'Gitsigns: Previous hunk' })
|
||||
|
||||
-- Hunk actions
|
||||
map('n', '<leader>hs', gs.stage_hunk, { desc = 'Stage hunk' })
|
||||
map('n', '<leader>hr', gs.reset_hunk, { desc = 'Reset hunk' })
|
||||
map('v', '<leader>hs', function() gs.stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end, { desc = 'Stage hunk' })
|
||||
map('v', '<leader>hr', function() gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') } end, { desc = 'Reset hunk' })
|
||||
map('n', '<leader>hS', gs.stage_buffer, { desc = 'Stage buffer' })
|
||||
map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'Undo stage hunk' })
|
||||
map('n', '<leader>hR', gs.reset_buffer, { desc = 'Reset buffer' })
|
||||
map('n', '<leader>hp', gs.preview_hunk, { desc = 'Preview hunk' })
|
||||
map('n', '<leader>hd', gs.diffthis, { desc = 'Diff this' })
|
||||
map('n', '<leader>hD', function() gs.diffthis('~') end, { desc = 'Diff this ~' })
|
||||
map('n', '<leader>hs', gs.stage_hunk, { desc = 'Gitsigns: Stage hunk' })
|
||||
map('n', '<leader>hr', gs.reset_hunk, { desc = 'Gitsigns: Reset hunk' })
|
||||
map('v', '<leader>hs', function() gs.stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end, { desc = 'Gitsigns: Stage hunk' })
|
||||
map('v', '<leader>hr', function() gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') } end, { desc = 'Gitsigns: Reset hunk' })
|
||||
map('n', '<leader>hS', gs.stage_buffer, { desc = 'Gitsigns: Stage buffer' })
|
||||
map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'Gitsigns: Undo stage hunk' })
|
||||
map('n', '<leader>hR', gs.reset_buffer, { desc = 'Gitsigns: Reset buffer' })
|
||||
map('n', '<leader>hp', gs.preview_hunk, { desc = 'Gitsigns: Preview hunk' })
|
||||
map('n', '<leader>hd', gs.diffthis, { desc = 'Gitsigns: Diff this' })
|
||||
map('n', '<leader>hD', function() gs.diffthis('~') end, { desc = 'Gitsigns: Diff this ~' })
|
||||
|
||||
-- Text object
|
||||
map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'Select hunk' })
|
||||
map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'Gitsigns: Select hunk' })
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,16 +104,16 @@ return {
|
|||
vim.g.format_on_save = not vim.g.format_on_save
|
||||
local status = vim.g.format_on_save and "enabled" or "disabled"
|
||||
vim.notify("Format on save " .. status, vim.log.levels.INFO)
|
||||
end, { desc = "Toggle format on save", silent = true, noremap = true })
|
||||
end, { desc = "Formatting: Toggle format on save", silent = true, noremap = true })
|
||||
|
||||
-- Manual format (buffer)
|
||||
vim.keymap.set("n", "<leader>lf", function()
|
||||
vim.lsp.buf.format({ async = false })
|
||||
end, { desc = "Format buffer", silent = true, noremap = true })
|
||||
end, { desc = "Formatting: Format buffer", silent = true, noremap = true })
|
||||
|
||||
-- Manual format (visual range)
|
||||
vim.keymap.set("v", "<leader>lf", function()
|
||||
vim.lsp.buf.format({ async = false })
|
||||
end, { desc = "Format selection", silent = true, noremap = true })
|
||||
end, { desc = "Formatting: Format selection", silent = true, noremap = true })
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,12 +4,15 @@
|
|||
|
||||
return {
|
||||
'stevearc/oil.nvim',
|
||||
lazy = false,
|
||||
-- set lazy loading
|
||||
lazy = true,
|
||||
keys = {
|
||||
{ '<leader>fo', '<cmd>Oil<cr>', desc = 'Open Oil file browser' },
|
||||
{ '<leader>fO', '<cmd>Oil --float<cr>', desc = 'Open Oil in floating window' },
|
||||
{ '<leader>fo', '<cmd>Oil<cr>', desc = 'Oil: Open file browser' },
|
||||
{ '<leader>fO', '<cmd>Oil --float<cr>', desc = 'Oil: Open in floating window' },
|
||||
},
|
||||
opts = {
|
||||
-- Don't hijack netrw - allow both to coexist
|
||||
default_file_explorer = false,
|
||||
-- Columns shown in the oil buffer
|
||||
columns = {
|
||||
'icon',
|
||||
|
|
@ -32,6 +35,8 @@ return {
|
|||
list = false,
|
||||
conceallevel = 3,
|
||||
concealcursor = 'nvic',
|
||||
number = true,
|
||||
relativenumber = true,
|
||||
},
|
||||
-- Delete to trash instead of permanently deleting
|
||||
delete_to_trash = false,
|
||||
|
|
|
|||
|
|
@ -80,26 +80,30 @@ return {
|
|||
end,
|
||||
keys = {
|
||||
-- Find files in current working directory
|
||||
{ '<leader>ff', '<cmd>Telescope find_files<cr>', desc = 'Find files' },
|
||||
{ '<leader>ff', '<cmd>Telescope find_files<cr>', desc = 'Telescope: Find files' },
|
||||
|
||||
-- Live grep (search text across project)
|
||||
{ '<leader>fg', '<cmd>Telescope live_grep<cr>', desc = 'Live grep' },
|
||||
{ '<leader>fg', '<cmd>Telescope live_grep<cr>', desc = 'Telescope: Live grep' },
|
||||
|
||||
-- Search in open buffers
|
||||
{ '<leader>fb', '<cmd>Telescope buffers<cr>', desc = 'Find buffers' },
|
||||
{ '<leader>fb', '<cmd>Telescope buffers<cr>', desc = 'Telescope: Find buffers' },
|
||||
|
||||
-- Search help tags
|
||||
{ '<leader>fh', '<cmd>Telescope help_tags<cr>', desc = 'Find help' },
|
||||
{ '<leader>fh', '<cmd>Telescope help_tags<cr>', desc = 'Telescope: Find help' },
|
||||
|
||||
-- Recent files
|
||||
{ '<leader>fr', '<cmd>Telescope oldfiles<cr>', desc = 'Recent files' },
|
||||
{ '<leader>fr', '<cmd>Telescope oldfiles<cr>', desc = 'Telescope: Recent files' },
|
||||
|
||||
-- Search current buffer
|
||||
{ '<leader>/', '<cmd>Telescope current_buffer_fuzzy_find<cr>', desc = 'Search buffer' },
|
||||
{ '<leader>/', '<cmd>Telescope current_buffer_fuzzy_find<cr>', desc = 'Telescope: Search buffer' },
|
||||
|
||||
-- Search keymaps
|
||||
{ '<leader>fk', '<cmd>Telescope keymaps<cr>', desc = 'Telescope: Find keymaps' },
|
||||
{ '<leader>?', '<cmd>Telescope keymaps<cr>', desc = 'Telescope: Find keymaps' },
|
||||
|
||||
-- LSP-related pickers (optional, for when LSP is active)
|
||||
{ '<leader>fs', '<cmd>Telescope lsp_document_symbols<cr>', desc = 'Document symbols' },
|
||||
{ '<leader>fS', '<cmd>Telescope lsp_dynamic_workspace_symbols<cr>', desc = 'Workspace symbols (dynamic)' },
|
||||
{ '<leader>fs', '<cmd>Telescope lsp_document_symbols<cr>', desc = 'Telescope: Document symbols' },
|
||||
{ '<leader>fS', '<cmd>Telescope lsp_dynamic_workspace_symbols<cr>', desc = 'Telescope: Workspace symbols' },
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,17 +6,17 @@ return {
|
|||
},
|
||||
event = { 'BufReadPost', 'BufNewFile' },
|
||||
keys = {
|
||||
{ 'zR', function() require('ufo').openAllFolds() end, desc = 'Open all folds' },
|
||||
{ 'zM', function() require('ufo').closeAllFolds() end, desc = 'Close all folds' },
|
||||
{ 'zr', function() require('ufo').openFoldsExceptKinds() end, desc = 'Open folds except kinds' },
|
||||
{ 'zm', function() require('ufo').closeFoldsWith() end, desc = 'Close folds with' },
|
||||
{ 'zR', function() require('ufo').openAllFolds() end, desc = 'UFO: Open all folds' },
|
||||
{ 'zM', function() require('ufo').closeAllFolds() end, desc = 'UFO: Close all folds' },
|
||||
{ 'zr', function() require('ufo').openFoldsExceptKinds() end, desc = 'UFO: Open folds except kinds' },
|
||||
{ 'zm', function() require('ufo').closeFoldsWith() end, desc = 'UFO: Close folds with' },
|
||||
{ 'K', function()
|
||||
local winid = require('ufo').peekFoldedLinesUnderCursor()
|
||||
if not winid then
|
||||
-- Fall back to LSP hover if not on a fold
|
||||
vim.lsp.buf.hover()
|
||||
end
|
||||
end, desc = 'Peek fold or LSP hover' },
|
||||
end, desc = 'UFO: Peek fold or LSP hover' },
|
||||
},
|
||||
opts = {
|
||||
provider_selector = function(bufnr, filetype, buftype)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ return {
|
|||
'mbbill/undotree',
|
||||
cmd = 'UndotreeToggle', -- Lazy load on command
|
||||
keys = {
|
||||
{ '<leader>u', '<cmd>UndotreeToggle<cr>', desc = 'Toggle Undotree' },
|
||||
{ '<leader>u', '<cmd>UndotreeToggle<cr>', desc = 'Undotree: Toggle undo tree' },
|
||||
},
|
||||
config = function()
|
||||
-- Configure undotree
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue