use cmp helpers, set capabilities on LspStart

Id: 42f6c0b1ff7952bfef6b51ee5932e40aa9112bcd
Author: Caio
Commit time: 2023-02-16T17:55:06+01:00

Modified lua/config/completions.lua

@@ -1,6 +1,7
-local cmp = require'cmp'
+local cmp = require('cmp')
+
cmp.setup({
- mapping = {
+ mapping = cmp.mapping.preset.insert({
['<C-p>'] = cmp.mapping.select_prev_item(),
['<C-n>'] = cmp.mapping.select_next_item(),
['<S-Tab>'] = cmp.mapping.select_prev_item(),

@@ -13,10 +14,10
behavior = cmp.ConfirmBehavior.Insert,
select = true,
})
- },
+ }),

- sources = {
+ sources = cmp.config.sources({
{ name = 'nvim_lsp' },
{ name = 'buffer' },
- },
+ }),
})

Modified lua/config/lsp.lua

@@ -32,6 +32,13

local config = require('lspconfig')

+local ok, _ = pcall(require, 'cmp_nvim_lsp')
+if ok then
+ config.util.default_config = vim.tbl_deep_extend('force', config.util.default_config, {
+ capabilities = require('cmp_nvim_lsp').default_capabilities(),
+ })
+end
+
config.rust_analyzer.setup({
on_attach = on_attach,
flags = {