mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-14 05:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

API: Refactor: Return handles instead of indexes

Browse Source 
- 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:
Thiago de Arruda
2014-05-23 15:49:44 -03:00
parent f70f9bfac1
commit a842fe4dc1
9 changed files with 109 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/api/private/defs.h
View File

@@ -34,6 +34,9 @@ REMOTE_TYPE(Tabpage);
typedef struct object Object;
TYPED_ARRAY_OF(Buffer);
TYPED_ARRAY_OF(Window);
TYPED_ARRAY_OF(Tabpage);
TYPED_ARRAY_OF(String);
typedef struct {

31
src/nvim/api/private/helpers.c
View File

@@ -4,6 +4,7 @@
#include "nvim/api/private/helpers.h"
#include "nvim/api/private/defs.h"
#include "nvim/api/private/handle.h"
#include "nvim/vim.h"
#include "nvim/buffer.h"
#include "nvim/window.h"
@@ -285,43 +286,29 @@ Object vim_to_object(typval_T *obj)
buf_T *find_buffer(Buffer buffer, Error *err)
{
if (buffer > INT_MAX) {
set_api_error("Invalid buffer id", err);
return NULL;
}
buf_T *rv = handle_get_buffer(buffer);
buf_T *buf = buflist_findnr((int)buffer);
if (buf == NULL) {
if (!rv) {
set_api_error("Invalid buffer id", err);
}
return buf;
return rv;
}
win_T * find_window(Window window, Error *err)
{
tabpage_T *tp;
win_T *wp;
win_T *rv = handle_get_window(window);
FOR_ALL_TAB_WINDOWS(tp, wp) {
if (!--window) {
return wp;
}
if (!rv) {
set_api_error("Invalid window id", err);
}
set_api_error("Invalid window id", err);
return NULL;
return rv;
}
tabpage_T * find_tab(Tabpage tabpage, Error *err)
{
if (tabpage > INT_MAX) {
set_api_error("Invalid tabpage id", err);
return NULL;
}
tabpage_T *rv = find_tabpage((int)tabpage);
tabpage_T *rv = handle_get_tabpage(tabpage);
if (!rv) {
set_api_error("Invalid tabpage id", err);