bumpsoo/terminal_configuration
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated lspconfig

Browse source
This commit is contained in:
bumpsoo 2024-02-19 18:58:36 +09:00
parent a880080590
commit 855f959141
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.config/nvim/lua/bumpsoo/plugins/lspconfig.lua
View file

@ -1,6 +1,6 @@
local config = function() local config = function()
-- Add additional capabilities supported by nvim-cmp -- Add additional capabilities supported by nvim-cmp
local capabilities = require("cmp_nvim_lsp").default_capabilities() local capabilities = require('cmp_nvim_lsp').default_capabilities()
local lspconfig = require('lspconfig') local lspconfig = require('lspconfig')
local on_attach = function(client, bufnr) local on_attach = function(client, bufnr)
local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
@ -13,7 +13,6 @@ local config = function()
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts) buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
buf_set_keymap('n', 'gR', '<cmd>lua vim.lsp.buf.rename()<CR>', opts) buf_set_keymap('n', 'gR', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
end end
-- Enable some language servers with the additional -- Enable some language servers with the additional
-- completion capabilities offered by nvim-cmp -- completion capabilities offered by nvim-cmp
local servers = { 'gopls', 'erlangls'} local servers = { 'gopls', 'erlangls'}
@ -40,12 +39,11 @@ local config = function()
} }
} }
} }
local luasnip = require 'luasnip'
local cmp = require 'cmp' local cmp = require 'cmp'
cmp.setup { cmp.setup {
snippet = { snippet = {
expand = function(args) expand = function(args)
luasnip.lsp_expand(args.body) vim.fn["vsnip#anonymous"](args.body)
end, end,
}, },
mapping = cmp.mapping.preset.insert({ mapping = cmp.mapping.preset.insert({
@ -59,8 +57,6 @@ local config = function()
['<Tab>'] = cmp.mapping(function(fallback) ['<Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_next_item() cmp.select_next_item()
elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump()
else else
fallback() fallback()
end end
@ -68,8 +64,6 @@ local config = function()
['<S-Tab>'] = cmp.mapping(function(fallback) ['<S-Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_prev_item() cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
luasnip.jump(-1)
else else
fallback() fallback()
end end
@ -77,7 +71,7 @@ local config = function()
}), }),
sources = { sources = {
{ name = 'nvim_lsp' }, { name = 'nvim_lsp' },
{ name = 'luasnip' }, { name = 'vsnip' },
}, },
} }
end end
@ -86,9 +80,9 @@ return {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
dependencies = { dependencies = {
'hrsh7th/nvim-cmp', 'hrsh7th/nvim-cmp',
'hrsh7th/cmp-nvim-lsp', 'hrsh7yh/cmp-nvim-lsp',
'saadparwaiz1/cmp_luasnip', 'hrsh7th/cmp-vsnip',
'L3MON4D3/LuaSnip', 'hrsh7th/vim-vsnip',
}, },
config = config config = config
} }