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

feat(api): allow open_win/win_set_buf in the cmdwin in some cases

Browse Source 
Problem: As discussed on Matrix, there was some interest in having
`nvim_open_win` again be able to open floats in the cmdwin (e.g: displaying a
hover doc related to what's in the cmdwin). After #23228, this was disallowed.

Solution: Allow `nvim_open_win` in the cmdwin as long as `!enter` and
`buffer != curbuf` (the former can cause all sorts of issues, and the latter
can crash Nvim after closing cmdwin). Also allow `nvim_win_set_buf` in a similar
fashion.

Note that we're not *entirely* sure if this is 100% safe (cmdwin is a
global-state-using-main-loop-calling beast), but this seems to work OK..?

Also:
  - Check the buffer argument of `nvim_open_win` earlier, and abort if it's
    invalid (it used to still open a window in this case).

  - Untranslate `e_cmdwin` errors in the API (other errors in the API are not
    translated: although not detailed in the API contract yet, errors are
    supposed to be stable).
This commit is contained in:
Sean Dewar
2023-07-23 19:50:20 +01:00
parent ccf328172b
commit 6b4970f6e0
6 changed files with 71 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/api/window.c
View File

@@ -50,9 +50,18 @@ Buffer nvim_win_get_buf(Window window, Error *err)
/// @param[out] err Error details, if any
void nvim_win_set_buf(Window window, Buffer buffer, Error *err)
FUNC_API_SINCE(5)
FUNC_API_TEXTLOCK
FUNC_API_TEXTLOCK_ALLOW_CMDWIN
{
win_set_buf(window, buffer, false, err);
win_T *win = find_window_by_handle(window, err);
buf_T *buf = find_buffer_by_handle(buffer, err);
if (!win || !buf) {
return;
}
if (cmdwin_type != 0 && (win == curwin || buf == curbuf)) {
api_set_error(err, kErrorTypeException, "%s", e_cmdwin);
return;
}
win_set_buf(win, buf, false, err);
}
/// Gets the (1,0)-indexed, buffer-relative cursor position for a given window
@@ -396,7 +405,7 @@ void nvim_win_close(Window window, Boolean force, Error *err)
if (win == curwin) {
cmdwin_result = Ctrl_C;
} else {
api_set_error(err, kErrorTypeException, "%s", _(e_cmdwin));
api_set_error(err, kErrorTypeException, "%s", e_cmdwin);
}
return;
}