mirror of
https://github.com/neovim/neovim.git
synced 2025-09-07 11:58:17 +00:00
API: Refactor: Return handles instead of indexes
- Define specialized arrays for each remote object type - Implement msgpack_rpc functions for dealing with the new types - Refactor all functions dealing with buffers, windows and tabpages to return/accept handles instead of list indexes.
This commit is contained in:
@@ -142,27 +142,17 @@ void vim_change_directory(String dir, Error *err)
|
||||
|
||||
String vim_get_current_line(Error *err)
|
||||
{
|
||||
assert(curbuf->b_fnum >= 0);
|
||||
return buffer_get_line((uint64_t)curbuf->b_fnum,
|
||||
curwin->w_cursor.lnum - 1,
|
||||
err);
|
||||
return buffer_get_line(curbuf->handle, curwin->w_cursor.lnum - 1, err);
|
||||
}
|
||||
|
||||
void vim_set_current_line(String line, Error *err)
|
||||
{
|
||||
assert(curbuf->b_fnum >= 0);
|
||||
buffer_set_line((uint64_t)curbuf->b_fnum,
|
||||
curwin->w_cursor.lnum - 1,
|
||||
line,
|
||||
err);
|
||||
buffer_set_line(curbuf->handle, curwin->w_cursor.lnum - 1, line, err);
|
||||
}
|
||||
|
||||
void vim_del_current_line(Error *err)
|
||||
{
|
||||
assert(curbuf->b_fnum >= 0);
|
||||
buffer_del_line((uint64_t)curbuf->b_fnum,
|
||||
curwin->w_cursor.lnum - 1,
|
||||
err);
|
||||
buffer_del_line(curbuf->handle, curwin->w_cursor.lnum - 1, err);
|
||||
}
|
||||
|
||||
Object vim_get_var(String name, Error *err)
|
||||
@@ -200,33 +190,43 @@ void vim_err_write(String str)
|
||||
write_msg(str, true);
|
||||
}
|
||||
|
||||
Integer vim_get_buffer_count(void)
|
||||
BufferArray vim_get_buffers(void)
|
||||
{
|
||||
BufferArray rv = {.size = 0};
|
||||
buf_T *b = firstbuf;
|
||||
Integer n = 0;
|
||||
|
||||
while (b) {
|
||||
n++;
|
||||
rv.size++;
|
||||
b = b->b_next;
|
||||
}
|
||||
|
||||
return n;
|
||||
rv.items = xmalloc(sizeof(Buffer) * rv.size);
|
||||
size_t i = 0;
|
||||
b = firstbuf;
|
||||
|
||||
while (b) {
|
||||
rv.items[i++] = b->handle;
|
||||
b = b->b_next;
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
Buffer vim_get_current_buffer(void)
|
||||
{
|
||||
assert(curbuf->b_fnum >= 0);
|
||||
return (uint64_t)curbuf->b_fnum;
|
||||
return curbuf->handle;
|
||||
}
|
||||
|
||||
void vim_set_current_buffer(Buffer buffer, Error *err)
|
||||
{
|
||||
if (!find_buffer(buffer, err)) {
|
||||
buf_T *buf = find_buffer(buffer, err);
|
||||
|
||||
if (!buf) {
|
||||
return;
|
||||
}
|
||||
|
||||
try_start();
|
||||
if (do_buffer(DOBUF_GOTO, DOBUF_FIRST, FORWARD, (int)buffer, 0) == FAIL) {
|
||||
if (do_buffer(DOBUF_GOTO, DOBUF_FIRST, FORWARD, buf->b_fnum, 0) == FAIL) {
|
||||
if (try_end(err)) {
|
||||
return;
|
||||
}
|
||||
@@ -240,14 +240,21 @@ void vim_set_current_buffer(Buffer buffer, Error *err)
|
||||
try_end(err);
|
||||
}
|
||||
|
||||
Integer vim_get_window_count(void)
|
||||
WindowArray vim_get_windows(void)
|
||||
{
|
||||
WindowArray rv = {.size = 0};
|
||||
tabpage_T *tp;
|
||||
win_T *wp;
|
||||
Integer rv = 0;
|
||||
|
||||
FOR_ALL_TAB_WINDOWS(tp, wp) {
|
||||
rv++;
|
||||
rv.size++;
|
||||
}
|
||||
|
||||
rv.items = xmalloc(sizeof(Window) * rv.size);
|
||||
size_t i = 0;
|
||||
|
||||
FOR_ALL_TAB_WINDOWS(tp, wp) {
|
||||
rv.items[i++] = wp->handle;
|
||||
}
|
||||
|
||||
return rv;
|
||||
@@ -255,20 +262,7 @@ Integer vim_get_window_count(void)
|
||||
|
||||
Window vim_get_current_window(void)
|
||||
{
|
||||
tabpage_T *tp;
|
||||
win_T *wp;
|
||||
Window rv = 1;
|
||||
|
||||
FOR_ALL_TAB_WINDOWS(tp, wp) {
|
||||
if (wp == curwin) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
rv++;
|
||||
}
|
||||
|
||||
// There should always be a current window
|
||||
abort();
|
||||
return curwin->handle;
|
||||
}
|
||||
|
||||
void vim_set_current_window(Window window, Error *err)
|
||||
@@ -280,7 +274,7 @@ void vim_set_current_window(Window window, Error *err)
|
||||
}
|
||||
|
||||
try_start();
|
||||
win_goto(win);
|
||||
goto_tabpage_win(win_find_tabpage(win), win);
|
||||
|
||||
if (win != curwin) {
|
||||
if (try_end(err)) {
|
||||
@@ -293,14 +287,23 @@ void vim_set_current_window(Window window, Error *err)
|
||||
try_end(err);
|
||||
}
|
||||
|
||||
Integer vim_get_tabpage_count(void)
|
||||
TabpageArray vim_get_tabpages(void)
|
||||
{
|
||||
TabpageArray rv = {.size = 0};
|
||||
tabpage_T *tp = first_tabpage;
|
||||
Integer rv = 0;
|
||||
|
||||
while (tp != NULL) {
|
||||
while (tp) {
|
||||
rv.size++;
|
||||
tp = tp->tp_next;
|
||||
}
|
||||
|
||||
rv.items = xmalloc(sizeof(Tabpage) * rv.size);
|
||||
size_t i = 0;
|
||||
tp = first_tabpage;
|
||||
|
||||
while (tp) {
|
||||
rv.items[i++] = tp->handle;
|
||||
tp = tp->tp_next;
|
||||
rv++;
|
||||
}
|
||||
|
||||
return rv;
|
||||
@@ -308,24 +311,19 @@ Integer vim_get_tabpage_count(void)
|
||||
|
||||
Tabpage vim_get_current_tabpage(void)
|
||||
{
|
||||
Tabpage rv = 1;
|
||||
tabpage_T *t;
|
||||
|
||||
for (t = first_tabpage; t != NULL && t != curtab; t = t->tp_next) {
|
||||
rv++;
|
||||
}
|
||||
|
||||
return rv;
|
||||
return curtab->handle;
|
||||
}
|
||||
|
||||
void vim_set_current_tabpage(Tabpage tabpage, Error *err)
|
||||
{
|
||||
if (!find_tab(tabpage, err)) {
|
||||
tabpage_T *tp = find_tab(tabpage, err);
|
||||
|
||||
if (!tp) {
|
||||
return;
|
||||
}
|
||||
|
||||
try_start();
|
||||
goto_tabpage((int)tabpage);
|
||||
goto_tabpage_tp(tp, true, true);
|
||||
try_end(err);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user