From cfac67c5b5bce7f577d4d1274529f08b8911c431 Mon Sep 17 00:00:00 2001 From: Matthew Leong Date: Thu, 20 Oct 2022 08:02:47 -0700 Subject: [PATCH] feat: add border to autocomplete --- lua/cosmic/plugins/nvim-cmp/init.lua | 36 +++++++++++++++----------- lua/cosmic/plugins/treesitter/init.lua | 1 + 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/lua/cosmic/plugins/nvim-cmp/init.lua b/lua/cosmic/plugins/nvim-cmp/init.lua index 57b90ab..3ab6192 100644 --- a/lua/cosmic/plugins/nvim-cmp/init.lua +++ b/lua/cosmic/plugins/nvim-cmp/init.lua @@ -66,6 +66,10 @@ local default_cmp_opts = { }), }), window = { + completion = { + border = user_config.border, + winhighlight = 'FloatBorder:FloatBorder,Normal:Normal', + }, documentation = { border = user_config.border, winhighlight = 'FloatBorder:FloatBorder,Normal:Normal', @@ -99,13 +103,6 @@ local default_cmp_opts = { cmp.setup(u.merge(default_cmp_opts, user_config.nvim_cmp or {})) -cmp.setup.cmdline('/', { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = 'buffer' }, - }, -}) - -- Set configuration for specific filetype. cmp.setup.filetype('gitcommit', { sources = cmp.config.sources({ @@ -119,11 +116,20 @@ cmp.setup.filetype('TelescopePrompt', { enabled = false, }) --- cmp.setup.cmdline(':', { --- mapping = cmp.mapping.preset.cmdline(), --- sources = cmp.config.sources({ --- { name = 'path' }, --- }, { --- { name = 'cmdline' }, --- }), --- }) +-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore). +cmp.setup.cmdline({ '/', '?' }, { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = 'buffer' }, + }, +}) + +-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). +cmp.setup.cmdline(':', { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = 'path' }, + }, { + { name = 'cmdline' }, + }), +}) diff --git a/lua/cosmic/plugins/treesitter/init.lua b/lua/cosmic/plugins/treesitter/init.lua index 2b1b34d..cca0612 100644 --- a/lua/cosmic/plugins/treesitter/init.lua +++ b/lua/cosmic/plugins/treesitter/init.lua @@ -3,6 +3,7 @@ local u = require('cosmic.utils') local defaults = { ensure_installed = { + 'astro', 'css', 'html', 'javascript',