From 684fcff874d2938f9254e86f75bc219b0a0e6bb6 Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Mon, 8 Jan 2024 19:42:29 -0600 Subject: [PATCH] handle autocomplete setup from autocomplete module --- init.lua | 34 --------------------------------- lua/plugins/autocompletion.lua | 35 +++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/init.lua b/init.lua index dd3239fb..1ebbe5ed 100644 --- a/init.lua +++ b/init.lua @@ -17,38 +17,4 @@ vim.opt.rtp:prepend(lazypath) require('lazy').setup('plugins'); require('lua/settings'); --- [[ Configure nvim-cmp ]] -local cmp = require 'cmp' -local luasnip = require 'luasnip' -require('luasnip.loaders.from_vscode').lazy_load() -luasnip.config.setup {} - -cmp.setup { - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - completion = { - completeopt = 'menu,menuone,noinsert', - }, - mapping = cmp.mapping.preset.insert { - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete {}, - [''] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }, - }, - sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - { name = 'path' }, - }, -} - - -- vim: ts=2 sts=2 sw=2 et diff --git a/lua/plugins/autocompletion.lua b/lua/plugins/autocompletion.lua index b92b6da2..a85c7202 100644 --- a/lua/plugins/autocompletion.lua +++ b/lua/plugins/autocompletion.lua @@ -12,5 +12,38 @@ return { -- Adds a number of user-friendly snippets 'rafamadriz/friendly-snippets', - } + }, + config = function() + local cmp = require 'cmp' + local luasnip = require 'luasnip' + require('luasnip.loaders.from_vscode').lazy_load() + luasnip.config.setup {} + + cmp.setup { + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + completion = { + completeopt = 'menu,menuone,noinsert', + }, + mapping = cmp.mapping.preset.insert { + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete {}, + [''] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }, + }, + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + { name = 'path' }, + }, + } + end }