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

Merge pull request #18398 from vigoux/perf/ts_reuse_list

Browse Source 
perf(treesitter): use a reuse list for query cursors
This commit is contained in:
bfredl
2022-05-03 21:11:10 +02:00
committed by GitHub
parent 8ef03188e6 a0f17fd4d8
commit 9005ffbe77
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/lua/treesitter.c
View File

@@ -16,6 +16,7 @@
#include "nvim/api/private/helpers.h" #include "nvim/api/private/helpers.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/lib/kvec.h"
#include "nvim/lua/treesitter.h" #include "nvim/lua/treesitter.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "tree_sitter/api.h" #include "tree_sitter/api.h"
@@ -104,6 +105,7 @@ static struct luaL_Reg treecursor_meta[] = {
{ NULL, NULL } { NULL, NULL }
}; };
static kvec_t(TSQueryCursor *) cursors = KV_INITIAL_VALUE;
static PMap(cstr_t) langs = MAP_INIT; static PMap(cstr_t) langs = MAP_INIT;
static void build_meta(lua_State *L, const char *tname, const luaL_Reg *meta) static void build_meta(lua_State *L, const char *tname, const luaL_Reg *meta)
@@ -1116,9 +1118,13 @@ static int node_rawquery(lua_State *L)
return 0; return 0;
} }
TSQuery *query = query_check(L, 2); TSQuery *query = query_check(L, 2);
// TODO(bfredl): these are expensive allegedly,
// use a reuse list later on? TSQueryCursor *cursor;
TSQueryCursor *cursor = ts_query_cursor_new(); if (kv_size(cursors) > 0) {
cursor = kv_pop(cursors);
} else {
cursor = ts_query_cursor_new();
}
// TODO(clason): API introduced after tree-sitter release 0.19.5 // TODO(clason): API introduced after tree-sitter release 0.19.5
// remove guard when minimum ts version is bumped to 0.19.6+ // remove guard when minimum ts version is bumped to 0.19.6+
#ifdef NVIM_TS_HAS_SET_MATCH_LIMIT #ifdef NVIM_TS_HAS_SET_MATCH_LIMIT
@@ -1161,7 +1167,8 @@ static int node_rawquery(lua_State *L)
static int querycursor_gc(lua_State *L) static int querycursor_gc(lua_State *L)
{ {
TSLua_cursor *ud = luaL_checkudata(L, 1, TS_META_QUERYCURSOR); TSLua_cursor *ud = luaL_checkudata(L, 1, TS_META_QUERYCURSOR);
ts_query_cursor_delete(ud->cursor); kv_push(cursors, ud->cursor);
ud->cursor = NULL;
return 0; return 0;
} }