diff --git a/lua/user/cmp.lua b/lua/user/cmp.lua index 1eb816b..b6c4fb1 100644 --- a/lua/user/cmp.lua +++ b/lua/user/cmp.lua @@ -3,18 +3,11 @@ if not cmp_status_ok then return end -local snip_status_ok, luasnip = pcall(require, "luasnip") -if not snip_status_ok then +local luasnip_status_ok, luasnip = pcall(require, "luasnip") +if not luasnip_status_ok then return end -require("luasnip/loaders/from_vscode").lazy_load() - -local check_backspace = function() - local col = vim.fn.col(".") - 1 - return col == 0 or vim.fn.getline("."):sub(col, col):match("%s") -end - local kind_icons = { Text = "", Method = "", @@ -44,85 +37,59 @@ local kind_icons = { } cmp.setup({ - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) -- For `luasnip` users. - end, - }, - - mapping = cmp.mapping.preset.insert({ + mapping = { [""] = cmp.mapping.select_prev_item(), [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping(cmp.mapping.scroll_docs(-1), { "i", "c" }), - [""] = cmp.mapping(cmp.mapping.scroll_docs(1), { "i", "c" }), - [""] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), [""] = cmp.mapping({ i = cmp.mapping.abort(), c = cmp.mapping.close(), }), -- Accept currently selected item. If none selected, `select` first item. -- Set `select` to `false` to only confirm explicitly selected items. - [""] = cmp.mapping.confirm({ select = true }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expandable() then - luasnip.expand() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif check_backspace() then - fallback() - else - fallback() - end - end, { - "i", - "s", - }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { - "i", - "s", - }), - }), + [""] = cmp.mapping.confirm({ select = true }), + }, + sources = { + { name = "gh_issues" }, + { name = "nvim_lua" }, + { name = "nvim_lsp" }, + { name = "path" }, + { name = "luasnip" }, + { name = "buffer", keyword_length = 5 }, + }, + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, formatting = { fields = { "kind", "abbr", "menu" }, format = function(entry, vim_item) vim_item.kind = kind_icons[vim_item.kind] vim_item.menu = ({ - nvim_lsp = "", - nvim_lua = "", - luasnip = "", - buffer = "", - path = "", - emoji = "", + nvim_lsp = "[LSP]", + nvim_lua = "[api]", + luasnip = "[snip]", + buffer = "[buf]", + path = "[path]", + emoji = "[emoji]", + gh_issues = "[issues]", })[entry.source.name] return vim_item end, }, - sources = { - { name = "nvim_lsp" }, - { name = "nvim_lua" }, - { name = "luasnip" }, - { name = "buffer" }, - { name = "path" }, - }, - confirm_opts = { - behavior = cmp.ConfirmBehavior.Replace, - select = false, + experimental = { + ghost_text = true, + native_menu = false, }, window = { completion = cmp.config.window.bordered(), documentation = cmp.config.window.bordered(), }, - experimental = { - ghost_text = true, + confirm_opts = { + behavior = cmp.ConfirmBehavior.Replace, + select = false, }, })