From 3c6dd42ff8ef739f1a9c231c5669798c56070ac6 Mon Sep 17 00:00:00 2001
From: Yury Shvedov <yury.shvedov@kaspersky.com>
Date: Sun, 1 Dec 2024 15:16:06 +0300
Subject: [PATCH] plugin/lsp: simplify automatic keymap description

Do not create description prefix generically, but use extra argument for
`mkMaps`.

Change-Id: Id08297623edf750d8f33eb031748668be0c8bfa5
---
 plugins/lsp/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/plugins/lsp/default.nix b/plugins/lsp/default.nix
index 9729d981..c32a78a1 100644
--- a/plugins/lsp/default.nix
+++ b/plugins/lsp/default.nix
@@ -192,20 +192,12 @@ in
       keymapsOnEvents.LspAttach =
         let
           mkMaps =
-            prefix:
+            prefix: descPrefix:
             mapAttrsToList (
               key: action:
               let
                 actionStr = action.action or action;
                 actionProps = optionalAttrs (isAttrs action) (removeAttrs action [ "action" ]);
-                desc =
-                  let
-                    split = splitString "." prefix;
-                    splitlen = length split;
-                    prefixFinal = (elemAt split (splitlen - 2)) + " ";
-                    optPrefix = optionalString (splitlen > 2) prefixFinal;
-                  in
-                  "Lsp " + optPrefix + actionStr;
               in
               {
                 mode = "n";
@@ -214,13 +206,13 @@ in
 
                 options = {
                   inherit (cfg.keymaps) silent;
-                  inherit desc;
+                  desc = "${descPrefix} ${actionStr}";
                 } // actionProps;
               }
             );
         in
-        mkMaps "vim.diagnostic." cfg.keymaps.diagnostic
-        ++ mkMaps "vim.lsp.buf." cfg.keymaps.lspBuf
+        mkMaps "vim.diagnostic." "Lsp diagnostic" cfg.keymaps.diagnostic
+        ++ mkMaps "vim.lsp.buf." "Lsp buf" cfg.keymaps.lspBuf
         ++ cfg.keymaps.extra;
 
       # Enable inlay-hints