diff options
| author | kylo252 <[email protected]> | 2021-11-10 11:14:32 +0100 | 
|---|---|---|
| committer | kylo252 <[email protected]> | 2021-11-10 11:14:32 +0100 | 
| commit | a57e34a85edc8fc15a5c06640a15b0a0fec89d91 (patch) | |
| tree | 55abec722051caacacb4b15db9c69e9b6e4f3ec7 /lua/lvim/core | |
| parent | 3d146bd4e96d9fcb24aa0bbb2089219aa5b52fcb (diff) | |
| parent | 605c14e49996f635234b1157a96580448deb1160 (diff) | |
Merge branch 'rolling'
Diffstat (limited to 'lua/lvim/core')
| -rw-r--r-- | lua/lvim/core/cmp.lua | 3 | ||||
| -rw-r--r-- | lua/lvim/core/which-key.lua | 5 | 
2 files changed, 7 insertions, 1 deletions
| 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 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>", | 
