Skip to content

Commit 3c6dd42

Browse files
committed
plugin/lsp: simplify automatic keymap description
Do not create description prefix generically, but use extra argument for `mkMaps`. Change-Id: Id08297623edf750d8f33eb031748668be0c8bfa5
1 parent d867aae commit 3c6dd42

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

plugins/lsp/default.nix

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -192,20 +192,12 @@ in
192192
keymapsOnEvents.LspAttach =
193193
let
194194
mkMaps =
195-
prefix:
195+
prefix: descPrefix:
196196
mapAttrsToList (
197197
key: action:
198198
let
199199
actionStr = action.action or action;
200200
actionProps = optionalAttrs (isAttrs action) (removeAttrs action [ "action" ]);
201-
desc =
202-
let
203-
split = splitString "." prefix;
204-
splitlen = length split;
205-
prefixFinal = (elemAt split (splitlen - 2)) + " ";
206-
optPrefix = optionalString (splitlen > 2) prefixFinal;
207-
in
208-
"Lsp " + optPrefix + actionStr;
209201
in
210202
{
211203
mode = "n";
@@ -214,13 +206,13 @@ in
214206

215207
options = {
216208
inherit (cfg.keymaps) silent;
217-
inherit desc;
209+
desc = "${descPrefix} ${actionStr}";
218210
} // actionProps;
219211
}
220212
);
221213
in
222-
mkMaps "vim.diagnostic." cfg.keymaps.diagnostic
223-
++ mkMaps "vim.lsp.buf." cfg.keymaps.lspBuf
214+
mkMaps "vim.diagnostic." "Lsp diagnostic" cfg.keymaps.diagnostic
215+
++ mkMaps "vim.lsp.buf." "Lsp buf" cfg.keymaps.lspBuf
224216
++ cfg.keymaps.extra;
225217

226218
# Enable inlay-hints

0 commit comments

Comments
 (0)