diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lvim/core/autocmds.lua | 14 | ||||
| -rw-r--r-- | lua/lvim/core/cmp.lua | 15 | ||||
| -rw-r--r-- | lua/lvim/plugins.lua | 5 |
3 files changed, 10 insertions, 24 deletions
diff --git a/lua/lvim/core/autocmds.lua b/lua/lvim/core/autocmds.lua index 20716e83..f5c63588 100644 --- a/lua/lvim/core/autocmds.lua +++ b/lua/lvim/core/autocmds.lua @@ -155,19 +155,11 @@ end ---@param name string the augroup name function M.clear_augroup(name) -- defer the function in case the autocommand is still in-use - local exists, _ = pcall(vim.api.nvim_get_autocmds, { group = name }) - if not exists then - Log:debug("ignoring request to clear autocmds from non-existent group " .. name) - return - end + Log:debug("request to clear autocmds " .. name) vim.schedule(function() - local status_ok, _ = xpcall(function() + pcall(function() vim.api.nvim_clear_autocmds { group = name } - end, debug.traceback) - if not status_ok then - Log:warn("problems detected while clearing autocmds from " .. name) - Log:debug(debug.traceback()) - end + end) end) end diff --git a/lua/lvim/core/cmp.lua b/lua/lvim/core/cmp.lua index 7b0b0e6e..408691a6 100644 --- a/lua/lvim/core/cmp.lua +++ b/lua/lvim/core/cmp.lua @@ -272,20 +272,15 @@ M.config = function() if is_insert_mode() then -- prevent overwriting brackets confirm_opts.behavior = cmp.ConfirmBehavior.Insert end - cmp.confirm(confirm_opts) - if jumpable(1) then - luasnip.jump(1) + if cmp.confirm(confirm_opts) then + return -- success, exit early end - return end - if jumpable(1) then - if not luasnip.jump(1) then - fallback() - end - else - fallback() + if jumpable(1) and luasnip.jump(1) then + return -- success, exit early end + fallback() -- if not exited early, always fallback end), }, } diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 24f71204..bfe76bb8 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -102,8 +102,7 @@ local core_plugins = { "hrsh7th/cmp-path", }, { - -- NOTE: Temporary fix till folke comes back - "max397574/lua-dev.nvim", + "folke/lua-dev.nvim", module = "lua-dev", }, @@ -153,7 +152,7 @@ local core_plugins = { -- Whichkey { - "max397574/which-key.nvim", + "folke/which-key.nvim", config = function() require("lvim.core.which-key").setup() end, |