diff options
Diffstat (limited to 'lua/lvim/core')
| -rw-r--r-- | lua/lvim/core/info.lua | 1 | ||||
| -rw-r--r-- | lua/lvim/core/telescope.lua | 18 | ||||
| -rw-r--r-- | lua/lvim/core/which-key.lua | 20 |
3 files changed, 19 insertions, 20 deletions
diff --git a/lua/lvim/core/info.lua b/lua/lvim/core/info.lua index 00a7e85a..ac7d690a 100644 --- a/lua/lvim/core/info.lua +++ b/lua/lvim/core/info.lua @@ -69,6 +69,7 @@ end local function tbl_set_highlight(terms, highlight_group) for _, v in pairs(terms) do vim.cmd('let m=matchadd("' .. highlight_group .. '", "' .. v .. "[ ,│']\")") + vim.cmd('let m=matchadd("' .. highlight_group .. '", ", ' .. v .. '")') end end diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua index a4df4b3f..5b55bdc3 100644 --- a/lua/lvim/core/telescope.lua +++ b/lua/lvim/core/telescope.lua @@ -91,24 +91,6 @@ function M.config() }) end -function M.code_actions() - local opts = { - winblend = 15, - layout_config = { - prompt_position = "top", - width = 80, - height = 12, - }, - borderchars = lvim.builtin.telescope.defaults.borderchars, - border = {}, - previewer = false, - shorten_path = false, - } - local builtin = require "telescope.builtin" - local themes = require "telescope.themes" - builtin.lsp_code_actions(themes.get_dropdown(opts)) -end - function M.setup() local previewers = require "telescope.previewers" local sorters = require "telescope.sorters" diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua index b2e13022..21620b01 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 = { @@ -140,7 +156,7 @@ M.config = function() 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" }, |