refactor!: remove 0.5.1 support

Author: Jose Alvarez

README.md

@@ -24,7 +24,7 @@ for external processes.
 null-ls is in **beta status**. Please see below for steps to follow if something
 doesn't work the way you expect (or doesn't work at all).
 
-At the moment, null-is is compatible with Neovim 0.5.1 (stable) and 0.6 (head),
+At the moment, null-is is compatible with Neovim 0.6.0 (stable) and 0.7 (head),
 but some features and performance improvements are exclusive to the latest
 version.
 

doc/BUILTINS.md

@@ -1374,6 +1374,7 @@ local sources = { null_ls.builtins.formatting.uncrustify }
 ##### About
 
 Formatter for `python` files
+
 - Supports both `textDocument/formatting` and `textDocument/rangeFormatting`.
   - `textDocument/rangeFormatting` is line-based.
 
@@ -1973,11 +1974,9 @@ local sources = { null_ls.builtins.diagnostics.yamllint }
 
 ### Diagnostics on save
 
-**NOTE**: These sources depend on Neovim version 0.6.0 and are not compatible
-with previous versions.
-
-These sources run **only** on save, meaning that the diagnostics you see will
-not reflect changes to the buffer until you write the changes to the disk.
+**NOTE**: These sources run **only** on save, meaning that the diagnostics you
+see will not reflect changes to the buffer until you write the changes to the
+disk.
 
 You can configure built-in diagnostic sources to run on save by overriding
 `method`:

doc/SOURCES.md

@@ -122,9 +122,6 @@ Disables all sources matching `query`, preventing them from running under any
 conditions. See `get_source(query)` above for information about the structure of
 `query`.
 
-On Neovim versions >= 0.6.0, this will also clear diagnostics from disabled
-sources (you'll have to make a change to trigger an update on lower versions).
-
 ## enable(query)
 
 Enables all disabled sources matching `query`, allowing them to run again as

lua/null-ls/config.lua

@@ -19,8 +19,6 @@ local defaults = {
     },
     -- prevent double setup
     _setup = false,
-    -- force using LSP handler, even when native API is available (e.g diagnostics)
-    _use_lsp_handler = false,
 }
 
 local config = vim.deepcopy(defaults)

lua/null-ls/diagnostics.lua

@@ -6,22 +6,13 @@ local log = require("null-ls.logger")
 
 local api = vim.api
 
-local should_use_diagnostic_api = function()
-    return vim.diagnostic and not c.get()._use_lsp_handler
-end
-
 local namespaces = {}
 
 local M = {}
 
 M.namespaces = namespaces
 
 M.hide_source_diagnostics = function(id)
-    if not vim.diagnostic then
-        log:debug("unable to clear diagnostics (not available on nvim < 0.6.0)")
-        return
-    end
-
     local ns = namespaces[id]
     if not ns then
         return
@@ -48,14 +39,10 @@ end
 local postprocess = function(diagnostic, _, generator)
     local range = convert_range(diagnostic)
     -- the diagnostic API requires 0-indexing, so we can repurpose the LSP range
-    if should_use_diagnostic_api() then
-        diagnostic.lnum = range["start"].line
-        diagnostic.end_lnum = range["end"].line
-        diagnostic.col = range["start"].character
-        diagnostic.end_col = range["end"].character
-    else
-        diagnostic.range = range
-    end
+    diagnostic.lnum = range["start"].line
+    diagnostic.end_lnum = range["end"].line
+    diagnostic.col = range["start"].character
+    diagnostic.end_col = range["end"].character
 
     diagnostic.source = diagnostic.source or generator.opts.name or generator.opts.command or "null-ls"
 
@@ -71,21 +58,11 @@ local postprocess = function(diagnostic, _, generator)
     diagnostic.message = formatted
 end
 
-local handle_diagnostics = function(diagnostics, uri, bufnr, client_id)
-    if should_use_diagnostic_api() then
-        for id, by_id in pairs(diagnostics) do
-            namespaces[id] = namespaces[id] or api.nvim_create_namespace("NULL_LS_SOURCE_" .. id)
-            vim.diagnostic.set(namespaces[id], bufnr, by_id)
-        end
-        return
+local handle_diagnostics = function(diagnostics, bufnr)
+    for id, by_id in pairs(diagnostics) do
+        namespaces[id] = namespaces[id] or api.nvim_create_namespace("NULL_LS_SOURCE_" .. id)
+        vim.diagnostic.set(namespaces[id], bufnr, by_id)
     end
-
-    local handler = u.resolve_handler(methods.lsp.PUBLISH_DIAGNOSTICS)
-    handler(nil, { diagnostics = diagnostics, uri = uri }, {
-        method = methods.lsp.PUBLISH_DIAGNOSTICS,
-        client_id = client_id,
-        bufnr = bufnr,
-    })
 end
 
 -- track last changedtick to only send most recent diagnostics
@@ -135,7 +112,7 @@ M.handler = function(original_params)
         method = methods.map[method],
         params = params,
         postprocess = postprocess,
-        index_by_id = should_use_diagnostic_api(),
+        index_by_id = true,
         callback = function(diagnostics)
             log:trace("received diagnostics from generators")
             log:trace(diagnostics)
@@ -145,7 +122,7 @@ M.handler = function(original_params)
                 return
             end
 
