From b23533f4c50e8c62480f51bf4a51a126ada8fb51 Mon Sep 17 00:00:00 2001
From: Chase Colman <chase@colman.io>
Date: Tue, 9 Nov 2021 17:41:25 +0800
Subject: fix(cmp): if possible jump in the snippet after completion

fix(cmp): update cmp to fix textwidth calculation and indent bugs
---
 lua/lvim/core/cmp.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lua/lvim/core')

diff --git a/lua/lvim/core/cmp.lua b/lua/lvim/core/cmp.lua
index 375f7605..89159ebb 100644
--- a/lua/lvim/core/cmp.lua
+++ b/lua/lvim/core/cmp.lua
@@ -283,6 +283,9 @@ M.config = function()
       ["<C-e>"] = cmp.mapping.abort(),
       ["<CR>"] = cmp.mapping(function(fallback)
         if cmp.visible() and cmp.confirm(lvim.builtin.cmp.confirm_opts) then
+          if jumpable() then
+            luasnip.jump(1)
+          end
           return
         end
 
-- 
cgit v1.2.3


From 1ea5361475aca76290695fdd11dcda78a578e8f3 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Tue, 9 Nov 2021 18:59:27 +0100
Subject: fix(ci): blacklist 'sorbet' (#1936)

---
 lua/lvim/core/which-key.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lua/lvim/core')

diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua
index b036e376..254f2ec2 100644
--- a/lua/lvim/core/which-key.lua
+++ b/lua/lvim/core/which-key.lua
@@ -207,7 +207,10 @@ M.config = function()
             "<cmd>lua vim.fn.execute('edit ' .. require('lvim.core.log').get_path())<cr>",
             "Open the default logfile",
           },
-          l = { "<cmd>lua require('lvim.core.terminal').toggle_log_view(vim.lsp.get_log_path())<cr>", "view lsp log" },
+          l = {
+            "<cmd>lua require('lvim.core.terminal').toggle_log_view(vim.lsp.get_log_path())<cr>",
+            "view lsp log",
+          },
           L = { "<cmd>lua vim.fn.execute('edit ' .. vim.lsp.get_log_path())<cr>", "Open the LSP logfile" },
           n = {
             "<cmd>lua require('lvim.core.terminal').toggle_log_view(os.getenv('NVIM_LOG_FILE'))<cr>",
-- 
cgit v1.2.3