refactor!: remove lspconfig integration

Author: Jose Alvarez

.nvim.settings.json

@@ -1,3 +1,3 @@
 {
-  "lua-dev": { "library": { "plugins": ["plenary.nvim", "nvim-lspconfig"] } }
+  "lua-dev": { "library": { "plugins": ["plenary.nvim"] } }
 }

lua/null-ls/client.lua

@@ -0,0 +1,94 @@
+local c = require("null-ls.config")
+local methods = require("null-ls.methods")
+local sources = require("null-ls.sources")
+local u = require("null-ls.utils")
+
+local api = vim.api
+local client
+
+local should_attach = function(bufnr)
+    local all_sources = sources.get_all()
+    -- don't attach if no sources have been registered
+    if vim.tbl_isempty(all_sources) then
+        return false
+    end
+
+    -- be paranoid and try to make sure that the buffer represents an actual file
+    if api.nvim_buf_get_option(bufnr, "buftype") ~= "" or api.nvim_buf_get_name(bufnr) == "" then
+        return false
+    end
+
+    local ft = api.nvim_buf_get_option(bufnr, "filetype")
+    for _, source in ipairs(all_sources) do
+        if sources.is_available(source, ft) then
+            return true
+        end
+    end
+
+    return false
+end
+
+local on_init = function(new_client)
+    new_client.supports_method = function(method)
+        local internal_method = methods.map[method]
+        if internal_method then
+            return require("null-ls.generators").can_run(vim.bo.filetype, internal_method)
+        end
+
+        return methods.lsp[method] ~= nil
+    end
+
+    client = new_client
+end
+
+local on_exit = function()
+    client = nil
+end
+
+local start_client = function(fname)
+    return vim.lsp.start_client({
+        name = "null-ls",
+        root_dir = u.root_pattern(".null-ls-root", "Makefile", ".git")(fname) or vim.loop.cwd(),
+        on_init = on_init,
+        on_exit = on_exit,
+        cmd = c.get().cmd,
+        flags = { debounce_text_changes = c.get().debounce },
+        on_attach = c.get().on_attach,
+    })
+end
+
+local M = {}
+
+M.start_client = start_client
+
+M.try_add = function(bufnr)
+    bufnr = bufnr or api.nvim_get_current_buf()
+    if not should_attach(bufnr) then
+        return
+    end
+
+    local id = client and client.id or start_client(api.nvim_buf_get_name(bufnr))
+    vim.lsp.buf_attach_client(bufnr, id)
+end
+
+M.get_client = function()
+    return client
+end
+
+M.notify_client = function(method, params)
+    if not client then
+        return
+    end
+
+    client.notify(method, params)
+end
+
+M.resolve_handler = function(method)
+    return client and client.handlers[method] or vim.lsp.handlers[method]
+end
+
+M._reset = function()
+    client = nil
+end
+
+return M

lua/null-ls/config.lua

