Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lua/lspsaga/callhierarchy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ end

function ch:call_hierarchy(item, client, timer_close, curlnum)
self.pending_request = true
client.request(self.method, { item = item }, function(_, res)
client:request(self.method, { item = item }, function(_, res)
self.pending_request = false
curlnum = curlnum or 0
local inlevel = curlnum == 0 and 2 or fn.indent(curlnum)
Expand Down Expand Up @@ -471,7 +471,7 @@ function ch:send_prepare_call()
self.list = slist.new()

local params = lsp.util.make_position_params(0, util.get_offset_encoding({ client = client }))
client.request(get_method(1), params, function(_, result, ctx)
client:request(get_method(1), params, function(_, result, ctx)
if api.nvim_get_current_buf() ~= ctx.bufnr then
return
end
Expand Down
8 changes: 4 additions & 4 deletions lua/lspsaga/codeaction/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ local function apply_action(action, client, enriched_ctx)
arguments = command.arguments,
workDoneToken = command.workDoneToken,
}
client.request('workspace/executeCommand', params, nil, enriched_ctx.bufnr)
client:request('workspace/executeCommand', params, nil, enriched_ctx.bufnr)
end
end
clean_ctx()
Expand All @@ -254,7 +254,7 @@ function act:support_resolve(client)
if vim.version().minor >= 10 then
local reg = client.dynamic_capabilities:get('textDocument/codeAction', { bufnr = ctx.bufnr })
return vim.tbl_get(reg or {}, 'registerOptions', 'resolveProvider')
or client.supports_method('codeAction/resolve')
or client:supports_method('codeAction/resolve')
end
return vim.tbl_get(client.server_capabilities, 'codeActionProvider', 'resolveProvider')
end
Expand All @@ -263,12 +263,12 @@ function act:get_resolve_action(client, action, bufnr)
if not self:support_resolve(client) then
return
end
return client.request_sync('codeAction/resolve', action, 1500, bufnr).result
return client:request_sync('codeAction/resolve', action, 1500, bufnr).result
end

function act:do_code_action(action, client, enriched_ctx)
if not action.edit and client and self:support_resolve(client) then
client.request('codeAction/resolve', action, function(err, resolved_action)
client:request('codeAction/resolve', action, function(err, resolved_action)
if err then
vim.notify(err.code .. ': ' .. err.message, vim.log.levels.ERROR)
return
Expand Down
2 changes: 1 addition & 1 deletion lua/lspsaga/codeaction/lightbulb.lua
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ local function lb_autocmd()
if not client then
return
end
if not client.supports_method('textDocument/codeAction') then
if not client:supports_method('textDocument/codeAction') then
return
end
if vim.tbl_contains(config.lightbulb.ignore.clients, client.name) then
Expand Down
2 changes: 1 addition & 1 deletion lua/lspsaga/implement/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ local function try_render(client_id, bufnr, pos, data)
return
end
---@diagnostic disable-next-line: invisible
client.request('textDocument/implementation', params, function(err, result)
client:request('textDocument/implementation', params, function(err, result)
if err or api.nvim_get_current_buf() ~= bufnr then
return
end
Expand Down
6 changes: 3 additions & 3 deletions lua/lspsaga/symbol/head.lua
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function symbol:do_request(buf, client_id)
}
end

client.request('textDocument/documentSymbol', params, function(err, result, ctx)
client:request('textDocument/documentSymbol', params, function(err, result, ctx)
if not api.nvim_buf_is_loaded(ctx.bufnr) or not self[ctx.bufnr] then
return
end
Expand Down Expand Up @@ -170,7 +170,7 @@ function symbol:register_module()
end

local client = lsp.get_client_by_id(args.data.client_id)
if not client or not client.supports_method('textDocument/documentSymbol') then
if not client or not client:supports_method('textDocument/documentSymbol') then
return
end

Expand All @@ -183,7 +183,7 @@ function symbol:register_module()
end
self:buf_watcher(args.buf, group)

if config.implement.enable and client.supports_method('textDocument/implementation') then
if config.implement.enable and client:supports_method('textDocument/implementation') then
require('lspsaga.implement').start()
end
end,
Expand Down
6 changes: 3 additions & 3 deletions lua/lspsaga/symbol/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function symbol:do_request(buf, client_id)

self[buf].pending_request = true

client.request('textDocument/documentSymbol', params, function(err, result, ctx)
client:request('textDocument/documentSymbol', params, function(err, result, ctx)
if not api.nvim_buf_is_loaded(ctx.bufnr) or not self[ctx.bufnr] then
return
end
Expand Down Expand Up @@ -190,7 +190,7 @@ function symbol:register_module()
end

local client = lsp.get_client_by_id(args.data.client_id)
if not client or not client.supports_method('textDocument/documentSymbol') then
if not client or not client:supports_method('textDocument/documentSymbol') then
return
end
self:do_request(args.buf, args.data.client_id)
Expand All @@ -199,7 +199,7 @@ function symbol:register_module()
require('lspsaga.symbol.winbar').init_winbar(args.buf)
end

if config.implement.enable and client.supports_method('textDocument/implementation') then
if config.implement.enable and client:supports_method('textDocument/implementation') then
require('lspsaga.implement').start()
end
end,
Expand Down
4 changes: 2 additions & 2 deletions lua/lspsaga/typehierarchy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ end

function ch:type_hierarchy(item, client, timer_close, curlnum)
self.pending_request = true
client.request(self.method, { item = item }, function(_, res)
client:request(self.method, { item = item }, function(_, res)
self.pending_request = false
curlnum = curlnum or 0
local inlevel = curlnum == 0 and 2 or fn.indent(curlnum)
Expand Down Expand Up @@ -472,7 +472,7 @@ function ch:send_prepare_type()
self.list = slist.new()

local params = lsp.util.make_position_params()
client.request(get_method(1), params, function(_, result, ctx)
client:request(get_method(1), params, function(_, result, ctx)
if api.nvim_get_current_buf() ~= ctx.bufnr then
return
end
Expand Down
2 changes: 1 addition & 1 deletion lua/lspsaga/util.lua
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function M.get_client_by_method(method)
local supports = {}

for _, client in ipairs(clients or {}) do
if client.supports_method(method) then
if client:supports_method(method) then
supports[#supports + 1] = client
end
end
Expand Down