From 13164d42bc373a3a066e46660cd8fe1d37530296 Mon Sep 17 00:00:00 2001 From: Matt Leong Date: Sun, 19 Dec 2021 19:25:12 -0800 Subject: [PATCH] refactor(plugins): remove get_border refs --- lua/cosmic/config/init.lua | 1 + lua/cosmic/lsp/diagnostics.lua | 3 +-- lua/cosmic/lsp/init.lua | 6 +++--- lua/cosmic/plugins/lsp-signature/init.lua | 3 +-- lua/cosmic/plugins/nvim-cmp/init.lua | 3 +-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lua/cosmic/config/init.lua b/lua/cosmic/config/init.lua index 52363a7..07e18ed 100644 --- a/lua/cosmic/config/init.lua +++ b/lua/cosmic/config/init.lua @@ -7,6 +7,7 @@ end -- these settings will be merged with any settings definined in config.lua local default_config = { + border = 'rounded', theme = 'tokyonight', lsp = { format_on_save = true, -- true/false or table of filetypes {'.ts', '.js',} diff --git a/lua/cosmic/lsp/diagnostics.lua b/lua/cosmic/lsp/diagnostics.lua index 293cac4..8cf2cea 100644 --- a/lua/cosmic/lsp/diagnostics.lua +++ b/lua/cosmic/lsp/diagnostics.lua @@ -1,6 +1,5 @@ local icons = require('cosmic.theme.icons') local config = require('cosmic.config') -local cosmic_ui = require('cosmic-ui') -- set up LSP signs local signs = { @@ -28,7 +27,7 @@ vim.diagnostic.config(vim.tbl_deep_extend('force', { float = { header = false, source = 'always', - border = cosmic_ui.get_border(), + border = config.border, }, virtual_text = { spacing = 4, diff --git a/lua/cosmic/lsp/init.lua b/lua/cosmic/lsp/init.lua index 5959ef7..fcc0b07 100644 --- a/lua/cosmic/lsp/init.lua +++ b/lua/cosmic/lsp/init.lua @@ -1,13 +1,13 @@ -local cosmic_ui = require('cosmic-ui') +local config = require('cosmic.config') -- set up lsp servers require('cosmic.lsp.providers') require('cosmic.lsp.diagnostics') vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(vim.lsp.handlers.hover, { - border = cosmic_ui.get_border(), + border = config.border, }) vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(vim.lsp.handlers.signature_help, { - border = cosmic_ui.get_border(), + border = config.border, }) diff --git a/lua/cosmic/plugins/lsp-signature/init.lua b/lua/cosmic/plugins/lsp-signature/init.lua index 0d8d39a..619c284 100644 --- a/lua/cosmic/plugins/lsp-signature/init.lua +++ b/lua/cosmic/plugins/lsp-signature/init.lua @@ -1,9 +1,8 @@ -local cosmic_ui = require('cosmic-ui') local config = require('cosmic.config') require('lsp_signature').setup(vim.tbl_deep_extend('force', { bind = true, -- This is mandatory, otherwise border config won't get registered. handler_opts = { - border = cosmic_ui.get_border(), + border = config.border, }, }, config.lsp_signature or {})) diff --git a/lua/cosmic/plugins/nvim-cmp/init.lua b/lua/cosmic/plugins/nvim-cmp/init.lua index f56690b..f807b4d 100644 --- a/lua/cosmic/plugins/nvim-cmp/init.lua +++ b/lua/cosmic/plugins/nvim-cmp/init.lua @@ -1,5 +1,4 @@ local cmp = require('cmp') -local cosmic_ui = require('cosmic-ui') local utils = require('cosmic-ui.utils') local luasnip = require('luasnip') local config = require('cosmic.config') @@ -76,7 +75,7 @@ local default_cmp_opts = { }), }, documentation = { - border = cosmic_ui.get_border(), + border = config.border, winhighlight = 'FloatBorder:FloatBorder,Normal:Normal', }, experimental = {