feat(nvim): 0.11 configuration updates

Author: caarlos0

modules/neovim/config/after/ftplugin/fugitive.lua

@@ -8,10 +8,11 @@ local opts = {
 
 -- Runs a git command async.
 --
----@param args table: git command arguments.
+---@param args string[]: git command arguments.
 ---@param success_msg string: notification message when the command succeeds.
 ---@param error_msg string: notification message when the command fails.
 local function async_git(args, success_msg, error_msg)
+  ---@diagnostic disable-next-line: missing-fields
   Job:new({
     command = "git",
     args = args,

modules/neovim/config/after/ftplugin/go.lua

@@ -17,7 +17,7 @@ local keymap = function(lhs, rhs)
 end
 
 -- get the gopls server from the given buffer, or nil.
----@param bufnr integer
+---@param bufnr number
 ---@return vim.lsp.Client
 local get_gopls = function(bufnr)
   local clients = vim.lsp.get_clients({ bufnr = bufnr })

modules/neovim/config/lua/lsp_autocommands.lua

@@ -4,7 +4,9 @@ local group = vim.api.nvim_create_augroup("LSP", { clear = true })
 -- Format code and organize imports (if supported) (async).
 --
 ---@async
----@type lsp.Apply
+---@param client vim.lsp.Client
+---@param bufnr number
+---@type fun(client: vim.lsp.Client, bufnr: number)
 local organize_imports = function(client, bufnr)
   ---@type lsp.Handler
   ---@diagnostic disable-next-line: unused-local
@@ -18,7 +20,7 @@ local organize_imports = function(client, bufnr)
         local enc = client.offset_encoding or "utf-16"
         vim.lsp.util.apply_workspace_edit(r.edit, enc)
       elseif r.command and r.command.command then
-        vim.lsp.buf.execute_command(r.command)
+        client:exec_cmd(r.command, { bufnr = bufnr })
       end
     end
     vim.cmd([[noautocmd write]])
@@ -27,7 +29,7 @@ local organize_imports = function(client, bufnr)
   local win = vim.api.nvim_get_current_win()
   local params = vim.lsp.util.make_range_params(win, client.offset_encoding or "utf-16")
   params.context = { only = { "source.organizeImports" } }
-  client.request(ms.textDocument_codeAction, params, handler, bufnr)
+  client:request(ms.textDocument_codeAction, params, handler, bufnr)
 end
 
 -- Checks if the given buffer has any lsp clients that support the given method.
@@ -42,8 +44,8 @@ end
 
 ---@param bufnr number
 ---@param method string
----@param apply lsp.Apply
----@param filter? lsp.Filter
+---@param apply fun(client: vim.lsp.Client, bufnr: number)
+---@param filter? fun(client: vim.lsp.Client): boolean?
 local on_clients = function(bufnr, method, apply, filter)
   local clients = vim.lsp.get_clients({ bufnr = bufnr, method = method })
   if not filter then
@@ -67,7 +69,7 @@ M.setup = function()
       if client == nil then
         return
       end
-      if client.supports_method(ms.textDocument_codeLens) then
+      if client:supports_method(ms.textDocument_codeLens, vim.api.nvim_get_current_buf()) then
         vim.lsp.inlay_hint.enable(true)
       end
     end,
@@ -78,7 +80,7 @@ M.setup = function()
       if client == nil then
         return
       end
-      if client.supports_method(ms.textDocument_codeLens) then
+      if client:supports_method(ms.textDocument_codeLens, vim.api.nvim_get_current_buf()) then
         vim.lsp.codelens.clear(client.id)
       end
     end,
@@ -87,7 +89,7 @@ M.setup = function()
 
   vim.api.nvim_create_autocmd({ "BufWritePre" }, {
     callback = function()
-      ---@type lsp.Apply
+      ---@type fun(client: vim.lsp.Client, bufnr: number)
       local format = function(client, bufnr)
         if client.server_capabilities.documentFormattingProvider then
           vim.lsp.buf.format({
@@ -106,7 +108,7 @@ M.setup = function()
   vim.api.nvim_create_autocmd({ "BufWritePost" }, {
     callback = function()
       local bufnr = vim.api.nvim_get_current_buf()
-      ---@type lsp.Filter
+      ---@type fun(client: vim.lsp.Client): boolean?
       local filter = function(client)
         -- lua_ls freaks out when you ask it to organize imports.
         return client.name ~= "lua_ls"

modules/neovim/config/lua/lsp_keymaps.lua

@@ -12,20 +12,6 @@ local keymap = function(lhs, rhs, bufnr)
   })
 end
 
---- Add an insert keymap.
----@param lhs string Keymap
----@param rhs function Action
----@param bufnr number Buffer number
-local ikeymap = function(lhs, rhs, bufnr)
-  vim.keymap.set("i", lhs, rhs, {
-    noremap = true,
-    silent = true,
-    buffer = bufnr,
-  })
-end
-
-local is_v10 = vim.fn.has("nvim-0.10") == 1
-
 local telescope = function(action)
   return function()
     local ivy = require("telescope.themes").get_ivy()
@@ -38,39 +24,35 @@ end
 M.on_attach = function(bufnr)
   keymap("gd", telescope("definitions"), bufnr)
   keymap("grr", telescope("references"), bufnr)
-  keymap("<leader>ls", telescope("document_symbols"), bufnr)
-  keymap("<leader>lS", telescope("workspace_symbols"), bufnr)
-  keymap("<C-s>", vim.lsp.buf.signature_help, bufnr)
-  ikeymap("<C-s>", vim.lsp.buf.signature_help, bufnr)
-  keymap("gi", telescope("implementations"), bufnr)
+  keymap("gO", telescope("document_symbols"), bufnr)
+  keymap("gri", telescope("implementations"), bufnr)
   keymap("gD", vim.lsp.buf.declaration, bufnr)
   keymap("K", vim.lsp.buf.hover, bufnr)
   keymap("<leader>D", telescope("type_definitions"), bufnr)
-  keymap("grn", vim.lsp.buf.rename, bufnr)
-  keymap("gra", vim.lsp.buf.code_action, bufnr)
   keymap("grl", vim.lsp.codelens.run, bufnr)
   keymap("gl", vim.diagnostic.open_float, bufnr)
   keymap("[d", function()
-    if is_v10 then
-      vim.diagnostic.goto_prev()
-    else
-      vim.diagnostic.jump({ count = -1 })
-    end
+    vim.diagnostic.jump({ count = -1 })
     vim.cmd("norm zz")
   end, bufnr)
   keymap("]d", function()
-    if is_v10 then
-      vim.diagnostic.goto_next()
-    else
-      vim.diagnostic.jump({ count = 1 })
-    end
+    vim.diagnostic.jump({ count = 1 })
     vim.cmd("norm zz")
   end, bufnr)
 
   keymap("<leader>v", function()
     vim.cmd("vsplit | lua vim.lsp.buf.definition()")
     vim.cmd("norm zz")
   end, bufnr)
+
+  keymap("<leader>ls", function()
+    -- XXX: remove soon
+    vim.notify("Use gO instead")
+  end, bufnr)
+  keymap("gi", function()
+    -- XXX: remove soon
+    vim.notify("Use gri instead")
+  end, bufnr)
 end
 
 return M

modules/neovim/config/lua/user/keymaps.lua

@@ -18,8 +18,6 @@ keymap("n", "<leader>n", ":enew<CR>", opts)
 -- quicklists
 keymap("n", "<leader>co", ":copen<CR>", opts)
 keymap("n", "<leader>cc", ":cclose<CR>", opts)
-keymap("n", "[q", ":cprevious<CR>zz", opts)
-keymap("n", "]q", ":cnext<CR>zz", opts)
 
 -- Resize with arrows
 keymap("n", "<A-Up>", ":resize +2<CR>", opts)
@@ -28,7 +26,7 @@ keymap("n", "<A-Left>", ":vertical resize -2<CR>", opts)
 keymap("n", "<A-Right>", ":vertical resize +2<CR>", opts)
 
 -- buffer killing
-keymap("n", "<leader>q", ":Bdelete<CR>", opts) -- delete current buffer
+keymap("n", "<leader>q", ":Bdelete<CR>", opts)          -- delete current buffer
 keymap("n", "<leader>bad", ":%bd!<cr>:intro<cr>", opts) -- delete all buffers
 -- delete surrounding buffers, make sure to keep the cursor position
 keymap("n", "<leader>bsd", function()
@@ -61,10 +59,6 @@ keymap("n", "<C-i>", "<C-i>zz", opts)
 keymap("n", "Q", "q", opts)
 keymap("n", "q", "<Nop>", opts)
 
--- Insert empty blank line above/bellow
-keymap("n", "]<Space>", "m`o<Esc>``", opts)
-keymap("n", "[<Space>", "m`O<Esc>``", opts)
-
 -- system clipboard integration
 keymap("n", "<leader>y", '"+y', opts)
 keymap("n", "<leader>Y", '"+Y', opts)

modules/neovim/config/lua/user/lsp.lua

@@ -1,4 +1,3 @@
-local ms = require("vim.lsp.protocol").Methods
 local keymaps = require("lsp_keymaps")
 require("lsp_autocommands").setup()
 
@@ -181,8 +180,8 @@ vim.diagnostic.config({
   float = float_config,
 })
 
-vim.lsp.handlers[ms.textDocument_hover] = vim.lsp.with(vim.lsp.handlers.hover, float_config)
-vim.lsp.handlers[ms.textDocument_signatureHelp] = vim.lsp.with(vim.lsp.handlers.signature_help, float_config)
+vim.lsp.buf.hover(float_config)
+vim.lsp.buf.signature_help(float_config)
 vim.highlight.priorities.semantic_tokens = 95
 
 -- set up diagnostic signs

modules/neovim/config/lua/user/notify.lua

@@ -1,4 +1,5 @@
 local notify = require("notify")
+---@diagnostic disable-next-line: missing-fields
 notify.setup({
   render = "compact",
   stages = "static",