diff --git a/.config/nvim/lua/plugins/autocomplete.lua b/.config/nvim/lua/plugins/autocomplete.lua index 4c627fe..7802962 100644 --- a/.config/nvim/lua/plugins/autocomplete.lua +++ b/.config/nvim/lua/plugins/autocomplete.lua @@ -25,13 +25,10 @@ return { local cmp = require('cmp') local snippet = require('luasnip') local lspkind = require('lspkind') - local autopairs = require('nvim-autopairs.completion.cmp') local select_opts = { behavior = cmp.SelectBehavior.Select } require('luasnip.loaders.from_vscode').lazy_load() - cmp.event:on('confirm_done', autopairs.on_confirm_done()) - cmp.setup({ enabled = function() -- disable completion in comments @@ -206,4 +203,4 @@ return { }, }) end, -} +} \ No newline at end of file diff --git a/.config/nvim/lua/plugins/autopairs.lua b/.config/nvim/lua/plugins/autopairs.lua index 0524d9e..3cad087 100644 --- a/.config/nvim/lua/plugins/autopairs.lua +++ b/.config/nvim/lua/plugins/autopairs.lua @@ -1,14 +1,21 @@ return { 'windwp/nvim-autopairs', + config = true, event = { 'InsertEnter' }, dependencies = { 'hrsh7th/nvim-cmp', }, - opts = { - check_ts = true, - map_cr = false, - map_bs = true, - map_c_h = true, -- deletes a pair - map_c_w = true, -- delete pair if possible - }, + opts = function(_, opts) + local autopairs = require('nvim-autopairs.completion.cmp') + local cmp = require('cmp') + + opts.fast_wrap = {} + opts.check_ts = true + opts.map_cr = true + opts.map_bs = true + opts.map_c_h = false + opts.map_c_w = false + + cmp.event:on('confirm_done', autopairs.on_confirm_done()) + end, }