diff --git a/lua/cosmic/lsp/providers/defaults.lua b/lua/cosmic/lsp/providers/defaults.lua index 956a051..5872811 100644 --- a/lua/cosmic/lsp/providers/defaults.lua +++ b/lua/cosmic/lsp/providers/defaults.lua @@ -55,4 +55,6 @@ end M.autostart = true +M.single_file_mode = true + return M diff --git a/lua/cosmic/plugins/nvim-cmp/init.lua b/lua/cosmic/plugins/nvim-cmp/init.lua index 19817ca..f56690b 100644 --- a/lua/cosmic/plugins/nvim-cmp/init.lua +++ b/lua/cosmic/plugins/nvim-cmp/init.lua @@ -1,6 +1,7 @@ local cmp = require('cmp') -local utils = require('cosmic-ui.utils') local cosmic_ui = require('cosmic-ui') +local utils = require('cosmic-ui.utils') +local luasnip = require('luasnip') local config = require('cosmic.config') local has_words_before = function() @@ -28,11 +29,10 @@ local get_formatting = function() } end --- @TODO: support for vsnip, ultisnips local default_cmp_opts = { snippet = { expand = function(args) - require('luasnip').lsp_expand(args.body) + luasnip.lsp_expand(args.body) end, }, mapping = { @@ -51,8 +51,8 @@ local default_cmp_opts = { [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() - elseif require('luasnip').expand_or_jumpable() then - require('luasnip').expand_or_jump() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() elseif has_words_before() then cmp.complete() else @@ -65,8 +65,8 @@ local default_cmp_opts = { [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() - elseif require('luasnip').jumpable(-1) then - require('luasnip').jump(-1) + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) else fallback() end