From b2d18d1116c25d65ed73ece068ec47db2b6dee3d Mon Sep 17 00:00:00 2001 From: Arthur Khachaturov Date: Wed, 28 Aug 2024 20:34:39 +0300 Subject: [PATCH] wooo! an update!!! finallyy!!!! --- .config/nvim/lua/plugins/cmp.lua | 18 ++++++++++++++++-- .config/nvim/lua/plugins/init.lua | 3 --- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua index b9edf60..6b8cff1 100644 --- a/.config/nvim/lua/plugins/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -4,12 +4,15 @@ return { dependencies = { 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-buffer', - 'onsails/lspkind.nvim' + 'onsails/lspkind.nvim', + 'L3MON4D3/LuaSnip' }, config = function() local cmp = require('cmp') local lspkind = require('lspkind') + local luasnip = require("luasnip") + cmp.setup({ completion = { completeopt = 'menu,menuone,noinsert' @@ -25,6 +28,8 @@ return { [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() + elseif luasnip.locally_jumpable(1) then + luasnip.jump(1) else fallback() end @@ -32,15 +37,24 @@ return { [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() + elseif luasnip.locally_jumpable(-1) then + luasnip.jump(-1) else fallback() end end, { 'i', 's' }), }, + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + sources = { { name = 'nvim_lsp' }, { name = 'buffer' }, + { name = 'luasnip' }, }, --- @diagnostic disable-next-line: missing-fields @@ -49,7 +63,7 @@ return { mode = 'symbol_text', show_labelDetails = true, menu = ({ - buffer = "[Buffer]", + buffer = "[BUF]", nvim_lsp = "[LSP]", }) }) diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua index d23fa2e..d688540 100644 --- a/.config/nvim/lua/plugins/init.lua +++ b/.config/nvim/lua/plugins/init.lua @@ -1,9 +1,6 @@ -vim.g.polyglot_disabled = {'sensible'} - return { 'rcarriga/nvim-notify', 'stefandtw/quickfix-reflector.vim', - { 'sheerun/vim-polyglot' }, { 'akinsho/bufferline.nvim', opts = {}, dependencies = { 'navarasu/onedark.nvim' } }, { 'ethanholz/nvim-lastplace', opts = {} }, { 'kylechui/nvim-surround', version = '*', event = 'VeryLazy', opts = {} },