Merge remote-tracking branch 'origin/rolling'

1 files changed, 26 insertions, 11 deletions

diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua
index 52b7a9ab..3c3cc66b 100644
--- a/lua/lvim/core/which-key.lua
+++ b/lua/lvim/core/which-key.lua
@@ -15,7 +15,7 @@ M.config = function()
           operators = false, -- adds help for operators like d, y, ...
           motions = false, -- adds help for motions
           text_objects = false, -- help for text objects triggered after entering an operator
-          windows = true, -- default bindings on <c-w>
+          windows = false, -- default bindings on <c-w>
           nav = true, -- misc bindings to work with windows
           z = true, -- bindings for folds, spelling and others prefixed with z
           g = true, -- bindings for prefixed with g
@@ -27,19 +27,35 @@ M.config = function()
         separator = "➜", -- symbol used between a key and it's label
         group = "+", -- symbol prepended to a group
       },
+      popup_mappings = {
+        scroll_down = "<c-d>", -- binding to scroll down inside the popup
+        scroll_up = "<c-u>", -- binding to scroll up inside the popup
+      },
       window = {
         border = "single", -- none, single, double, shadow
         position = "bottom", -- bottom, top
         margin = { 1, 0, 1, 0 }, -- extra window margin [top, right, bottom, left]
         padding = { 2, 2, 2, 2 }, -- extra window padding [top, right, bottom, left]
+        winblend = 0,
       },
       layout = {
         height = { min = 4, max = 25 }, -- min and max height of the columns
         width = { min = 20, max = 50 }, -- min and max width of the columns
         spacing = 3, -- spacing between columns
+        align = "left", -- align columns left, center or right
       },
       hidden = { "<silent>", "<cmd>", "<Cmd>", "<CR>", "call", "lua", "^:", "^ " }, -- hide mapping boilerplate
+      ignore_missing = false, -- enable this to hide mappings for which you didn't specify a label
       show_help = true, -- show help message on the command line when the popup is visible
+      triggers = "auto", -- automatically setup triggers
+      -- triggers = {"<leader>"} -- or specify a list manually
+      triggers_blacklist = {
+        -- list of mode / prefixes that should never be hooked by WhichKey
+        -- this is mostly relevant for key maps that start with a native binding
+        -- most people should not need to change this
+        i = { "j", "k" },
+        v = { "j", "k" },
+      },
     },
 
     opts = {
@@ -137,32 +153,31 @@ M.config = function()
           "Git Diff",
         },
       },
-
       l = {
         name = "LSP",
-        a = { "<cmd>lua require('lvim.core.telescope').code_actions()<cr>", "Code Action" },
+        a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Code Action" },
         d = { "<cmd>Telescope diagnostics bufnr=0 theme=get_ivy<cr>", "Buffer Diagnostics" },
         w = { "<cmd>Telescope diagnostics<cr>", "Diagnostics" },
-        f = { "<cmd>lua vim.lsp.buf.formatting()<cr>", "Format" },
+        f = { require("lvim.lsp.utils").format, "Format" },
         i = { "<cmd>LspInfo<cr>", "Info" },
         I = { "<cmd>LspInstallInfo<cr>", "Installer Info" },
         j = {
-          "<cmd>lua vim.diagnostic.goto_next()<cr>",
+          vim.diagnostic.goto_next,
           "Next Diagnostic",
         },
         k = {
-          "<cmd>lua vim.diagnostic.goto_prev()<cr>",
+          vim.diagnostic.goto_prev,
           "Prev Diagnostic",
         },
-        l = { "<cmd>lua vim.lsp.codelens.run()<cr>", "CodeLens Action" },
+        l = { vim.lsp.codelens.run, "CodeLens Action" },
         p = {
           name = "Peek",
           d = { "<cmd>lua require('lvim.lsp.peek').Peek('definition')<cr>", "Definition" },
           t = { "<cmd>lua require('lvim.lsp.peek').Peek('typeDefinition')<cr>", "Type Definition" },
           i = { "<cmd>lua require('lvim.lsp.peek').Peek('implementation')<cr>", "Implementation" },
         },
-        q = { "<cmd>lua vim.diagnostic.setloclist()<cr>", "Quickfix" },
-        r = { "<cmd>lua vim.lsp.buf.rename()<cr>", "Rename" },
+        q = { vim.diagnostic.setloclist, "Quickfix" },
+        r = { vim.lsp.buf.rename, "Rename" },
         s = { "<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols" },
         S = {
           "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>",
@@ -214,10 +229,10 @@ M.config = function()
           },
           N = { "<cmd>edit $NVIM_LOG_FILE<cr>", "Open the Neovim logfile" },
           p = {
-            "<cmd>lua require('lvim.core.terminal').toggle_log_view('packer.nvim')<cr>",
+            "<cmd>lua require('lvim.core.terminal').toggle_log_view(get_cache_dir() .. '/packer.nvim.log')<cr>",
             "view packer log",
           },
-          P = { "<cmd>exe 'edit '.stdpath('cache').'/packer.nvim.log'<cr>", "Open the Packer logfile" },
+          P = { "<cmd>edit $LUNARVIM_CACHE_DIR/packer.nvim.log<cr>", "Open the Packer logfile" },
         },
         r = { "<cmd>LvimReload<cr>", "Reload LunarVim's configuration" },
         u = { "<cmd>LvimUpdate<cr>", "Update LunarVim" },