@@ -1,6 +1,7 @@
 local validate = vim.validate
 
 local defaults = {
+    cmd = { "nvim" },
     diagnostics_format = "#{m}",
     debounce = 250,
     default_timeout = 5000,

lua/null-ls/formatting.lua

@@ -50,7 +50,7 @@ M.apply_edits = function(edits, params)
     local bufnr = params.bufnr
     -- directly use lsp handler, since formatting_sync uses a custom handler that won't work if called twice
     -- formatting and rangeFormatting handlers are identical
-    local handler = u.resolve_handler(params.lsp_method)
+    local handler = require("null-ls.client").resolve_handler(params.lsp_method)
 
     log:debug("received edits from generators")
     log:trace(edits)

lua/null-ls/handlers.lua

@@ -1,7 +1,7 @@
-local u = require("null-ls.utils")
 local c = require("null-ls.config")
-local s = require("null-ls.state")
 local log = require("null-ls.logger")
+local s = require("null-ls.state")
+local u = require("null-ls.utils")
 
 local api = vim.api
 local validate = vim.validate
@@ -253,7 +253,7 @@ M.generator_factory = function(opts)
                 return done()
             end
 
-            local client = u.get_client()
+            local client = require("null-ls.client").get_client()
             local root = client and client.config.root_dir or vim.loop.cwd()
             params.root = root
 
@@ -432,8 +432,6 @@ M.make_builtin = function(opts)
 
         if prefer_local or only_local then
             builtin_copy._opts.dynamic_command = function(params)
-                local lsputil = require("lspconfig.util")
-
                 local resolved = s.get_resolved_command(params.bufnr, params.command)
                 -- a string means command was resolved on last run
                 -- false means the command already failed to resolve, so don't bother checking again
@@ -443,15 +441,15 @@ M.make_builtin = function(opts)
 
                 local maybe_prefix = prefer_local or only_local
                 local prefix = type(maybe_prefix) == "string" and maybe_prefix
-                local executable_to_find = prefix and lsputil.path.join(prefix, params.command) or params.command
+                local executable_to_find = prefix and u.path.join(prefix, params.command) or params.command
                 log:debug("attempting to find local executable " .. executable_to_find)
 
-                local client = u.get_client()
+                local client = require("null-ls.client").get_client()
                 local root = client and client.root_dir or vim.fn.getcwd()
 
                 local found, resolved_cwd
-                lsputil.path.traverse_parents(params.bufname, function(dir)
-                    found = lsputil.path.join(dir, executable_to_find)
+                u.path.traverse_parents(params.bufname, function(dir)
+                    found = u.path.join(dir, executable_to_find)
                     if u.is_executable(found) then
                         resolved_cwd = dir
                         return true

lua/null-ls/helpers.lua

@@ -1,11 +1,51 @@
-local methods = require("null-ls.methods")
-local u = require("null-ls.utils")
 local c = require("null-ls.config")
 local log = require("null-ls.logger")
+local methods = require("null-ls.methods")
 
 local lsp = vim.lsp
 local api = vim.api
 
+-- adapted from nvim-lspconfig's :LspInfo window
+local make_window = function(height_percentage, width_percentage)
+    local row_start_percentage = (1 - height_percentage) / 2
+    local col_start_percentage = (1 - width_percentage) / 2
+
+    local row = math.ceil(vim.o.lines * row_start_percentage)
+    local col = math.ceil(vim.o.columns * col_start_percentage)
+    local width = math.floor(vim.o.columns * width_percentage)
+    local height = math.ceil(vim.o.lines * height_percentage)
+
+    local opts = {
+        relative = "editor",
+        row = row,
+        col = col,
+        width = width,
+        height = height,
+        style = "minimal",
+        border = {
+            { " ", "NormalFloat" },
+            { " ", "NormalFloat" },
+            { " ", "NormalFloat" },
+            { " ", "NormalFloat" },
+            { " ", "NormalFloat" },
+            { " ", "NormalFloat" },
+            { " ", "NormalFloat" },
+            { " ", "NormalFloat" },
+        },
+    }
+
+    local bufnr = api.nvim_create_buf(false, true)
+    local win_id = api.nvim_open_win(bufnr, true, opts)
+    api.nvim_win_set_buf(win_id, bufnr)
+
+    vim.cmd("setlocal nocursorcolumn ts=2 sw=2")
+
+    return {
+        bufnr = bufnr,
+        win_id = win_id,
+    }
+end
+
 local M = {}
 
 M.get_active_sources = function(bufnr, ft)
@@ -23,9 +63,7 @@ M.get_active_sources = function(bufnr, ft)
 end
 
 M.show_window = function()
-    local windows = require("lspconfig.ui.windows")
-
-    local client = u.get_client()
+    local client = require("null-ls.client").get_client()
     local bufnr = api.nvim_get_current_buf()
     if not client or not lsp.buf_is_attached(bufnr, client.id) then
         log:warn("failed to get info: buffer is not attached")
@@ -52,7 +90,7 @@ M.show_window = function()
         table.insert(lines, methods.readable[method] .. ": " .. table.concat(sources, ", "))
     end
 
-    local win_info = windows.percentage_range_window(0.8, 0.7)
+    local win_info = make_window(0.8, 0.7)
     local win_bufnr, win_id = win_info.bufnr, win_info.win_id
 
     api.nvim_buf_set_lines(win_bufnr, 0, -1, true, lines)

lua/null-ls/info.lua

@@ -28,7 +28,6 @@ M.config = function(user_config)
     end
 
     c.setup(user_config or {})
-    require("null-ls.lspconfig").setup()
     require("null-ls.rpc").setup()
 
     vim.cmd("command! NullLsInfo lua require('null-ls').null_ls_info()")
@@ -37,7 +36,7 @@ M.config = function(user_config)
     vim.cmd([[
       augroup NullLs
         autocmd!
-        autocmd FileType * lua require("null-ls.lspconfig").try_add()
+        autocmd FileType * lua require("null-ls.client").try_add()
         autocmd InsertLeave * unsilent lua require("null-ls.rpc").flush()
       augroup end
     ]])

lua/null-ls/init.lua

@@ -1,4 +1,6 @@
 local c = require("null-ls.config")
+local u = require("null-ls.utils")
+
 local log = {}
 
 --- Adds a log entry using Plenary.log
@@ -31,7 +33,7 @@ end
 ---Retrieves the path of the logfile
 ---@return string path of the logfile
 function log:get_path()
-    return string.format("%s/%s.log", vim.fn.stdpath("cache"), "null-ls")
+    return u.path.join(vim.fn.stdpath("cache"), "null-ls.log")
 end
 
 ---Add a log entry at TRACE level

lua/null-ls/logger.lua

@@ -1,4 +1,5 @@
 local log = require("null-ls.logger")
+local u = require("null-ls.utils")
 
 local uv = vim.loop
 local wrap = vim.schedule_wrap
@@ -151,13 +152,12 @@ M.timer = function(timeout, interval, should_start, callback)
 end
 
 M.temp_file = function(content, extension)
-    local lsputil = require("lspconfig.util")
-    local tmp_dir = lsputil.path.sep == "\\" and vim.fn.getenv("TEMP") or "/tmp"
+    local tmp_dir = u.path.is_windows and vim.fn.getenv("TEMP") or "/tmp"
 
     local fd, tmp_path
     if uv.fs_mkstemp then
         -- prefer fs_mkstemp, since we can modify the directory
-        fd, tmp_path = uv.fs_mkstemp(lsputil.path.join(tmp_dir, "null-ls_XXXXXX"))
+        fd, tmp_path = uv.fs_mkstemp(u.path.join(tmp_dir, "null-ls_XXXXXX"))
     else
         -- fall back to os.tmpname, which is Unix-only
         tmp_path = os.tmpname()