From 499e646a811560211090b3f5a4e943cd3782d8b1 Mon Sep 17 00:00:00 2001 From: louie Date: Wed, 22 Jun 2022 22:54:07 -0700 Subject: Added cmp file --- lua/user/cmp.lua | 135 +++++++++++++++++++++++++++++++++++++++++++++++ lua/user/colorscheme.lua | 4 ++ lua/user/options.lua | 3 -- lua/user/plugins.lua | 20 +++++-- 4 files changed, 155 insertions(+), 7 deletions(-) create mode 100644 lua/user/cmp.lua (limited to 'lua/user') diff --git a/lua/user/cmp.lua b/lua/user/cmp.lua new file mode 100644 index 0000000..c36904c --- /dev/null +++ b/lua/user/cmp.lua @@ -0,0 +1,135 @@ +local cmp_status_ok, cmp = pcall(require, "cmp") +if not cmp_status_ok then + return +end + +local snip_status_ok, luasnip = pcall(require, "luasnip") +if not snip_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 + +--[[ +--   פּ ﯟ   some other good icons +local kind_icons = { + Text = "", + Method = "m", + Function = "", + Constructor = "", + Field = "", + Variable = "", + Class = "", + Interface = "", + Module = "", + Property = "", + Unit = "", + Value = "", + Enum = "", + Keyword = "", + Snippet = "", + Color = "", + File = "", + Reference = "", + Folder = "", + EnumMember = "", + Constant = "", + Struct = "", + Event = "", + Operator = "", + TypeParameter = "", +} +-- find more here: https://www.nerdfonts.com/cheat-sheet +]] + +cmp.setup { + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) -- For `luasnip` users. + end, + }, + mapping = { + -- Overwrite built-in completion + --[""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_prev_item(), + --[""] = cmp.mapping.select_next_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.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `` mapping. + [""] = 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", + }), + }, + formatting = { + fields = { "kind", "abbr", "menu" }, + format = function(entry, vim_item) + -- Kind icons + --vim_item.kind = string.format("%s", kind_icons[vim_item.kind]) + -- vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind) -- This concatonates the icons with the name of the item kind + vim_item.menu = ({ + luasnip = "[Snippet]", + buffer = "[Buffer]", + path = "[Path]", + })[entry.source.name] + return vim_item + end, + }, + sources = { + { name = "luasnip" }, + { name = "buffer" }, + { name = "path" }, + }, + confirm_opts = { + behavior = cmp.ConfirmBehavior.Replace, + select = false, + }, + --[[ deprecated + documentation = { + border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, + }, + ]] + experimental = { + ghost_text = false, + native_menu = false, + }, +} diff --git a/lua/user/colorscheme.lua b/lua/user/colorscheme.lua index 94855bc..57df9ae 100644 --- a/lua/user/colorscheme.lua +++ b/lua/user/colorscheme.lua @@ -5,3 +5,7 @@ if not status_ok then vim.notify("colorscheme " .. colorscheme .. " not found!") return end + +-- Set Popup menu colors +--highlight Pmenu ctermbg=White ctermfg=Black guibg=Gray +vim.cmd("highlight Pmenu ctermbg=gray guibg=gray") diff --git a/lua/user/options.lua b/lua/user/options.lua index 6538ab3..0059e8c 100644 --- a/lua/user/options.lua +++ b/lua/user/options.lua @@ -10,9 +10,6 @@ vim.opt.tabstop = 4 --set tab length vim.opt.foldmethod = "indent" --enable fold detection vim.opt.foldlevelstart = 20 --set initial fold --- Color Settings [TODO] ---highlight Pmenu ctermbg=White ctermfg=Black guibg=Gray - -- Additional Settings from Video Series -- :help options -- Autocomplete Settings diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index d90587e..e40dff3 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -7,10 +7,22 @@ end -- Install your plugins here return packer.startup(function(use) -- My plugins here - use "wbthomason/packer.nvim" -- Have packer manage itself - --use "nvim-lua/popup.nvim" -- An implementation of the Popup API from vim in Neovim - --use "nvim-lua/plenary.nvim" -- Useful lua functions used by lots of plugins + use "wbthomason/packer.nvim" -- Have packer manage itself + --use "nvim-lua/popup.nvim" -- An implementation of the Popup API from vim in Neovim + --use "nvim-lua/plenary.nvim" -- Useful lua functions used by lots of plugins -- Colorschemes - --use "lunarvim/colorschemes" -- Additional colorschemes + --use "lunarvim/colorschemes" -- Additional colorschemes + + -- cmp plugins + use "hrsh7th/nvim-cmp" -- The completion plugin + use "hrsh7th/cmp-buffer" -- Buffer completions + use "hrsh7th/cmp-path" -- Path completions + use "hrsh7th/cmp-cmdline" -- Cmdline completions + use "saadparwaiz1/cmp_luasnip" -- snippet completions + + -- snippets + use "L3MON4D3/LuaSnip" --snippet engine + use "rafamadriz/friendly-snippets" --a bunch of snippets to use + end) -- cgit