nvim: update to v3 which-key spec

1 files changed, 35 insertions, 30 deletions

diff --git a/dot_config/nvim/lua/plugins/lsp/attach.lua b/dot_config/nvim/lua/plugins/lsp/attach.lua
index 66d5a44..e81b154 100644
--- a/dot_config/nvim/lua/plugins/lsp/attach.lua
+++ b/dot_config/nvim/lua/plugins/lsp/attach.lua
@@ -1,36 +1,41 @@
+local function helper(opts, ...)
+	for _, spec in ipairs({...}) do
+		for _, v in ipairs(spec) do
+			if opts.prefix then
+				v[0] = opts.prefix .. v[0]
+			end
+			if opts.buffer then
+				v.buffer = opts.buffer
+			end
+		end
+	end
+end
+
 return function(c, b)
 	local lsp = vim.lsp
 	local lbf = lsp.buf
 	local wk  = require 'which-key'
 	vim.api.nvim_buf_set_option(b, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-	wk.register({
-		name = '+lsp',
-		D = {lbf.declaration, 'goto declaration'},
-		d = {lbf.definition, 'goto definition'},
-		k = {lbf.hover, 'hover'},
-		K = {lbf.signature_help, 'signature help'},
-		i = {lbf.implementation, 'goto implementation'},
-		t = {lbf.type_definition, 'goto type definition'},
-		r = {lbf.rename, 'rename'},
-		c = {lbf.code_action, 'code action'},
-		R = {lbf.references, 'list references'},
-		w = {
-			name = '+workspace',
-			a = {lbf.add_workspace_folder, 'add folder'},
-			r = {lbf.remove_workspace_folder, 'remove folder'},
-			l = {
-				function() print(vim.inspect(lbf.list_workspace_folders())) end,
-				'list folders'
-			},
-		},
-	}, {
-	prefix = '<localleader><localleader>',
-		buffer = b,
-	})
-	wk.register({
-		['<leader>F'] = {
-			function() vim.lsp.buf.format {async = true} end,
-			'run format',
-		},
-	}, { buffer = b })
+	wk.add(helper({buffer = b}, {
+		{ '<leader>F', function() vim.lsp.buf.format {async = true} end,
+		  desc = 'run format' },
+	}, helper({prefix = '<localleader><localleader>'}, {
+		{ '', group = '+lsp' },
+		{ 'w', group = '+workspace' },
+
+		{ 'D', lbf.declaration, desc = 'goto declaration' },
+		{ 'd', lbf.definition, desc = 'goto definition' },
+		{ 'k', lbf.hover, desc = 'hover' },
+		{ 'K', lbf.signature_help, desc = 'signature help' },
+		{ 'i', lbf.implementation, desc = 'goto implementation' },
+		{ 't', lbf.type_definition, desc = 'goto type definition' },
+		{ 'r', lbf.rename, desc = 'rename' },
+		{ 'c', lbf.code_action, desc = 'code action' },
+		{ 'R', lbf.references, desc = 'list references' },
+
+		{ 'wa', lbf.add_workspace_folder, 'add folder' },
+		{ 'wr', lbf.remove_workspace_folder, 'remove folder' },
+		{ 'wl', function() print(vim.inspect(lbf.list_workspace_folders())) end,
+		  desc = 'list folders' },
+	})))
 end