mirror of
https://github.com/neovim/neovim.git
synced 2025-09-06 03:18:16 +00:00
feat(api): more fields in nvim_list_uis
Problem: nvim_list_uis does not report all ":help ui-option" fields. Solution: Store ":help ui-option" fields on the `UI` object and update ui_array.
This commit is contained in:
@@ -3868,6 +3868,7 @@ has({feature}) Returns 1 if {feature} is supported, 0 otherwise. The
|
|||||||
clipboard |clipboard| provider is available.
|
clipboard |clipboard| provider is available.
|
||||||
fname_case Case in file names matters (for Darwin and MS-Windows
|
fname_case Case in file names matters (for Darwin and MS-Windows
|
||||||
this is not present).
|
this is not present).
|
||||||
|
gui_running Nvim has a GUI.
|
||||||
iconv Can use |iconv()| for conversion.
|
iconv Can use |iconv()| for conversion.
|
||||||
linux Linux system.
|
linux Linux system.
|
||||||
mac MacOS system.
|
mac MacOS system.
|
||||||
|
@@ -179,6 +179,8 @@ The following new APIs or features were added.
|
|||||||
|
|
||||||
Additionally |TSNode:range()| now takes an optional {include_bytes} argument.
|
Additionally |TSNode:range()| now takes an optional {include_bytes} argument.
|
||||||
|
|
||||||
|
• |nvim_list_uis()| reports all |ui-option| fields.
|
||||||
|
|
||||||
==============================================================================
|
==============================================================================
|
||||||
CHANGED FEATURES *news-changes*
|
CHANGED FEATURES *news-changes*
|
||||||
|
|
||||||
|
@@ -53,9 +53,8 @@ with these (optional) keys:
|
|||||||
- `term_name` Sets the name of the terminal 'term'.
|
- `term_name` Sets the name of the terminal 'term'.
|
||||||
- `term_colors` Sets the number of supported colors 't_Co'.
|
- `term_colors` Sets the number of supported colors 't_Co'.
|
||||||
- `term_background` Sets the default value of 'background'.
|
- `term_background` Sets the default value of 'background'.
|
||||||
- `stdin_fd` Read buffer from `fd` as if it was a stdin pipe.
|
- `stdin_fd` Read buffer 1 from this fd as if it were stdin |--|.
|
||||||
This option can only used by |--embed| ui on startup.
|
Only from |--embed| UI on startup. |ui-startup-stdin|
|
||||||
See |ui-startup-stdin|.
|
|
||||||
- `stdin_tty` Tells if `stdin` is a `tty` or not.
|
- `stdin_tty` Tells if `stdin` is a `tty` or not.
|
||||||
- `stdout_tty` Tells if `stdout` is a `tty` or not.
|
- `stdout_tty` Tells if `stdout` is a `tty` or not.
|
||||||
|
|
||||||
|
@@ -113,6 +113,10 @@ void remote_ui_disconnect(uint64_t channel_id)
|
|||||||
kv_destroy(data->call_buf);
|
kv_destroy(data->call_buf);
|
||||||
pmap_del(uint64_t)(&connected_uis, channel_id);
|
pmap_del(uint64_t)(&connected_uis, channel_id);
|
||||||
ui_detach_impl(ui, channel_id);
|
ui_detach_impl(ui, channel_id);
|
||||||
|
|
||||||
|
// Destroy `ui`.
|
||||||
|
XFREE_CLEAR(ui->term_name);
|
||||||
|
XFREE_CLEAR(ui->term_background);
|
||||||
xfree(ui);
|
xfree(ui);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -163,15 +167,9 @@ void nvim_ui_attach(uint64_t channel_id, Integer width, Integer height, Dictiona
|
|||||||
UI *ui = xcalloc(1, sizeof(UI));
|
UI *ui = xcalloc(1, sizeof(UI));
|
||||||
ui->width = (int)width;
|
ui->width = (int)width;
|
||||||
ui->height = (int)height;
|
ui->height = (int)height;
|
||||||
ui->pum_nlines = 0;
|
|
||||||
ui->pum_pos = false;
|
|
||||||
ui->pum_width = 0.0;
|
|
||||||
ui->pum_height = 0.0;
|
|
||||||
ui->pum_row = -1.0;
|
ui->pum_row = -1.0;
|
||||||
ui->pum_col = -1.0;
|
ui->pum_col = -1.0;
|
||||||
ui->rgb = true;
|
ui->rgb = true;
|
||||||
ui->override = false;
|
|
||||||
|
|
||||||
CLEAR_FIELD(ui->ui_ext);
|
CLEAR_FIELD(ui->ui_ext);
|
||||||
|
|
||||||
for (size_t i = 0; i < options.size; i++) {
|
for (size_t i = 0; i < options.size; i++) {
|
||||||
@@ -320,6 +318,7 @@ static void ui_set_option(UI *ui, bool init, String name, Object value, Error *e
|
|||||||
return;
|
return;
|
||||||
});
|
});
|
||||||
set_tty_option("term", string_to_cstr(value.data.string));
|
set_tty_option("term", string_to_cstr(value.data.string));
|
||||||
|
ui->term_name = string_to_cstr(value.data.string);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -328,6 +327,7 @@ static void ui_set_option(UI *ui, bool init, String name, Object value, Error *e
|
|||||||
return;
|
return;
|
||||||
});
|
});
|
||||||
t_colors = (int)value.data.integer;
|
t_colors = (int)value.data.integer;
|
||||||
|
ui->term_colors = (int)value.data.integer;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -336,6 +336,7 @@ static void ui_set_option(UI *ui, bool init, String name, Object value, Error *e
|
|||||||
return;
|
return;
|
||||||
});
|
});
|
||||||
set_tty_background(value.data.string.data);
|
set_tty_background(value.data.string.data);
|
||||||
|
ui->term_background = string_to_cstr(value.data.string);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -351,6 +352,7 @@ static void ui_set_option(UI *ui, bool init, String name, Object value, Error *e
|
|||||||
});
|
});
|
||||||
|
|
||||||
stdin_fd = (int)value.data.integer;
|
stdin_fd = (int)value.data.integer;
|
||||||
|
ui->stdin_fd = (int)value.data.integer;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -359,6 +361,7 @@ static void ui_set_option(UI *ui, bool init, String name, Object value, Error *e
|
|||||||
return;
|
return;
|
||||||
});
|
});
|
||||||
stdin_isatty = value.data.boolean;
|
stdin_isatty = value.data.boolean;
|
||||||
|
ui->stdin_tty = value.data.boolean;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -367,6 +370,7 @@ static void ui_set_option(UI *ui, bool init, String name, Object value, Error *e
|
|||||||
return;
|
return;
|
||||||
});
|
});
|
||||||
stdout_isatty = value.data.boolean;
|
stdout_isatty = value.data.boolean;
|
||||||
|
ui->stdout_tty = value.data.boolean;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -598,6 +598,15 @@ Array ui_array(void)
|
|||||||
PUT(info, "height", INTEGER_OBJ(ui->height));
|
PUT(info, "height", INTEGER_OBJ(ui->height));
|
||||||
PUT(info, "rgb", BOOLEAN_OBJ(ui->rgb));
|
PUT(info, "rgb", BOOLEAN_OBJ(ui->rgb));
|
||||||
PUT(info, "override", BOOLEAN_OBJ(ui->override));
|
PUT(info, "override", BOOLEAN_OBJ(ui->override));
|
||||||
|
|
||||||
|
// TUI fields.
|
||||||
|
PUT(info, "term_name", STRING_OBJ(cstr_to_string(ui->term_name)));
|
||||||
|
PUT(info, "term_background", STRING_OBJ(cstr_to_string(ui->term_background)));
|
||||||
|
PUT(info, "term_colors", INTEGER_OBJ(ui->term_colors));
|
||||||
|
PUT(info, "stdin_fd", INTEGER_OBJ(ui->stdin_fd));
|
||||||
|
PUT(info, "stdin_tty", BOOLEAN_OBJ(ui->stdin_tty));
|
||||||
|
PUT(info, "stdout_tty", BOOLEAN_OBJ(ui->stdout_tty));
|
||||||
|
|
||||||
for (UIExtension j = 0; j < kUIExtCount; j++) {
|
for (UIExtension j = 0; j < kUIExtCount; j++) {
|
||||||
if (ui_ext_names[j][0] != '_' || ui->ui_ext[j]) {
|
if (ui_ext_names[j][0] != '_' || ui->ui_ext[j]) {
|
||||||
PUT(info, ui_ext_names[j], BOOLEAN_OBJ(ui->ui_ext[j]));
|
PUT(info, ui_ext_names[j], BOOLEAN_OBJ(ui->ui_ext[j]));
|
||||||
|
@@ -103,6 +103,14 @@ struct ui_t {
|
|||||||
double pum_height;
|
double pum_height;
|
||||||
double pum_width;
|
double pum_width;
|
||||||
|
|
||||||
|
// TUI fields.
|
||||||
|
char *term_name;
|
||||||
|
char *term_background;
|
||||||
|
int term_colors;
|
||||||
|
int stdin_fd;
|
||||||
|
bool stdin_tty;
|
||||||
|
bool stdout_tty;
|
||||||
|
|
||||||
// TODO(bfredl): integrate into struct!
|
// TODO(bfredl): integrate into struct!
|
||||||
UIData data[1];
|
UIData data[1];
|
||||||
};
|
};
|
||||||
|
@@ -1,6 +1,8 @@
|
|||||||
// This is an open source non-commercial project. Dear PVS-Studio, please check
|
// This is an open source non-commercial project. Dear PVS-Studio, please check
|
||||||
// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
|
// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
|
||||||
|
|
||||||
|
/// Nvim's own UI client, which attaches to a child or remote Nvim server.
|
||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@@ -2549,20 +2549,26 @@ describe('API', function()
|
|||||||
{
|
{
|
||||||
chan = 1,
|
chan = 1,
|
||||||
ext_cmdline = false,
|
ext_cmdline = false,
|
||||||
|
ext_hlstate = false,
|
||||||
|
ext_linegrid = screen._options.ext_linegrid or false,
|
||||||
|
ext_messages = false,
|
||||||
|
ext_multigrid = false,
|
||||||
ext_popupmenu = false,
|
ext_popupmenu = false,
|
||||||
ext_tabline = false,
|
ext_tabline = false,
|
||||||
ext_wildmenu = false,
|
|
||||||
ext_linegrid = screen._options.ext_linegrid or false,
|
|
||||||
ext_multigrid = false,
|
|
||||||
ext_hlstate = false,
|
|
||||||
ext_termcolors = false,
|
ext_termcolors = false,
|
||||||
ext_messages = false,
|
ext_wildmenu = false,
|
||||||
height = 4,
|
height = 4,
|
||||||
rgb = true,
|
|
||||||
override = true,
|
override = true,
|
||||||
|
rgb = true,
|
||||||
|
stdin_tty = false,
|
||||||
|
stdout_tty = false,
|
||||||
|
term_background = '',
|
||||||
|
term_colors = 0,
|
||||||
|
term_name = '',
|
||||||
width = 20,
|
width = 20,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
eq(expected, nvim("list_uis"))
|
eq(expected, nvim("list_uis"))
|
||||||
|
|
||||||
screen:detach()
|
screen:detach()
|
||||||
|
@@ -1398,17 +1398,32 @@ describe('TUI', function()
|
|||||||
]]}
|
]]}
|
||||||
end)
|
end)
|
||||||
|
|
||||||
it('is included in nvim_list_uis()', function()
|
it('in nvim_list_uis()', function()
|
||||||
feed_data(':echo map(nvim_list_uis(), {k,v -> sort(items(filter(v, {k,v -> k[:3] !=# "ext_" })))})\r')
|
local expected = {
|
||||||
screen:expect([=[
|
{
|
||||||
|
|
chan = 1,
|
||||||
{4:~ }|
|
ext_cmdline = false,
|
||||||
{5: }|
|
ext_hlstate = false,
|
||||||
[[['chan', 1], ['height', 6], ['override', v:false|
|
ext_linegrid = true,
|
||||||
], ['rgb', v:false], ['width', 50]]] |
|
ext_messages = false,
|
||||||
{10:Press ENTER or type command to continue}{1: } |
|
ext_multigrid = false,
|
||||||
{3:-- TERMINAL --} |
|
ext_popupmenu = false,
|
||||||
]=])
|
ext_tabline = false,
|
||||||
|
ext_termcolors = true,
|
||||||
|
ext_wildmenu = false,
|
||||||
|
height = 6,
|
||||||
|
override = false,
|
||||||
|
rgb = false,
|
||||||
|
stdin_tty = true,
|
||||||
|
stdout_tty = true,
|
||||||
|
term_background = '',
|
||||||
|
term_colors = 256,
|
||||||
|
term_name = 'xterm-256color', -- $TERM in :terminal.
|
||||||
|
width = 50
|
||||||
|
},
|
||||||
|
}
|
||||||
|
local _, rv = child_session:request('nvim_list_uis')
|
||||||
|
eq(expected, rv)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
it('allows grid to assume wider ambiguous-width characters than host terminal #19686', function()
|
it('allows grid to assume wider ambiguous-width characters than host terminal #19686', function()
|
||||||
|
Reference in New Issue
Block a user