Skip to content

Commit 516c118

Browse files
committed
feat(keymaps): add descriptions (WIP) (#164)
1 parent 10139a3 commit 516c118

5 files changed

Lines changed: 24 additions & 19 deletions

File tree

lua/dap-view/console/keymaps.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ M.set_keymaps = function(buf)
1010

1111
keymap(keys.next_session, function()
1212
require("dap-view").navigate({ count = vim.v.count1, wrap = true, type = "sessions" })
13-
end, buf)
13+
end, { buf = buf, desc = "go to next session" })
1414

1515
keymap(keys.prev_session, function()
1616
require("dap-view").navigate({ count = -vim.v.count1, wrap = true, type = "sessions" })
17-
end, buf)
17+
end, { buf = buf, desc = "go to prev session" })
1818
end
1919

2020
return M

lua/dap-view/hover/init.lua

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ M.set_buf_options = function(bufnr)
3131
buf.filetype = "dap-view-hover"
3232
end
3333

34-
---@param bufnr integer
35-
M.set_keymaps = function(bufnr)
34+
---@param buf integer
35+
M.set_keymaps = function(buf)
3636
local keys = setup.config.keymaps.hover
3737

38-
keymap(keys.quit, "<C-w>q", bufnr)
38+
keymap(keys.quit, "<C-w>q", { buf = buf, desc = "close" })
3939

4040
keymap(keys.toggle, function()
4141
local cursor_line = api.nvim_win_get_cursor(state.hover_winnr)[1]
@@ -44,19 +44,19 @@ M.set_keymaps = function(bufnr)
4444
if require("dap-view.hover.actions").expand_or_collapse(cursor_line) then
4545
require("dap-view.hover.eval").evaluate_expression(state.hover)
4646

47-
local line, width = unpack(require("dap-view.hover.view").show(bufnr))
47+
local line, width = unpack(require("dap-view.hover.view").show(buf))
4848

4949
api.nvim_win_set_height(state.hover_winnr, line)
5050
api.nvim_win_set_width(state.hover_winnr, width)
5151
end
5252
end)()
53-
end, bufnr)
53+
end, { buf = buf, desc = "toggle" })
5454

5555
keymap(keys.jump_to_parent, function()
5656
local cursor_line = api.nvim_win_get_cursor(state.hover_winnr)[1]
5757

5858
require("dap-view.hover.actions").jump_to_parent(cursor_line)
59-
end, bufnr)
59+
end, { buf = buf, desc = "jump to parent" })
6060

6161
keymap(keys.set_value, function()
6262
local cursor_line = api.nvim_win_get_cursor(state.hover_winnr)[1]
@@ -66,13 +66,13 @@ M.set_keymaps = function(bufnr)
6666
-- This is a little redundant
6767
require("dap-view.hover.eval").evaluate_expression(state.hover)
6868

69-
local line, width = unpack(require("dap-view.hover.view").show(bufnr))
69+
local line, width = unpack(require("dap-view.hover.view").show(buf))
7070

7171
api.nvim_win_set_height(state.hover_winnr, line)
7272
api.nvim_win_set_width(state.hover_winnr, width)
7373
end
7474
end)()
75-
end, bufnr)
75+
end, { buf = buf, desc = "set value" })
7676
end
7777

7878
---@param bufnr integer

lua/dap-view/views/keymaps/help.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ M.show_help = function()
7878

7979
keymap(setup.config.keymaps.help.quit, function()
8080
api.nvim_win_close(help_win, true)
81-
end, help_buf)
81+
end, { buf = help_buf, desc = "close" })
8282

8383
util.set_lines(help_buf, 0, -1, true, content)
8484

lua/dap-view/views/keymaps/init.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@ M.set_keymaps = function(buf)
1111

1212
keymap(keys.next_view, function()
1313
require("dap-view").navigate({ count = vim.v.count1, wrap = true })
14-
end, buf)
14+
end, { buf = buf, desc = "go to next view" })
1515

1616
keymap(keys.prev_view, function()
1717
require("dap-view").navigate({ count = -vim.v.count1, wrap = true })
18-
end, buf)
18+
end, { buf = buf, desc = "go to prev view" })
1919

2020
keymap(keys.jump_to_last, function()
2121
require("dap-view").navigate({ count = vim._maxint, wrap = false })
22-
end, buf)
22+
end, { buf = buf, desc = "jump to last view" })
2323

2424
keymap(keys.jump_to_first, function()
2525
require("dap-view").navigate({ count = -vim._maxint, wrap = false })
26-
end, buf)
26+
end, { buf = buf, desc = "jump to first view" })
2727

2828
if not buf then
2929
require("dap-view.views.keymaps.views").views_keymaps()
3030
end
3131

3232
keymap(keys.help, function()
3333
help.show_help()
34-
end, buf)
34+
end, { buf = buf, desc = "show help" })
3535
end
3636

3737
return M

lua/dap-view/views/keymaps/util.lua

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,20 @@ local M = {}
44

55
---@param lhs string|string[]
66
---@param rhs string|function
7-
---@param buf? integer
7+
---@param opts? vim.keymap.set.Opts
88
---@param mode? string|string[]
9-
function M.keymap(lhs, rhs, buf, mode)
9+
function M.keymap(lhs, rhs, opts, mode)
1010
mode = mode or "n"
1111
if type(lhs) == "string" then
1212
lhs = { lhs }
1313
end
14+
15+
opts = opts or {}
16+
opts.nowait = true
17+
opts.buf = opts.buf or state.bufnr
18+
1419
for _, v in ipairs(lhs) do
15-
vim.keymap.set(mode, v, rhs, { buffer = buf or state.bufnr, nowait = true })
20+
vim.keymap.set(mode, v, rhs, opts)
1621
end
1722
end
1823

0 commit comments

Comments
 (0)