mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-03-31 21:02:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): get_namespace signature (#38449)

Browse Source 
Problem: Since the change to `pull_id` in #37938 we used the
deprecated signature internally

Solution: Don't
This commit is contained in:
Tristan Knight
2026-03-23 22:42:47 +00:00
committed by GitHub
parent 3e93793bb1
commit 7c3df3e2ea
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/lua/vim/lsp/buf.lua
View File

@@ -1364,7 +1364,7 @@ function M.code_action(opts)
if context.diagnostics then if context.diagnostics then
params.context = context params.context = context
else else
local ns_push = lsp.diagnostic.get_namespace(client.id, false) local ns_push = lsp.diagnostic.get_namespace(client.id)
local diagnostics = {} local diagnostics = {}
local lnum = api.nvim_win_get_cursor(0)[1] - 1 local lnum = api.nvim_win_get_cursor(0)[1] - 1

12
runtime/lua/vim/lsp/diagnostic.lua
View File

@@ -233,7 +233,7 @@ end
--- @param uri string --- @param uri string
--- @param client_id? integer --- @param client_id? integer
--- @param diagnostics lsp.Diagnostic[] --- @param diagnostics lsp.Diagnostic[]
--- @param pull_id boolean|string --- @param pull_id? boolean|string
local function handle_diagnostics(uri, client_id, diagnostics, pull_id) local function handle_diagnostics(uri, client_id, diagnostics, pull_id)
local fname = vim.uri_to_fname(uri) local fname = vim.uri_to_fname(uri)
@@ -263,7 +263,7 @@ end
function M.on_publish_diagnostics(_, params, ctx) function M.on_publish_diagnostics(_, params, ctx)
-- TODO(tris203): if empty array then clear diags -- TODO(tris203): if empty array then clear diags
-- https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_publishDiagnostics -- https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_publishDiagnostics
handle_diagnostics(params.uri, ctx.client_id, params.diagnostics, false) handle_diagnostics(params.uri, ctx.client_id, params.diagnostics)
end end
--- |lsp-handler| for the method "textDocument/diagnostic" --- |lsp-handler| for the method "textDocument/diagnostic"
@@ -299,11 +299,11 @@ function M.on_diagnostic(error, result, ctx)
return return
end end
handle_diagnostics(params.textDocument.uri, client_id, result.items, params.identifier or true) handle_diagnostics(params.textDocument.uri, client_id, result.items, params.identifier or 'nil')
for uri, related_result in pairs(result.relatedDocuments or {}) do for uri, related_result in pairs(result.relatedDocuments or {}) do
if related_result.kind == 'full' then if related_result.kind == 'full' then
handle_diagnostics(uri, client_id, related_result.items, params.identifier or true) handle_diagnostics(uri, client_id, related_result.items, params.identifier or 'nil')
end end
local related_bufnr = vim.uri_to_bufnr(uri) local related_bufnr = vim.uri_to_bufnr(uri)
@@ -341,7 +341,7 @@ function M.get_line_diagnostics(bufnr, line_nr, opts, client_id)
end end
if client_id then if client_id then
diag_opts.namespace = M.get_namespace(client_id, false) diag_opts.namespace = M.get_namespace(client_id)
end end
diag_opts.lnum = line_nr or (api.nvim_win_get_cursor(0)[1] - 1) diag_opts.lnum = line_nr or (api.nvim_win_get_cursor(0)[1] - 1)
@@ -548,7 +548,7 @@ function M._workspace_diagnostics(opts)
-- We favor document pull requests over workspace results, so only update the buffer -- We favor document pull requests over workspace results, so only update the buffer
-- state if we're not pulling document diagnostics for this buffer. -- state if we're not pulling document diagnostics for this buffer.
if bufstates[bufnr].pull_kind == 'workspace' and report.kind == 'full' then if bufstates[bufnr].pull_kind == 'workspace' and report.kind == 'full' then
handle_diagnostics(report.uri, ctx.client_id, report.items, params.identifier or true) handle_diagnostics(report.uri, ctx.client_id, report.items, params.identifier or 'nil')
local key = result_id_key(ctx.client_id, params.identifier) local key = result_id_key(ctx.client_id, params.identifier)
bufstates[bufnr].client_result_id[key] = report.resultId bufstates[bufnr].client_result_id[key] = report.resultId
end end