aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-09-11 22:29:28 -0700
committerJustin M. Keyes <justinkz@gmail.com>2019-09-12 17:04:05 -0700
commit44d45e29ea4a632e66ac63d25d355a5a4c7178bc (patch)
tree54be63ddaa5e62761f7bb796b713db1503b7f588
parent6dd56d09025c960ef36952e3d4a1f77779782c52 (diff)
downloadrneovim-44d45e29ea4a632e66ac63d25d355a5a4c7178bc.tar.gz
rneovim-44d45e29ea4a632e66ac63d25d355a5a4c7178bc.tar.bz2
rneovim-44d45e29ea4a632e66ac63d25d355a5a4c7178bc.zip
API/nvim_list_uis(): include "chan" field for TUI
Even though it's always zero currently, it's less confusing if all UIs have the same fields.
-rw-r--r--src/nvim/ui.c4
-rw-r--r--src/nvim/ui_bridge.c6
-rw-r--r--test/functional/terminal/tui_spec.lua4
3 files changed, 9 insertions, 5 deletions
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 4096bc1e8e..9ff2381189 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -484,9 +484,7 @@ Array ui_array(void)
PUT(info, ui_ext_names[j], BOOLEAN_OBJ(ui->ui_ext[j]));
}
}
- if (ui->inspect) {
- ui->inspect(ui, &info);
- }
+ ui->inspect(ui, &info);
ADD(all_uis, DICTIONARY_OBJ(info));
}
return all_uis;
diff --git a/src/nvim/ui_bridge.c b/src/nvim/ui_bridge.c
index a64e691b6d..9a1988739c 100644
--- a/src/nvim/ui_bridge.c
+++ b/src/nvim/ui_bridge.c
@@ -63,6 +63,7 @@ UI *ui_bridge_attach(UI *ui, ui_main_fn ui_main, event_scheduler scheduler)
rv->bridge.set_icon = ui_bridge_set_icon;
rv->bridge.option_set = ui_bridge_option_set;
rv->bridge.raw_line = ui_bridge_raw_line;
+ rv->bridge.inspect = ui_bridge_inspect;
rv->scheduler = scheduler;
for (UIExtension i = 0; (int)i < kUIExtCount; i++) {
@@ -215,3 +216,8 @@ static void ui_bridge_option_set_event(void **argv)
api_free_object(value);
xfree(argv[3]);
}
+
+static void ui_bridge_inspect(UI *ui, Dictionary *info)
+{
+ PUT(*info, "chan", INTEGER_OBJ(0));
+}
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index 789f5d4c2f..725a6db225 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -721,8 +721,8 @@ describe('TUI', function()
|
{4:~ }|
{5: }|
- [[['height', 6], ['override', v:false], ['rgb', v:|
- false], ['width', 50]]] |
+ [[['chan', 0], ['height', 6], ['override', v:false|
+ ], ['rgb', v:false], ['width', 50]]] |
{10:Press ENTER or type command to continue}{1: } |
{3:-- TERMINAL --} |
]=])