diff options
| author | bfredl <bjorn.linse@gmail.com> | 2024-04-22 13:31:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 13:31:41 +0200 |
| commit | f2db5521eb545e451f261470c6bfc31dfac11887 (patch) | |
| tree | 517117509ac6111e2cae27355d0b1aa207f2e47e | |
| parent | fb5e2db4c72251ac8f59a7b80fc6d6b40dbec1d8 (diff) | |
| parent | 5f18dd30137565da782c155b52b530c172b3b29d (diff) | |
| download | rneovim-f2db5521eb545e451f261470c6bfc31dfac11887.tar.gz rneovim-f2db5521eb545e451f261470c6bfc31dfac11887.tar.bz2 rneovim-f2db5521eb545e451f261470c6bfc31dfac11887.zip | |
Merge pull request #28434 from glepnir/23120
fix(float): wrong position when bufpos is out of range
| -rw-r--r-- | src/nvim/window.c | 3 | ||||
| -rw-r--r-- | src/nvim/winfloat.c | 2 | ||||
| -rw-r--r-- | test/functional/ui/float_spec.lua | 37 |
3 files changed, 40 insertions, 2 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index 07e769b7ac..4c3fb5770c 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -827,7 +827,8 @@ void ui_ext_win_position(win_T *wp, bool validate) row += row_off; col += col_off; if (c.bufpos.lnum >= 0) { - pos_T pos = { c.bufpos.lnum + 1, c.bufpos.col, 0 }; + int lnum = MIN(c.bufpos.lnum + 1, win->w_buffer->b_ml.ml_line_count); + pos_T pos = { lnum, c.bufpos.col, 0 }; int trow, tcol, tcolc, tcole; textpos2screenpos(win, &pos, &trow, &tcol, &tcolc, &tcole, true); row += trow - 1; diff --git a/src/nvim/winfloat.c b/src/nvim/winfloat.c index 65d2c1306b..f271f7d055 100644 --- a/src/nvim/winfloat.c +++ b/src/nvim/winfloat.c @@ -221,7 +221,7 @@ void win_config_float(win_T *wp, WinConfig fconfig) row += row_off; col += col_off; if (wp->w_config.bufpos.lnum >= 0) { - pos_T pos = { wp->w_config.bufpos.lnum + 1, + pos_T pos = { MIN(wp->w_config.bufpos.lnum + 1, parent->w_buffer->b_ml.ml_line_count), wp->w_config.bufpos.col, 0 }; int trow, tcol, tcolc, tcole; textpos2screenpos(parent, &pos, &trow, &tcol, &tcolc, &tcole, true); diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua index d3a20ca021..99cb2e56f4 100644 --- a/test/functional/ui/float_spec.lua +++ b/test/functional/ui/float_spec.lua @@ -9275,6 +9275,43 @@ describe('float window', function() api.nvim_set_current_win(winid) eq("floating window cannot be relative to itself", pcall_err(api.nvim_win_set_config, winid, config)) end) + + it("bufpos out of range", function() + local buf = api.nvim_create_buf(false, true) + api.nvim_buf_set_lines(0, 0, -1, false, {}) + local config = { relative='win', width=5, height=2, row=0, col=0, bufpos = { 3, 3 } } + api.nvim_open_win(buf, false, config) + if multigrid then + screen:expect({ + grid = [[ + ## grid 1 + [2:----------------------------------------]|*6 + [3:----------------------------------------]| + ## grid 2 + ^ | + {0:~ }|*5 + ## grid 3 + | + ## grid 4 + {1: }| + {2:~ }| + ]], float_pos={ + [4] = {1001, "NW", 2, 0, 0, true, 50}; + }, win_viewport={ + [2] = {win = 1000, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0}; + [4] = {win = 1001, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0}; + }}) + else + screen:expect({ + grid = [[ + {1:^ } | + {2:~ }{0: }| + {0:~ }|*4 + | + ]] + }) + end + end) end describe('with ext_multigrid', function() |