fix(lsp): use LSP method type in more places (#36069)

This commit is contained in:
Maria Solano
2025-10-07 08:17:40 -07:00
committed by GitHub
parent a4006360f1
commit 006101360d
5 changed files with 9 additions and 8 deletions

View File

@@ -5,7 +5,7 @@ error('Cannot require a meta file')
---@alias lsp.MultiHandler fun(results: table<integer,{err: lsp.ResponseError?, result: any, context: lsp.HandlerContext}>, context: lsp.HandlerContext, config?: table): ...any ---@alias lsp.MultiHandler fun(results: table<integer,{err: lsp.ResponseError?, result: any, context: lsp.HandlerContext}>, context: lsp.HandlerContext, config?: table): ...any
---@class lsp.HandlerContext ---@class lsp.HandlerContext
---@field method string ---@field method vim.lsp.protocol.Method
---@field client_id integer ---@field client_id integer
---@field bufnr? integer ---@field bufnr? integer
---@field params? any ---@field params? any

View File

@@ -2433,7 +2433,7 @@ error('Cannot require a meta file')
---@field id string ---@field id string
--- ---
---The method / capability to register for. ---The method / capability to register for.
---@field method string ---@field method vim.lsp.protocol.Method
--- ---
---Options necessary for the registration. ---Options necessary for the registration.
---@field registerOptions? lsp.LSPAny ---@field registerOptions? lsp.LSPAny
@@ -2446,7 +2446,7 @@ error('Cannot require a meta file')
---@field id string ---@field id string
--- ---
---The method to unregister for. ---The method to unregister for.
---@field method string ---@field method vim.lsp.protocol.Method
---The initialize parameters ---The initialize parameters
---@class lsp._InitializeParams: lsp.WorkDoneProgressParams ---@class lsp._InitializeParams: lsp.WorkDoneProgressParams

View File

@@ -263,6 +263,7 @@ function M.on_diagnostic(error, result, ctx)
if error ~= nil and error.code == protocol.ErrorCodes.ServerCancelled then if error ~= nil and error.code == protocol.ErrorCodes.ServerCancelled then
if error.data == nil or error.data.retriggerRequest ~= false then if error.data == nil or error.data.retriggerRequest ~= false then
local client = assert(lsp.get_client_by_id(ctx.client_id)) local client = assert(lsp.get_client_by_id(ctx.client_id))
---@diagnostic disable-next-line: param-type-mismatch
client:request(ctx.method, ctx.params) client:request(ctx.method, ctx.params)
end end
return return

View File

@@ -115,7 +115,7 @@ end
local default_dispatchers = { local default_dispatchers = {
--- Default dispatcher for notifications sent to an LSP server. --- Default dispatcher for notifications sent to an LSP server.
--- ---
---@param method string The invoked LSP method ---@param method vim.lsp.protocol.Method The invoked LSP method
---@param params table Parameters for the invoked LSP method ---@param params table Parameters for the invoked LSP method
notification = function(method, params) notification = function(method, params)
log.debug('notification', method, params) log.debug('notification', method, params)
@@ -123,7 +123,7 @@ local default_dispatchers = {
--- Default dispatcher for requests sent to an LSP server. --- Default dispatcher for requests sent to an LSP server.
--- ---
---@param method string The invoked LSP method ---@param method vim.lsp.protocol.Method The invoked LSP method
---@param params table Parameters for the invoked LSP method ---@param params table Parameters for the invoked LSP method
---@return any result (always nil for the default dispatchers) ---@return any result (always nil for the default dispatchers)
---@return lsp.ResponseError error `vim.lsp.protocol.ErrorCodes.MethodNotFound` ---@return lsp.ResponseError error `vim.lsp.protocol.ErrorCodes.MethodNotFound`
@@ -226,7 +226,7 @@ end
---@package ---@package
--- Sends a notification to the LSP server. --- Sends a notification to the LSP server.
---@param method string The invoked LSP method ---@param method vim.lsp.protocol.Method The invoked LSP method
---@param params any Parameters for the invoked LSP method ---@param params any Parameters for the invoked LSP method
---@return boolean `true` if notification could be sent, `false` if not ---@return boolean `true` if notification could be sent, `false` if not
function Client:notify(method, params) function Client:notify(method, params)
@@ -251,7 +251,7 @@ end
---@package ---@package
--- Sends a request to the LSP server and runs {callback} upon response. |vim.lsp.rpc.request()| --- Sends a request to the LSP server and runs {callback} upon response. |vim.lsp.rpc.request()|
--- ---
---@param method string The invoked LSP method ---@param method vim.lsp.protocol.Method The invoked LSP method
---@param params table? Parameters for the invoked LSP method ---@param params table? Parameters for the invoked LSP method
---@param callback fun(err?: lsp.ResponseError, result: any) Callback to invoke ---@param callback fun(err?: lsp.ResponseError, result: any) Callback to invoke
---@param notify_reply_callback? fun(message_id: integer) Callback to invoke as soon as a request is no longer pending ---@param notify_reply_callback? fun(message_id: integer) Callback to invoke as soon as a request is no longer pending

View File

@@ -30,7 +30,7 @@ Options:
--- @field messageDirection string --- @field messageDirection string
--- @field clientCapability? string --- @field clientCapability? string
--- @field serverCapability? string --- @field serverCapability? string
--- @field method string --- @field method vim.lsp.protocol.Method
--- @field params? any --- @field params? any
--- @field proposed? boolean --- @field proposed? boolean
--- @field registrationMethod? string --- @field registrationMethod? string