wires/nvim
1
0
Fork 0
Code Pull requests Projects Releases Packages Wiki Activity Actions

fix(lsp): pass full config to null_ls

Browse source
This commit is contained in:
Matt Leong 2021-12-03 13:45:33 -08:00
parent 333a4e1aa1
commit 323139461e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lua/cosmic/lsp/providers/null_ls.lua
View file

@ -1,7 +1,8 @@
local config = require('cosmic.config') local config = require('cosmic.config')
local on_attach = require('cosmic.lsp.providers.defaults').on_attach local defaults = require('cosmic.lsp.providers.defaults')
local null_ls = require('null-ls') local null_ls = require('null-ls')
local config_opts = config.lsp.servers.null_ls or {}
null_ls.config(vim.tbl_deep_extend('force', { null_ls.config(vim.tbl_deep_extend('force', {
-- you must define at least one source for the plugin to work -- you must define at least one source for the plugin to work
sources = { sources = {
@ -19,8 +20,6 @@ null_ls.config(vim.tbl_deep_extend('force', {
}), }),
null_ls.builtins.code_actions.gitsigns, null_ls.builtins.code_actions.gitsigns,
}, },
}, config.lsp.servers.null_ls or {})) }, config_opts or {}))
require('lspconfig')['null-ls'].setup({ require('lspconfig')['null-ls'].setup(vim.tbl_deep_extend('force', defaults, config_opts.opts or {}))
on_attach = on_attach,
})

1
lua/cosmic/modules/session/init.lua
View file

@ -1,6 +1,7 @@
local config = require('cosmic.config') local config = require('cosmic.config')
local defaults = { local defaults = {
pre_save_cmds = { 'NvimTreeClose', 'cclose', 'lua vim.notify.dismiss()' }, pre_save_cmds = { 'NvimTreeClose', 'cclose', 'lua vim.notify.dismiss()' },
post_restore_cmds = { 'NvimTreeRefresh' },
auto_session_enabled = false, auto_session_enabled = false,
auto_save_enabled = true, auto_save_enabled = true,
auto_restore_enabled = false, auto_restore_enabled = false,