mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 04:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(move): wrong cursor row on concealed line (#32629)

Browse Source 
Problem:  Cursor row calculation does not take into account concealed lines.
Solution: Break the loop when the next calculated line is concealed.
This commit is contained in:
luukvbaal
2025-02-25 23:45:52 +01:00
committed by GitHub
parent c3337e357a
commit af0a2157ad
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/move.c
View File

@@ -641,9 +641,9 @@ void validate_cursor(win_T *wp)
static void curs_rows(win_T *wp) static void curs_rows(win_T *wp)
{ {
// Check if wp->w_lines[].wl_size is invalid // Check if wp->w_lines[].wl_size is invalid
int all_invalid = (!redrawing() bool all_invalid = (!redrawing()
|| wp->w_lines_valid == 0 || wp->w_lines_valid == 0
|| wp->w_lines[0].wl_lnum > wp->w_topline); || wp->w_lines[0].wl_lnum > wp->w_topline);
int i = 0; int i = 0;
wp->w_cline_row = 0; wp->w_cline_row = 0;
for (linenr_T lnum = wp->w_topline; lnum < wp->w_cursor.lnum; i++) { for (linenr_T lnum = wp->w_topline; lnum < wp->w_cursor.lnum; i++) {
@@ -667,7 +667,7 @@ static void curs_rows(win_T *wp)
} }
if (valid && (lnum != wp->w_topline || (wp->w_skipcol == 0 && !win_may_fill(wp)))) { if (valid && (lnum != wp->w_topline || (wp->w_skipcol == 0 && !win_may_fill(wp)))) {
lnum = wp->w_lines[i].wl_lastlnum + 1; lnum = wp->w_lines[i].wl_lastlnum + 1;
// Cursor inside folded lines, don't count this row // Cursor inside folded or concealed lines, don't count this row
if (lnum > wp->w_cursor.lnum) { if (lnum > wp->w_cursor.lnum) {
break; break;
} }
@@ -677,7 +677,7 @@ static void curs_rows(win_T *wp)
bool folded; bool folded;
int n = plines_correct_topline(wp, lnum, &last, true, &folded); int n = plines_correct_topline(wp, lnum, &last, true, &folded);
lnum = last + 1; lnum = last + 1;
if (folded && lnum > wp->w_cursor.lnum) { if (lnum + decor_conceal_line(wp, lnum - 1, false) > wp->w_cursor.lnum) {
break; break;
} }
wp->w_cline_row += n; wp->w_cline_row += n;

10
test/functional/plugin/lsp/utils_spec.lua
View File

@@ -356,5 +356,15 @@ describe('vim.lsp.util', function()
{1:~ }|*9 {1:~ }|*9
| |
]]) ]])
-- Entering window keeps lines concealed and doesn't end up below inner window size.
feed('<C-w>wG')
screen:expect([[
|
┌─────────┐{1: }|
│{100:^local}{101: }{102:foo}│{1: }|
└─────────┘{1: }|
{1:~ }|*9
|
]])
end) end)
end) end)