refactor(plugins): remove get_border refs

This commit is contained in:
Matt Leong 2021-12-19 19:25:12 -08:00
parent 68ff49da19
commit 13164d42bc
5 changed files with 7 additions and 9 deletions

View file

@ -7,6 +7,7 @@ end
-- these settings will be merged with any settings definined in config.lua -- these settings will be merged with any settings definined in config.lua
local default_config = { local default_config = {
border = 'rounded',
theme = 'tokyonight', theme = 'tokyonight',
lsp = { lsp = {
format_on_save = true, -- true/false or table of filetypes {'.ts', '.js',} format_on_save = true, -- true/false or table of filetypes {'.ts', '.js',}

View file

@ -1,6 +1,5 @@
local icons = require('cosmic.theme.icons') local icons = require('cosmic.theme.icons')
local config = require('cosmic.config') local config = require('cosmic.config')
local cosmic_ui = require('cosmic-ui')
-- set up LSP signs -- set up LSP signs
local signs = { local signs = {
@ -28,7 +27,7 @@ vim.diagnostic.config(vim.tbl_deep_extend('force', {
float = { float = {
header = false, header = false,
source = 'always', source = 'always',
border = cosmic_ui.get_border(), border = config.border,
}, },
virtual_text = { virtual_text = {
spacing = 4, spacing = 4,

View file

@ -1,13 +1,13 @@
local cosmic_ui = require('cosmic-ui') local config = require('cosmic.config')
-- set up lsp servers -- set up lsp servers
require('cosmic.lsp.providers') require('cosmic.lsp.providers')
require('cosmic.lsp.diagnostics') require('cosmic.lsp.diagnostics')
vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(vim.lsp.handlers.hover, { 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, { vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(vim.lsp.handlers.signature_help, {
border = cosmic_ui.get_border(), border = config.border,
}) })

View file

@ -1,9 +1,8 @@
local cosmic_ui = require('cosmic-ui')
local config = require('cosmic.config') local config = require('cosmic.config')
require('lsp_signature').setup(vim.tbl_deep_extend('force', { require('lsp_signature').setup(vim.tbl_deep_extend('force', {
bind = true, -- This is mandatory, otherwise border config won't get registered. bind = true, -- This is mandatory, otherwise border config won't get registered.
handler_opts = { handler_opts = {
border = cosmic_ui.get_border(), border = config.border,
}, },
}, config.lsp_signature or {})) }, config.lsp_signature or {}))

View file

@ -1,5 +1,4 @@
local cmp = require('cmp') local cmp = require('cmp')
local cosmic_ui = require('cosmic-ui')
local utils = require('cosmic-ui.utils') local utils = require('cosmic-ui.utils')
local luasnip = require('luasnip') local luasnip = require('luasnip')
local config = require('cosmic.config') local config = require('cosmic.config')
@ -76,7 +75,7 @@ local default_cmp_opts = {
}), }),
}, },
documentation = { documentation = {
border = cosmic_ui.get_border(), border = config.border,
winhighlight = 'FloatBorder:FloatBorder,Normal:Normal', winhighlight = 'FloatBorder:FloatBorder,Normal:Normal',
}, },
experimental = { experimental = {