diff options
| author | luukvbaal <luukvbaal@gmail.com> | 2024-04-21 02:15:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-21 08:15:18 +0800 |
| commit | 344906a08f0972108eb912c87af32b275ecf318e (patch) | |
| tree | 6eb6b897b1a1c0082c6ce8c9986082983bb08ada | |
| parent | 9e1bbb9813e0ea4e37f6325fe00e8f43617ef912 (diff) | |
| download | rneovim-344906a08f0972108eb912c87af32b275ecf318e.tar.gz rneovim-344906a08f0972108eb912c87af32b275ecf318e.tar.bz2 rneovim-344906a08f0972108eb912c87af32b275ecf318e.zip | |
fix(api): do not update grid position in nvim_win_set_cursor (#28235)
Revert commit c971f538ab87b537ae4c97bd44167661c5691a2d.
Forcing grid cursor position will need a new API like originally proposed in #27858.
| -rw-r--r-- | src/nvim/api/window.c | 2 | ||||
| -rw-r--r-- | test/functional/api/window_spec.lua | 15 | ||||
| -rw-r--r-- | test/functional/ui/cmdline_spec.lua | 3 |
3 files changed, 3 insertions, 17 deletions
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c index 08ecca1380..54a19513db 100644 --- a/src/nvim/api/window.c +++ b/src/nvim/api/window.c @@ -148,7 +148,7 @@ void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err) switchwin_T switchwin; switch_win(&switchwin, win, NULL, true); update_topline(curwin); - setcursor_mayforce(true); + validate_cursor(curwin); restore_win(&switchwin, true); redraw_later(win, UPD_VALID); diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua index 14bb0c8697..36966b68f5 100644 --- a/test/functional/api/window_spec.lua +++ b/test/functional/api/window_spec.lua @@ -257,21 +257,6 @@ describe('API/win', function() -- curwin didn't change back neq(win, curwin()) - - -- shows updated position after getchar() #20793 - feed(':call getchar()<CR>') - api.nvim_win_set_cursor(win, { 1, 5 }) - screen:expect { - grid = [[ - | - {1:~ }|*2 - {2:[No Name] }| - prolo^gue | - |*2 - {3:[No Name] [+] }| - :call getchar() | - ]], - } end) it('remembers what column it wants to be in', function() diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua index d3d5cb1093..84aa153b0e 100644 --- a/test/functional/ui/cmdline_spec.lua +++ b/test/functional/ui/cmdline_spec.lua @@ -825,7 +825,8 @@ local function test_cmdline(linegrid) ]]) end) - it('does not move cursor to curwin #20309', function() + -- Needs new API + pending('does not move cursor to curwin #20309', function() local win = api.nvim_get_current_win() command('norm icmdlinewin') command('new') |