mirror of https://github.com/neovim/neovim.git
Compare commits
5 Commits
0aa35ec064
...
2caa69c751
Author | SHA1 | Date |
---|---|---|
Yi Ming | 2caa69c751 | |
Evgeni Chasnovski | 5e98439f6d | |
Maria José Solano | efb44e0cad | |
Yi Ming | ff27fe269a | |
Yi Ming | 3f1da00568 |
|
@ -183,26 +183,22 @@ do
|
|||
do
|
||||
vim.keymap.set('n', ']d', function()
|
||||
vim.diagnostic.goto_next({ float = false })
|
||||
end, {
|
||||
desc = 'Jump to the next diagnostic with the highest severity',
|
||||
})
|
||||
end, { desc = 'Jump to the next diagnostic' })
|
||||
|
||||
vim.keymap.set('n', '[d', function()
|
||||
vim.diagnostic.goto_prev({ float = false })
|
||||
end, {
|
||||
desc = 'Jump to the previous diagnostic with the highest severity',
|
||||
})
|
||||
end, { desc = 'Jump to the previous diagnostic' })
|
||||
|
||||
vim.keymap.set('n', '<C-W>d', function()
|
||||
vim.diagnostic.open_float()
|
||||
end, {
|
||||
desc = 'Open a floating window showing diagnostics under the cursor',
|
||||
})
|
||||
end, { desc = 'Show diagnostics under the cursor' })
|
||||
|
||||
vim.keymap.set('n', '<C-W><C-D>', '<C-W>d', {
|
||||
remap = true,
|
||||
desc = 'Open a floating window showing diagnostics under the cursor',
|
||||
})
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<C-W><C-D>',
|
||||
'<C-W>d',
|
||||
{ remap = true, desc = 'Show diagnostics under the cursor' }
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -124,7 +124,7 @@ error('Cannot require a meta file')
|
|||
--- @field commalist boolean
|
||||
--- @field flaglist boolean
|
||||
--- @field was_set boolean
|
||||
--- @field last_set_id integer
|
||||
--- @field last_set_sid integer
|
||||
--- @field last_set_linenr integer
|
||||
--- @field last_set_chan integer
|
||||
--- @field type 'string'|'boolean'|'number'
|
||||
|
|
|
@ -127,3 +127,11 @@
|
|||
--- @field skipcol integer
|
||||
--- @field topfill integer
|
||||
--- @field topline integer
|
||||
|
||||
--- @class vim.fn.getscriptinfo.ret
|
||||
--- @field autoload false
|
||||
--- @field functions? string[]
|
||||
--- @field name string
|
||||
--- @field sid string
|
||||
--- @field variables? table<string, any>
|
||||
--- @field version 1
|
||||
|
|
|
@ -3632,7 +3632,7 @@ function vim.fn.getregtype(regname) end
|
|||
--- <
|
||||
---
|
||||
--- @param opts? table
|
||||
--- @return any
|
||||
--- @return vim.fn.getscriptinfo.ret[]
|
||||
function vim.fn.getscriptinfo(opts) end
|
||||
|
||||
--- If {tabnr} is not specified, then information about all the
|
||||
|
|
|
@ -68,18 +68,6 @@ lsp._request_name_to_capability = {
|
|||
|
||||
-- TODO improve handling of scratch buffers with LSP attached.
|
||||
|
||||
--- Returns the buffer number for the given {bufnr}.
|
||||
---
|
||||
---@param bufnr (integer|nil) Buffer number to resolve. Defaults to current buffer
|
||||
---@return integer bufnr
|
||||
local function resolve_bufnr(bufnr)
|
||||
validate({ bufnr = { bufnr, 'n', true } })
|
||||
if bufnr == nil or bufnr == 0 then
|
||||
return api.nvim_get_current_buf()
|
||||
end
|
||||
return bufnr
|
||||
end
|
||||
|
||||
---@private
|
||||
--- Called by the client when trying to call a method that's not
|
||||
--- supported in any of the servers registered for the current buffer.
|
||||
|
@ -245,7 +233,7 @@ end
|
|||
function lsp.start(config, opts)
|
||||
opts = opts or {}
|
||||
local reuse_client = opts.reuse_client or reuse_client_default
|
||||
local bufnr = resolve_bufnr(opts.bufnr)
|
||||
local bufnr = util.resolve_bufnr(opts.bufnr)
|
||||
|
||||
for _, client in pairs(all_clients) do
|
||||
if reuse_client(client, config) then
|
||||
|
@ -310,6 +298,7 @@ local function is_empty_or_default(bufnr, option)
|
|||
end
|
||||
|
||||
local info = api.nvim_get_option_info2(option, { buf = bufnr })
|
||||
---@param e vim.fn.getscriptinfo.ret
|
||||
local scriptinfo = vim.tbl_filter(function(e)
|
||||
return e.sid == info.last_set_sid
|
||||
end, vim.fn.getscriptinfo())
|
||||
|
@ -454,7 +443,7 @@ end
|
|||
---Buffer lifecycle handler for textDocument/didSave
|
||||
--- @param bufnr integer
|
||||
local function text_document_did_save_handler(bufnr)
|
||||
bufnr = resolve_bufnr(bufnr)
|
||||
bufnr = util.resolve_bufnr(bufnr)
|
||||
local uri = vim.uri_from_bufnr(bufnr)
|
||||
local text = once(lsp._buf_get_full_text)
|
||||
for _, client in ipairs(lsp.get_clients({ bufnr = bufnr })) do
|
||||
|
@ -515,7 +504,7 @@ local function buf_attach(bufnr)
|
|||
textDocument = {
|
||||
uri = uri,
|
||||
},
|
||||
reason = protocol.TextDocumentSaveReason.Manual,
|
||||
reason = protocol.TextDocumentSaveReason.Manual, ---@type integer
|
||||
}
|
||||
if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'willSave') then
|
||||
client.notify(ms.textDocument_willSave, params)
|
||||
|
@ -596,7 +585,7 @@ function lsp.buf_attach_client(bufnr, client_id)
|
|||
bufnr = { bufnr, 'n', true },
|
||||
client_id = { client_id, 'n' },
|
||||
})
|
||||
bufnr = resolve_bufnr(bufnr)
|
||||
bufnr = util.resolve_bufnr(bufnr)
|
||||
if not api.nvim_buf_is_loaded(bufnr) then
|
||||
log.warn(string.format('buf_attach_client called on unloaded buffer (id: %d): ', bufnr))
|
||||
return false
|
||||
|
@ -635,7 +624,7 @@ function lsp.buf_detach_client(bufnr, client_id)
|
|||
bufnr = { bufnr, 'n', true },
|
||||
client_id = { client_id, 'n' },
|
||||
})
|
||||
bufnr = resolve_bufnr(bufnr)
|
||||
bufnr = util.resolve_bufnr(bufnr)
|
||||
|
||||
local client = all_clients[client_id]
|
||||
if not client or not client.attached_buffers[bufnr] then
|
||||
|
@ -759,7 +748,7 @@ function lsp.get_clients(filter)
|
|||
|
||||
local clients = {} --- @type vim.lsp.Client[]
|
||||
|
||||
local bufnr = filter.bufnr and resolve_bufnr(filter.bufnr)
|
||||
local bufnr = filter.bufnr and util.resolve_bufnr(filter.bufnr)
|
||||
|
||||
for _, client in pairs(all_clients) do
|
||||
if
|
||||
|
@ -854,7 +843,7 @@ function lsp.buf_request(bufnr, method, params, handler)
|
|||
handler = { handler, 'f', true },
|
||||
})
|
||||
|
||||
bufnr = resolve_bufnr(bufnr)
|
||||
bufnr = util.resolve_bufnr(bufnr)
|
||||
local method_supported = false
|
||||
local clients = lsp.get_clients({ bufnr = bufnr })
|
||||
local client_request_ids = {} --- @type table<integer,integer>
|
||||
|
@ -899,7 +888,7 @@ end
|
|||
--- a `client_id:result` map.
|
||||
---@return function cancel Function that cancels all requests.
|
||||
function lsp.buf_request_all(bufnr, method, params, handler)
|
||||
local results = {} --- @type table<integer,{error:string, result:any}>
|
||||
local results = {} --- @type table<integer,{error:lsp.ResponseError, result:any}>
|
||||
local result_count = 0
|
||||
local expected_result_count = 0
|
||||
|
||||
|
@ -940,7 +929,7 @@ end
|
|||
---@return table<integer, {err: lsp.ResponseError, result: any}>? result Map of client_id:request_result.
|
||||
---@return string? err On timeout, cancel, or error, `err` is a string describing the failure reason, and `result` is nil.
|
||||
function lsp.buf_request_sync(bufnr, method, params, timeout_ms)
|
||||
local request_results
|
||||
local request_results ---@type table
|
||||
|
||||
local cancel = lsp.buf_request_all(bufnr, method, params, function(it)
|
||||
request_results = it
|
||||
|
@ -1088,7 +1077,7 @@ end
|
|||
function lsp.buf_get_clients(bufnr)
|
||||
vim.deprecate('vim.lsp.buf_get_clients()', 'vim.lsp.get_clients()', '0.12')
|
||||
local result = {} --- @type table<integer,vim.lsp.Client>
|
||||
for _, client in ipairs(lsp.get_clients({ bufnr = resolve_bufnr(bufnr) })) do
|
||||
for _, client in ipairs(lsp.get_clients({ bufnr = util.resolve_bufnr(bufnr) })) do
|
||||
result[client.id] = client
|
||||
end
|
||||
return result
|
||||
|
@ -1142,7 +1131,7 @@ function lsp.for_each_buffer_client(bufnr, fn)
|
|||
'lsp.get_clients({ bufnr = bufnr }) with regular loop',
|
||||
'0.12'
|
||||
)
|
||||
bufnr = resolve_bufnr(bufnr)
|
||||
bufnr = util.resolve_bufnr(bufnr)
|
||||
|
||||
for _, client in pairs(lsp.get_clients({ bufnr = bufnr })) do
|
||||
fn(client, client.id, bufnr)
|
||||
|
|
|
@ -633,18 +633,6 @@ function Client:_resolve_handler(method)
|
|||
return self.handlers[method] or lsp.handlers[method]
|
||||
end
|
||||
|
||||
--- Returns the buffer number for the given {bufnr}.
|
||||
---
|
||||
--- @param bufnr (integer|nil) Buffer number to resolve. Defaults to current buffer
|
||||
--- @return integer bufnr
|
||||
local function resolve_bufnr(bufnr)
|
||||
validate({ bufnr = { bufnr, 'n', true } })
|
||||
if bufnr == nil or bufnr == 0 then
|
||||
return api.nvim_get_current_buf()
|
||||
end
|
||||
return bufnr
|
||||
end
|
||||
|
||||
--- @private
|
||||
--- Sends a request to the server.
|
||||
---
|
||||
|
@ -672,7 +660,7 @@ function Client:_request(method, params, handler, bufnr)
|
|||
-- Ensure pending didChange notifications are sent so that the server doesn't operate on a stale state
|
||||
changetracking.flush(self, bufnr)
|
||||
local version = lsp.util.buf_versions[bufnr]
|
||||
bufnr = resolve_bufnr(bufnr)
|
||||
bufnr = lsp.util.resolve_bufnr(bufnr)
|
||||
log.debug(self._log_prefix, 'client.request', self.id, method, params, handler, bufnr)
|
||||
local success, request_id = self.rpc.request(method, params, function(err, result)
|
||||
local context = {
|
||||
|
|
|
@ -2,6 +2,7 @@ local util = require('vim.lsp.util')
|
|||
local log = require('vim.lsp.log')
|
||||
local ms = require('vim.lsp.protocol').Methods
|
||||
local api = vim.api
|
||||
local validate = vim.validate
|
||||
local M = {}
|
||||
|
||||
--- bufnr → true|nil
|
||||
|
@ -104,8 +105,16 @@ function M.run()
|
|||
end
|
||||
end
|
||||
|
||||
--- Returns the buffer number for the given {bufnr}.
|
||||
---
|
||||
--- @param bufnr (integer|nil) Buffer number to resolve. Defaults to current buffer
|
||||
--- @return integer bufnr
|
||||
local function resolve_bufnr(bufnr)
|
||||
return bufnr == 0 and api.nvim_get_current_buf() or bufnr
|
||||
validate({ bufnr = { bufnr, 'n', true } })
|
||||
if bufnr == nil or bufnr == 0 then
|
||||
return api.nvim_get_current_buf()
|
||||
end
|
||||
return bufnr
|
||||
end
|
||||
|
||||
--- Clear the lenses
|
||||
|
@ -296,9 +305,14 @@ end
|
|||
--- @param opts? vim.lsp.codelens.refresh.Opts Optional fields
|
||||
function M.refresh(opts)
|
||||
opts = opts or {}
|
||||
local bufnr = opts.bufnr and resolve_bufnr(opts.bufnr)
|
||||
local buffers = bufnr and { bufnr }
|
||||
or vim.tbl_filter(api.nvim_buf_is_loaded, api.nvim_list_bufs())
|
||||
---@type integer[]
|
||||
local buffers
|
||||
if opts.bufnr then
|
||||
local bufnr = resolve_bufnr(opts.bufnr)
|
||||
buffers = { bufnr }
|
||||
else
|
||||
buffers = vim.tbl_filter(api.nvim_buf_is_loaded, api.nvim_list_bufs())
|
||||
end
|
||||
|
||||
for _, buf in ipairs(buffers) do
|
||||
if not active_refreshes[buf] then
|
||||
|
|
|
@ -113,6 +113,18 @@ local function create_window_without_focus()
|
|||
return new
|
||||
end
|
||||
|
||||
--- Returns the buffer number for the given {bufnr}.
|
||||
---
|
||||
---@param bufnr (integer|nil) Buffer number to resolve. Defaults to current buffer
|
||||
---@return integer bufnr
|
||||
function M.resolve_bufnr(bufnr)
|
||||
validate({ bufnr = { bufnr, 'n', true } })
|
||||
if bufnr == nil or bufnr == 0 then
|
||||
return api.nvim_get_current_buf()
|
||||
end
|
||||
return bufnr
|
||||
end
|
||||
|
||||
--- Convert byte index to `encoding` index.
|
||||
--- Convenience wrapper around vim.str_utfindex
|
||||
---@param line string line to be indexed
|
||||
|
|
|
@ -327,7 +327,7 @@ function M.get_captures_at_cursor(winnr)
|
|||
end
|
||||
|
||||
--- Optional keyword arguments:
|
||||
--- @class vim.treesitter.get_node.Opts
|
||||
--- @class vim.treesitter.get_node.Opts : vim.treesitter.LanguageTree.tree_for_range.Opts
|
||||
--- @inlinedoc
|
||||
---
|
||||
--- Buffer number (nil or 0 for current buffer)
|
||||
|
|
|
@ -4475,6 +4475,7 @@ M.funcs = {
|
|||
]=],
|
||||
name = 'getscriptinfo',
|
||||
params = { { 'opts', 'table' } },
|
||||
returns = 'vim.fn.getscriptinfo.ret[]',
|
||||
signature = 'getscriptinfo([{opts}])',
|
||||
},
|
||||
gettabinfo = {
|
||||
|
|
Loading…
Reference in New Issue