-            handle_diagnostics(diagnostics, uri, bufnr, original_params.client_id)
+            handle_diagnostics(diagnostics, bufnr)
         end,
     })
 end

lua/null-ls/handlers.lua

@@ -1,39 +1,7 @@
-local u = require("null-ls.utils")
 local methods = require("null-ls.methods")
 
 local M = {}
 
-function M.setup()
-    -- code action batching is merged into master
-    if u.has_version("0.6.0") then
-        return
-    end
-
-    M.code_action_handler = M.combine(methods.lsp.CODE_ACTION)
-end
-
--- this will override a handler, batch results and debounce them
-function M.combine(method, ms)
-    ms = ms or 100
-
-    local orig = u.resolve_handler(method)
-    local all_results = {}
-
-    local handler = u.debounce(ms, function()
-        if #all_results > 0 then
-            pcall(orig, nil, all_results)
-            all_results = {}
-        end
-    end)
-
-    vim.lsp.handlers[method] = function(_, results)
-        vim.list_extend(all_results, results or {})
-        handler()
-    end
-
-    return vim.lsp.handlers[method]
-end
-
 M.setup_client = function(client)
     if client._null_ls_setup then
         return

lua/null-ls/init.lua

@@ -30,7 +30,6 @@ M.config = function(user_config)
     c.setup(user_config or {})
     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()")
     vim.cmd("command! NullLsLog lua vim.fn.execute('edit ' .. require('null-ls.logger').get_path())")

lua/null-ls/lspconfig.lua

@@ -18,12 +18,6 @@ local should_attach = function(bufnr)
     end
 
     local ft = api.nvim_buf_get_option(bufnr, "filetype")
-    -- writing and immediately deleting a buffer (e.g. :wq from a git commit)
-    -- triggers a bug on 0.5.1 which is fixed on master
-    if ft == "gitcommit" and not u.has_version("0.6.0") then
-        return false
-    end
-
     for _, source in ipairs(all_sources) do
         if sources.is_available(source, ft) then
             return true

lua/null-ls/rpc.lua

@@ -42,7 +42,7 @@ local capabilities = {
     textDocumentSync = {
         change = 1, -- prompt LSP client to send full document text on didOpen and didChange
         openClose = true,
-        save = u.has_version("0.6.0"),
+        save = true,
     },
 }
 

lua/null-ls/sources.lua

@@ -1,6 +1,5 @@
 local methods = require("null-ls.methods")
 local diagnostics = require("null-ls.diagnostics")
-local u = require("null-ls.utils")
 
 local validate = vim.validate
 
@@ -197,11 +196,6 @@ M.validate_and_transform = function(source)
         method_map[method] = true
     end
 
-    if method_map[methods.internal.DIAGNOSTICS_ON_SAVE] and not u.has_version("0.6.0") then
-        u.echo("WarningMsg", string.format("source %s is not supported on nvim versions < 0.6.0", name))
-        return
-    end
-
     return {
         name = name,
         generator = generator,

lua/null-ls/utils.lua

@@ -15,20 +15,18 @@ local get_line_ending = function(bufnr)
 end
 
 local resolve_content = function(params, bufnr)
-    if M.has_version("0.6.0") or get_line_ending(bufnr) == format_line_ending["unix"] then
-        -- diagnostic notifications will send full buffer content on open and change
-        -- so we can avoid unnecessary api calls
-        if params.method == methods.lsp.DID_OPEN and params.textDocument and params.textDocument.text then
-            return M.split_at_newline(params.bufnr, params.textDocument.text)
-        end
-        if
-            params.method == methods.lsp.DID_CHANGE
-            and params.contentChanges
-            and params.contentChanges[1]
-            and params.contentChanges[1].text
-        then
-            return M.split_at_newline(params.bufnr, params.contentChanges[1].text)
-        end
+    -- diagnostic notifications will send full buffer content on open and change
+    -- so we can avoid unnecessary api calls
+    if params.method == methods.lsp.DID_OPEN and params.textDocument and params.textDocument.text then
+        return M.split_at_newline(params.bufnr, params.textDocument.text)
+    end
+    if
+        params.method == methods.lsp.DID_CHANGE
+        and params.contentChanges
+        and params.contentChanges[1]
+        and params.contentChanges[1].text
+    then
+        return M.split_at_newline(params.bufnr, params.contentChanges[1].text)
     end
 
     return M.buf.content(bufnr)
@@ -227,33 +225,4 @@ M.table = {
     end,
 }
 
--- TODO: remove on 0.6.0 release
-function M.debounce(ms, fn)
-    local timer = vim.loop.new_timer()
-    return function(...)
-        local argv = { ... }
-        timer:start(ms, 0, function()
-            timer:stop()
-            vim.schedule_wrap(fn)(unpack(argv))
-        end)
-    end
-end
-
-function M.throttle(ms, fn)
-    local timer = vim.loop.new_timer()
-    local running = false
-    return function(...)
-        if not running then
-            local argv = { ... }
-            local argc = select("#", ...)
-
-            timer:start(ms, 0, function()
-                running = false
-                pcall(vim.schedule_wrap(fn), unpack(argv, 1, argc))
-            end)
-            running = true
-        end
-    end
-end
-
 return M