mirror of
https://github.com/LunarVim/LunarVim.git
synced 2024-09-20 10:35:08 +02:00
Merge remote-tracking branch 'origin/rolling'
This commit is contained in:
commit
824b2d1ef0
4 changed files with 13 additions and 27 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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),
|
||||
},
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
"commit": "09e5374"
|
||||
},
|
||||
"bufferline.nvim": {
|
||||
"commit": "13a532e"
|
||||
"commit": "0b4b863"
|
||||
},
|
||||
"cmp-buffer": {
|
||||
"commit": "3022dbc"
|
||||
|
@ -36,7 +36,7 @@
|
|||
"commit": "d7e0bcb"
|
||||
},
|
||||
"lua-dev.nvim": {
|
||||
"commit": "54149d1"
|
||||
"commit": "9381ad0"
|
||||
},
|
||||
"lualine.nvim": {
|
||||
"commit": "3cf4540"
|
||||
|
@ -111,6 +111,6 @@
|
|||
"commit": "7abb25e"
|
||||
},
|
||||
"which-key.nvim": {
|
||||
"commit": "f03a259"
|
||||
"commit": "439637d"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue