fix: update code to use non-deprecated methods in Neovim v0.11

Author: mehalter

lua/astrolsp/file_operations.lua

@@ -12,6 +12,8 @@
 ---@class astrolsp.file_operations
 local M = {}
 
+local utils = require "astrolsp.utils"
+
 local config = vim.tbl_get(require "astrolsp", "config", "file_operations") or {}
 
 ---@class AstroLSPFileOperationsRename
@@ -54,7 +56,8 @@ function M.didCreateFiles(fnames)
       local filters = did_create.filters or {}
       local filtered = vim.tbl_filter(function(fname) return match_filters(filters, fname) end, fnames)
       if next(filtered) then
-        client.notify(
+        utils.notify(
+          client,
           "workspace/didCreateFiles",
           { files = vim.tbl_map(function(fname) return { uri = vim.uri_from_fname(fname) } end, filtered) }
         )
@@ -74,7 +77,8 @@ function M.didDeleteFiles(fnames)
       local filters = did_delete.filters or {}
       local filtered = vim.tbl_filter(function(fname) return match_filters(filters, fname) end, fnames)
       if next(filtered) then
-        client.notify(
+        utils.notify(
+          client,
           "workspace/didDeleteFiles",
           { files = vim.tbl_map(function(fname) return { uri = vim.uri_from_fname(fname) } end, filtered) }
         )
@@ -97,7 +101,7 @@ function M.didRenameFiles(renames)
         renames
       )
       if next(filtered) then
-        client.notify("workspace/didRenameFiles", {
+        utils.notify(client, "workspace/didRenameFiles", {
           files = vim.tbl_map(
             function(rename) return { oldUri = vim.uri_from_fname(rename.from), newUri = vim.uri_from_fname(rename.to) } end,
             filtered
@@ -108,8 +112,11 @@ function M.didRenameFiles(renames)
   end
 end
 
-local getWorkspaceEdit = function(client, req, params)
-  local success, resp = pcall(client.request_sync, req, params, config.timeout)
+---@param client vim.lsp.Client
+---@param req string
+---@param params table
+local function getWorkspaceEdit(client, req, params)
+  local success, resp = pcall(utils.request_sync, client, req, params, config.timeout)
   if success then return resp.result end
 end
 

lua/astrolsp/init.lua

@@ -9,6 +9,8 @@
 ---@class astrolsp
 local M = {}
 
+local utils = require "astrolsp.utils"
+
 local tbl_contains = vim.tbl_contains
 local tbl_isempty = vim.tbl_isempty
 
@@ -27,7 +29,7 @@ local function lsp_event(name) vim.api.nvim_exec_autocmds("User", { pattern = "A
 local function check_cond(cond, client, bufnr)
   local cond_type = type(cond)
   if cond_type == "function" then return cond(client, bufnr) end
-  if cond_type == "string" then return client.supports_method(cond) end
+  if cond_type == "string" then return utils.supports_method(client, cond, bufnr) end
   if cond_type == "boolean" then return cond end
   return true
 end
@@ -79,13 +81,13 @@ end
 ---@param client vim.lsp.Client The LSP client details when attaching
 ---@param bufnr integer The buffer that the LSP client is attaching to
 function M.on_attach(client, bufnr)
-  if client.supports_method "textDocument/codeLens" and M.config.features.codelens then
+  if utils.supports_method(client, "textDocument/codeLens", bufnr) and M.config.features.codelens then
     vim.lsp.codelens.refresh { bufnr = bufnr }
   end
 
   local formatting_disabled = vim.tbl_get(M.config, "formatting", "disabled")
   if
-    client.supports_method "textDocument/formatting"
+    utils.supports_method(client, "textDocument/formatting", bufnr)
     and (formatting_disabled ~= true and not tbl_contains(formatting_disabled, client.name))
   then
     local autoformat = assert(M.config.formatting.format_on_save)
@@ -97,7 +99,7 @@ function M.on_attach(client, bufnr)
     end
   end
 
-  if client.supports_method "textDocument/semanticTokens/full" and vim.lsp.semantic_tokens then
+  if utils.supports_method(client, "textDocument/semanticTokens/full", bufnr) and vim.lsp.semantic_tokens then
     if M.config.features.semantic_tokens then
       if vim.b[bufnr].semantic_tokens == nil then vim.b[bufnr].semantic_tokens = true end
     else
@@ -278,7 +280,7 @@ function M.setup(opts)
     desc = "Add signature help triggers as language servers attach",
     callback = function(args)
       local client = vim.lsp.get_client_by_id(args.data.client_id)
-      if client and client.supports_method "textDocument/signatureHelp" then
+      if client and utils.supports_method(client, "textDocument/signatureHelp", args.buf) then
         for _, set in ipairs { "triggerCharacters", "retriggerCharacters" } do
           local set_var = "signature_help_" .. set
           local triggers = vim.b[args.buf][set_var] or {}
@@ -297,7 +299,9 @@ function M.setup(opts)
       if not vim.api.nvim_buf_is_valid(args.buf) then return end
       local triggers, retriggers = {}, {}
       for _, client in pairs(vim.lsp.get_clients { bufnr = args.buf }) do
-        if client.id ~= args.data.client_id and client.supports_method "textDocument/signatureHelp" then
+        if
+          client.id ~= args.data.client_id and utils.supports_method(client, "textDocument/signatureHelp", args.buf)
+        then
           for _, trigger in ipairs(client.server_capabilities.signatureHelpProvider.triggerCharacters or {}) do
             triggers[trigger] = true
           end

lua/astrolsp/toggles.lua

@@ -9,6 +9,8 @@
 ---@class astrolsp.toggles
 local M = {}
 
+local utils = require "astrolsp.utils"
+
 local config = require("astrolsp").config
 local features = config.features --[[@as AstroLSPFeatureOpts]]
 local format_on_save = config.formatting.format_on_save --[[@as AstroLSPFormatOnSaveOpts]]
@@ -65,7 +67,7 @@ function M.buffer_semantic_tokens(bufnr, silent)
   vim.b[bufnr].semantic_tokens = not vim.b[bufnr].semantic_tokens
   local toggled = false
   for _, client in ipairs(vim.lsp.get_clients { bufnr = bufnr }) do
-    if client.supports_method "textDocument/semanticTokens/full" then
+    if utils.supports_method(client, "textDocument/semanticTokens/full", bufnr) then
       -- HACK: `semantic_tokens.start/stop` don't support 0 for current buffer
       local real_bufnr = bufnr == 0 and vim.api.nvim_get_current_buf() or bufnr
       vim.lsp.semantic_tokens[vim.b[bufnr].semantic_tokens and "start" or "stop"](real_bufnr, client.id)

lua/astrolsp/utils.lua

@@ -0,0 +1,53 @@
+---Utilities for interacting with the Neovim LSP integration
+---
+---This module can be loaded with `local astrolsp_utils = require "astrolsp.utils"`
+---
+---copyright 2025
+---license GNU General Public License v3.0
+---@class astrolsp.utils
+local M = {}
+
+-- TODO: remove helper functions when dropping support for Neovim v0.10
+
+--- Helper function to support deprecated supports_method usage
+---@param client vim.lsp.Client
+---@param method string
+---@param bufnr? integer
+function M.supports_method(client, method, bufnr)
+  if vim.fn.has "nvim-0.11" == 1 then
+    return client:supports_method(method, bufnr)
+  else
+    ---@diagnostic disable-next-line: param-type-mismatch
+    return client.supports_method(method, { bufnr = bufnr })
+  end
+end
+
+--- Helper function to support deprecated request_sync usage
+---@param client vim.lsp.Client
+---@param req string
+---@param params table
+---@param timeout? integer
+---@param bufnr? integer
+function M.request_sync(client, req, params, timeout, bufnr)
+  if vim.fn.has "nvim-0.11" == 1 then
+    return client:request_sync(req, params, timeout, bufnr)
+  else
+    ---@diagnostic disable-next-line: param-type-mismatch
+    return client.request_sync(req, params, timeout, bufnr)
+  end
+end
+
+--- Helper function to support deprecated notify usage
+---@param client vim.lsp.Client
+---@param method string
+---@param params? table
+function M.notify(client, method, params)
+  if vim.fn.has "nvim-0.11" == 1 then
+    return client:notify(method, params)
+  else
+    ---@diagnostic disable-next-line: param-type-mismatch
+    return client.notify(method, params)
+  end
+end
+
+return M