refactor: use 0.7 command api methods (#1074)

Author: Jose Alvarez

lua/null-ls/client.lua

@@ -92,13 +92,13 @@ M.start_client = function(fname)
             if bufnr == api.nvim_get_current_buf() then
                 M.setup_buffer(bufnr)
             elseif api.nvim_buf_is_valid(bufnr) then
-                vim.cmd(
-                    string.format(
-                        [[autocmd BufEnter <buffer=%d> ++once unsilent lua require("null-ls.client").setup_buffer(%d)]],
-                        bufnr,
-                        bufnr
-                    )
-                )
+                api.nvim_create_autocmd("BufEnter", {
+                    buffer = bufnr,
+                    once = true,
+                    callback = function()
+                        M.setup_buffer(bufnr)
+                    end,
+                })
             end
         end),
     }
@@ -191,19 +191,24 @@ M.on_source_change = vim.schedule_wrap(function()
                 s.register_conditional_sources()
             end
         else
-            vim.cmd(
-                string.format(
-                    [[autocmd BufEnter <buffer=%d> ++once unsilent lua require("null-ls.client").retry_add(%d)]],
-                    bufnr,
-                    bufnr
-                )
-            )
+            api.nvim_create_autocmd("BufEnter", {
+                buffer = bufnr,
+                once = true,
+                callback = function()
+                    M.retry_add(bufnr)
+                end,
+            })
         end
     end)
 
     -- if conditional sources remain, check on next (named) buffer read event
     if s.has_conditional_sources() then
-        vim.cmd([[autocmd BufRead * ++once unsilent lua require("null-ls.state").register_conditional_sources()]])
+        api.nvim_create_autocmd("BufRead", {
+            once = true,
+            callback = function()
+                s.register_conditional_sources()
+            end,
+        })
     end
 end)
 

lua/null-ls/info.lua

@@ -179,11 +179,22 @@ M.show_window = function()
         vim.fn.matchadd(hi[1], hi[2])
     end
 
-    api.nvim_buf_set_keymap(win_bufnr, "n", "<Esc>", "<cmd>bd<CR>", { noremap = true })
+    local close = function()
+        if api.nvim_buf_is_valid(win_bufnr) then
+            api.nvim_buf_delete(win_bufnr, { force = true })
+        end
+        if api.nvim_win_is_valid(win_id) then
+            api.nvim_win_close(win_id, true)
+        end
+    end
 
-    vim.cmd(
-        string.format("autocmd BufHidden,BufLeave <buffer> ++once lua pcall(vim.api.nvim_win_close, %d, true)", win_id)
-    )
+    vim.keymap.set("n", "<ESC>", close, { buffer = win_bufnr, nowait = true })
+    vim.keymap.set("n", "q", close, { buffer = win_bufnr, nowait = true })
+    api.nvim_create_autocmd({ "BufHidden", "BufLeave", "BufDelete" }, {
+        buffer = win_bufnr,
+        once = true,
+        callback = close,
+    })
 end
 
 return M

lua/null-ls/init.lua

@@ -17,7 +17,6 @@ M.toggle = sources.toggle
 
 M.builtins = require("null-ls.builtins")
 M.methods = require("null-ls.methods").internal
-M.null_ls_info = require("null-ls.info").show_window
 
 M.formatter = helpers.formatter_factory
 M.generator = helpers.generator_factory
@@ -30,16 +29,26 @@ M.setup = function(user_config)
     user_config = user_config or {}
     c.setup(user_config)
 
-    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())")
-
-    vim.cmd([[
-      augroup NullLs
-        autocmd!
-        autocmd FileType * unsilent lua require("null-ls.client").try_add()
-        autocmd InsertLeave * unsilent lua require("null-ls.rpc").flush()
-      augroup end
-    ]])
+    vim.api.nvim_create_user_command("NullLsInfo", function()
+        require("null-ls.info").show_window()
+    end, {})
+    vim.api.nvim_create_user_command("NullLsLog", function()
+        vim.cmd(string.format("edit %s", require("null-ls.logger"):get_path()))
+    end, {})
+
+    local augroup = vim.api.nvim_create_augroup("NullLs", {})
+    vim.api.nvim_create_autocmd("FileType", {
+        group = augroup,
+        callback = function()
+            require("null-ls.client").try_add()
+        end,
+    })
+    vim.api.nvim_create_autocmd("InsertLeave", {
+        group = augroup,
+        callback = function()
+            require("null-ls.rpc").flush()
+        end,
+    })
 end
 
 return M

test/spec/e2e_spec.lua

@@ -309,31 +309,19 @@ describe("e2e", function()
             return
         end
 
+        local autocmd
         before_each(function()
-            api.nvim_exec(
-                [[
-            augroup NullLsTesting
-                autocmd!
-                autocmd BufEnter *.tl set filetype=teal
-            augroup END
-            ]],
-                false
-            )
+            autocmd = vim.api.nvim_create_autocmd("BufEnter", {
+                pattern = "*.tl",
+                command = "set filetype=teal",
+            })
             sources.register(builtins.diagnostics.teal)
 
             tu.edit_test_file("test-file.tl")
             tu.wait_for_real_source()
         end)
         after_each(function()
-            api.nvim_exec(
-                [[
-            augroup NullLsTesting
-                autocmd!
-            augroup END
-            ]],
-                false
-            )
-            vim.cmd("augroup! NullLsTesting")
+            vim.api.nvim_del_autocmd(autocmd)
         end)
 
         it("should handle source that uses temp file", function()

test/spec/helpers/generator_factory_spec.lua

@@ -298,7 +298,7 @@ describe("generator_factory", function()
         end)
 
         it("should trigger deregistration if validation fails", function()
-            vim.validate = function()
+            vim.validate = function(_)
                 error("validation failed")
             end
 

test/spec/init_spec.lua

@@ -11,7 +11,6 @@ describe("init", function()
         assert.equals(type(null_ls.register_name), "function")
         assert.equals(type(null_ls.methods), "table")
         assert.equals(type(null_ls.builtins), "table")
-        assert.equals(type(null_ls.null_ls_info), "function")
         assert.equals(type(null_ls.generator), "function")
         assert.equals(type(null_ls.formatter), "function")
     end)