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

fix(mouse): mouseclick after conceal_lines is miscalculated #33451

Browse Source 
Problem:  Computed buffer line for mouse position does not take into
          account concealed lines on the reached row.

Solution: Adjust for concealed lines at the end of the loop computing
          the buffer position.
(cherry picked from commit 2f8fb4f28a)
This commit is contained in:
luukvbaal
2025-04-13 23:30:24 +02:00
committed by github-actions[bot]
parent 8aa49a8e9b
commit 526444c4ff
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/mouse.c
View File

@ -9,6 +9,7 @@
#include "nvim/buffer_defs.h"
#include "nvim/charset.h"
#include "nvim/cursor.h"
#include "nvim/decoration.h"
#include "nvim/drawscreen.h"
#include "nvim/edit.h"
#include "nvim/eval.h"
@ -1659,6 +1660,12 @@ bool mouse_comp_pos(win_T *win, int *rowp, int *colp, linenr_T *lnump)
lnum++;
}
// Mouse row reached, adjust lnum for concealed lines.
while (decor_conceal_line(win, lnum - 1, false)) {
lnum++;
hasFolding(win, lnum, NULL, &lnum);
}
if (!retval) {
// Compute the column without wrapping.
int off = win_col_off(win) - win_col_off2(win);

8
test/functional/ui/mouse_spec.lua
View File

@ -2082,4 +2082,12 @@ describe('ui/mouse/input', function()
feed('<Down><Down><CR>')
eq('bar', api.nvim_get_var('menustr'))
end)
it('below a concealed line #33450', function()
api.nvim_set_option_value('conceallevel', 2, {})
api.nvim_buf_set_extmark(0, api.nvim_create_namespace(''), 1, 0, { conceal_lines = '' })
api.nvim_input_mouse('right', 'press', '', 0, 1, 0)
api.nvim_input_mouse('right', 'release', '', 0, 1, 0)
eq(3, fn.line('.'))
end)
end)