mirror of
https://github.com/neovim/neovim.git
synced 2026-07-24 18:00:46 +00:00
fix(tty): filter terminal probes by channel #40356
Problem:
Terminal probes sent with `nvim_ui_send()` can reach more than one stdout TTY
UI. Probes with a known TTY UI owner should not accept `TermResponse`s from
unrelated UI channels.
Solution:
Thread the existing `chan` filter through owned terminal probes. This covers
startup/attach background detection, fallback truecolor detection, and
`vim.tty.query()` forwarding opts to `vim.tty.request()`.
Note: Not every terminal escape path is updated here. I only passed `chan` when
the caller already knows which TTY UI owns the probe. For example, this does
not include:
- (Followup) OSC 52 (system clipboard) detection. It needs to capture the
`UIEnter` channel. Adding `{ chan = ... }` only to the nested query would be
half a fix.
- OSC 52 _paste_ is left global because the provider callback does not have
a UI channel (paste is invoked without a ui channel/tty ui object).
This commit is contained in:
@@ -80,13 +80,23 @@ end
|
||||
--- emulator supports the XTGETTCAP sequence.
|
||||
---
|
||||
--- @param caps string|table A terminal capability or list of capabilities to query
|
||||
--- @param opts? { timeout?: integer, on_timeout?: fun(), group?: integer|string, chan?: integer }
|
||||
--- @param on_response fun(cap:string, found:boolean, seq:string?) Called for each capability in
|
||||
--- `caps`. `found` is true if the capability was found, else false. `seq` is the control
|
||||
--- sequence if found, or nil for boolean capabilities.
|
||||
function M.query(caps, on_response)
|
||||
---@overload fun(caps:string|table, on_response:fun(cap:string, found:boolean, seq:string?))
|
||||
function M.query(caps, opts, on_response)
|
||||
if type(opts) == 'function' then
|
||||
on_response = opts
|
||||
opts = {}
|
||||
end
|
||||
|
||||
vim.validate('caps', caps, { 'string', 'table' })
|
||||
vim.validate('opts', opts, 'table', true)
|
||||
vim.validate('on_response', on_response, 'function')
|
||||
|
||||
opts = opts or {}
|
||||
|
||||
if type(caps) ~= 'table' then
|
||||
caps = { caps }
|
||||
end
|
||||
@@ -103,11 +113,17 @@ function M.query(caps, on_response)
|
||||
local payload = ('\027P+q%s\027\\'):format(table.concat(encoded, ';'))
|
||||
|
||||
M.request(payload, {
|
||||
timeout = opts.timeout,
|
||||
group = opts.group,
|
||||
chan = opts.chan,
|
||||
on_timeout = function()
|
||||
-- Call the callback for all capabilities that were not found.
|
||||
for k in pairs(pending) do
|
||||
on_response(k, false, nil)
|
||||
end
|
||||
if opts.on_timeout then
|
||||
opts.on_timeout()
|
||||
end
|
||||
end,
|
||||
}, function(resp)
|
||||
local k, rest = resp:match('^\027P1%+r(%x+)(.*)$')
|
||||
@@ -144,7 +160,7 @@ end
|
||||
--- Return `true` from `on_response` to stop listening.
|
||||
---
|
||||
---@param payload string APC sequence to send (full escape sequence including prefix/suffix)
|
||||
---@param opts {timeout?:integer} Options table (timeout in milliseconds, default 1000)
|
||||
---@param opts {timeout?:integer, chan?:integer} Options table (timeout in milliseconds, default 1000)
|
||||
---@param on_response fun(resp:string):boolean? Callback invoked for each APC TermResponse
|
||||
---@overload fun(payload:string, on_response:fun(resp:string):boolean?)
|
||||
function M.query_apc(payload, opts, on_response)
|
||||
|
||||
Reference in New Issue
Block a user