Merge pull request #382 from kylo252/fix-lspconfig-compat

fix(lspconfig): update the setup workflow

Author: Jose Alvarez

lua/null-ls/init.lua

@@ -28,8 +28,8 @@ M.config = function(user_config)
     end
 
     c.setup(user_config or {})
-    require("null-ls.rpc").setup()
     require("null-ls.lspconfig").setup()
+    require("null-ls.rpc").setup()
     require("null-ls.handlers").setup()
 
     vim.cmd("command! NullLsInfo lua require('null-ls').null_ls_info()")

lua/null-ls/lspconfig.lua

@@ -48,14 +48,15 @@ function M.setup()
         autostart = false,
     }
 
-    require("lspconfig/configs")["null-ls"] = {
+    local configs = require("lspconfig.configs")
+    configs["null-ls"] = {
         default_config = default_config,
     }
 end
 
 -- after registering a new source, try attaching to existing buffers and refresh diagnostics
 function M.on_register_source(source)
-    if not require("lspconfig")["null-ls"] then
+    if not require("lspconfig.configs")["null-ls"] then
         return
     end
 
@@ -78,7 +79,7 @@ end
 
 -- refresh filetypes after modifying registered sources
 function M.on_register_sources()
-    local config = require("lspconfig")["null-ls"]
+    local config = require("lspconfig.configs")["null-ls"]
     if not config then
         return
     end
@@ -87,7 +88,7 @@ function M.on_register_sources()
 end
 
 function M.try_add(bufnr)
-    local config = require("lspconfig")["null-ls"]
+    local config = require("lspconfig.configs")["null-ls"]
     if not config and config.manager then
         return
     end

lua/null-ls/rpc.lua

@@ -53,7 +53,7 @@ M.setup = function()
 
     local rpc_start = rpc.start
     rpc.start = function(cmd, cmd_args, dispatchers, ...)
-        local config = require("lspconfig")["null-ls"]
+        local config = require("lspconfig.configs")["null-ls"]
         if config and cmd == config.cmd[1] then
             return M.start(dispatchers)
         end

test/spec/lspconfig_spec.lua

@@ -21,7 +21,7 @@ describe("lspconfig", function()
 
     describe("setup", function()
         it("should set up default config", function()
-            local null_ls_config = require("lspconfig/configs")["null-ls"]
+            local null_ls_config = require("lspconfig.configs")["null-ls"]
             assert.truthy(null_ls_config)
 
             local default_config = null_ls_config.document_config.default_config
@@ -37,7 +37,7 @@ describe("lspconfig", function()
             it("should return root dir", function()
                 local cwd = vim.fn.getcwd()
 
-                local root_dir = require("lspconfig/configs")["null-ls"].document_config.default_config.root_dir
+                local root_dir = require("lspconfig.configs")["null-ls"].document_config.default_config.root_dir
 
                 assert.equals(root_dir(cwd), cwd)
             end)