From 655fd1b0ca5405ce67f3f8083ef6a4f7d2dedea0 Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Thu, 23 Dec 2021 13:03:20 +0330 Subject: refactor: uplift neovim's minimum version requirement to 0.6.0 (#2093) Co-authored-by: kylo252 <59826753+kylo252@users.noreply.github.com> --- lua/lvim/lsp/null-ls/init.lua | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'lua/lvim/lsp/null-ls') 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 -- cgit v1.2.3