From 855f9591416552000b19568033622ac5c227ca4d Mon Sep 17 00:00:00 2001 From: bumpsoo Date: Mon, 19 Feb 2024 18:58:36 +0900 Subject: [PATCH] updated lspconfig --- .config/nvim/lua/bumpsoo/plugins/lspconfig.lua | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.config/nvim/lua/bumpsoo/plugins/lspconfig.lua b/.config/nvim/lua/bumpsoo/plugins/lspconfig.lua index 2124b14..b058631 100644 --- a/.config/nvim/lua/bumpsoo/plugins/lspconfig.lua +++ b/.config/nvim/lua/bumpsoo/plugins/lspconfig.lua @@ -1,6 +1,6 @@ local config = function() -- 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 on_attach = function(client, bufnr) 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', 'lua vim.lsp.buf.references()', opts) buf_set_keymap('n', 'gR', 'lua vim.lsp.buf.rename()', opts) end - -- Enable some language servers with the additional -- completion capabilities offered by nvim-cmp local servers = { 'gopls', 'erlangls'} @@ -40,12 +39,11 @@ local config = function() } } } - local luasnip = require 'luasnip' local cmp = require 'cmp' cmp.setup { snippet = { expand = function(args) - luasnip.lsp_expand(args.body) + vim.fn["vsnip#anonymous"](args.body) end, }, mapping = cmp.mapping.preset.insert({ @@ -59,8 +57,6 @@ local config = function() [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() else fallback() end @@ -68,8 +64,6 @@ local config = function() [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) else fallback() end @@ -77,7 +71,7 @@ local config = function() }), sources = { { name = 'nvim_lsp' }, - { name = 'luasnip' }, + { name = 'vsnip' }, }, } end @@ -86,9 +80,9 @@ return { "neovim/nvim-lspconfig", dependencies = { 'hrsh7th/nvim-cmp', - 'hrsh7th/cmp-nvim-lsp', - 'saadparwaiz1/cmp_luasnip', - 'L3MON4D3/LuaSnip', + 'hrsh7yh/cmp-nvim-lsp', + 'hrsh7th/cmp-vsnip', + 'hrsh7th/vim-vsnip', }, config = config }