diff options
| author | kylo252 <[email protected]> | 2022-01-03 15:49:07 +0100 |
|---|---|---|
| committer | kylo252 <[email protected]> | 2022-01-03 15:49:07 +0100 |
| commit | e5aa8be8ce54097e4a34220cb2aad114e70f209b (patch) | |
| tree | 15e0a3017358b15a0656b6d1f98d2638ae572095 /lua/lvim/lsp/null-ls/init.lua | |
| parent | 427ad868d404a254dcbc7d3950946dae0cf205de (diff) | |
| parent | 21b41688ee8c5056ffbb2b07df141ce1ccb4b213 (diff) | |
Merge branch 'rolling'
Diffstat (limited to 'lua/lvim/lsp/null-ls/init.lua')
| -rw-r--r-- | lua/lvim/lsp/null-ls/init.lua | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lua/lvim/lsp/null-ls/init.lua b/lua/lvim/lsp/null-ls/init.lua index f5e820e8..68e20c98 100644 --- a/lua/lvim/lsp/null-ls/init.lua +++ b/lua/lvim/lsp/null-ls/init.lua @@ -9,14 +9,8 @@ function M:setup() return end - null_ls.config(lvim.lsp.null_ls.config) local default_opts = require("lvim.lsp").get_common_opts() - - if vim.tbl_isempty(lvim.lsp.null_ls.setup or {}) then - lvim.lsp.null_ls.setup = default_opts - end - - require("lspconfig")["null-ls"].setup(lvim.lsp.null_ls.setup) + null_ls.setup(vim.tbl_deep_extend("force", default_opts, lvim.lsp.null_ls.setup)) end return M |