Cleanup completion

This commit is contained in:
Dave Gallant
2022-04-30 14:43:56 -04:00
parent fe56aca9a1
commit 1a47ccf992
2 changed files with 9 additions and 13 deletions

View File

@@ -117,7 +117,7 @@ require("packer").startup(function()
end)
-------------------------------------------------------------------------------
-- lsp {{{1 -------------------------------------------------------------------
-- completion {{{1 -------------------------------------------------------------------
-------------------------------------------------------------------------------
local has_words_before = function()
@@ -134,8 +134,7 @@ cmp.setup {
{ name = 'path' },
{ name = 'treesitter' },
},
mapping = {
mapping = {
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
@@ -157,10 +156,13 @@ cmp.setup {
fallback()
end
end, { "i", "s" }),
},
}
}
-------------------------------------------------------------------------------
-- lsp {{{1 -------------------------------------------------------------------
-------------------------------------------------------------------------------
local lspconfig = require "lspconfig"
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
@@ -207,6 +209,7 @@ lspconfig.solargraph.setup({
})
lspconfig.terraformls.setup({
filetypes={"terraform","tf","hcl"},
capabilities = capabilities,
})
@@ -218,13 +221,6 @@ lspconfig.yamlls.setup({
capabilities = capabilities,
})
vim.cmd([[autocmd BufWritePre *.tf lua vim.lsp.buf.formatting_sync()]])
vim.cmd([[autocmd BufWritePre *.py lua vim.lsp.buf.formatting_sync()]])
vim.cmd([[autocmd BufWritePre *.go lua vim.lsp.buf.formatting_sync()]])
vim.cmd([[autocmd BufWritePre *.rb lua vim.lsp.buf.formatting_sync()]])
vim.cmd([[autocmd BufWritePre *.nix lua vim.lsp.buf.formatting_sync()]])
require'luasnip'.filetype_extend("go", {"go"})
require'luasnip'.filetype_extend("ruby", {"rails"})