GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 01:01:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(extui): incorrect cmdline cursor position (#34201)

Browse Source 
Problem:  Calculated cmdline cursor position can be smaller than 0.
          Prompt part of the cmdline is translated, while it should
          support "\t" characters.
Solution: Remove prompt part from the stored "cmdbuff" and get rid of
          dubious +/-1 from cmdline cursor calculation.
This commit is contained in:
luukvbaal
2025-05-27 12:38:18 +02:00
committed by GitHub
parent 8defe1afb2
commit 3828856233
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/lua/vim/_extui/cmdline.lua
View File

@ -39,12 +39,11 @@ local promptlen = 0 -- Current length of the prompt, stored for use in "cmdline_
---@param content CmdContent
---@param prompt string
local function set_text(content, prompt)
promptlen = #prompt
promptlen, cmdbuff = #prompt, ''
for _, chunk in ipairs(content) do
prompt = prompt .. chunk[2]
cmdbuff = cmdbuff .. chunk[2]
end
cmdbuff = prompt
api.nvim_buf_set_lines(ext.bufs.cmd, M.row, -1, false, { fn.strtrans(cmdbuff) .. ' ' })
api.nvim_buf_set_lines(ext.bufs.cmd, M.row, -1, false, { prompt .. fn.strtrans(cmdbuff) .. ' ' })
end
--- Set the cmdline buffer text and cursor position.
@ -95,7 +94,7 @@ local curpos = { 0, 0 } -- Last drawn cursor position.
---@param pos integer
--@param level integer
function M.cmdline_pos(pos)
pos = #fn.strtrans(cmdbuff:sub(1, pos + 1)) - 1
pos = #fn.strtrans(cmdbuff:sub(1, pos))
if curpos[1] ~= M.row + 1 or curpos[2] ~= promptlen + pos then
curpos[1], curpos[2] = M.row + 1, promptlen + pos
-- Add matchparen highlighting to non-prompt part of cmdline.