mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 05:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(treesitter): language loading

Browse Source
This commit is contained in:
Lewis Russell
2024-04-21 13:39:08 +01:00
committed by Lewis Russell
parent 6d732ad3c9
commit 032df963bb
2 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/lua/vim/treesitter/_meta.lua
View File

@@ -60,9 +60,17 @@ local TSNode = {}
---@field captures string[] ---@field captures string[]
---@field patterns table<integer, (integer|string)[][]> ---@field patterns table<integer, (integer|string)[][]>
--- @param lang string
vim._ts_inspect_language = function(lang) end
---@return integer ---@return integer
vim._ts_get_language_version = function() end vim._ts_get_language_version = function() end
--- @param path string
--- @param lang string
--- @param symbol_name? string
vim._ts_add_language = function(path, lang, symbol_name) end
---@return integer ---@return integer
vim._ts_get_minimum_language_version = function() end vim._ts_get_minimum_language_version = function() end

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

@@ -62,6 +62,35 @@ int tslua_has_language(lua_State *L)
return 1; return 1;
} }
static TSLanguage *load_language(lua_State *L, const char *path, const char *lang_name,
const char *symbol)
{
uv_lib_t lib;
if (uv_dlopen(path, &lib)) {
uv_dlclose(&lib);
luaL_error(L, "Failed to load parser for language '%s': uv_dlopen: %s",
lang_name, uv_dlerror(&lib));
}
char symbol_buf[128];
snprintf(symbol_buf, sizeof(symbol_buf), "tree_sitter_%s", symbol);
TSLanguage *(*lang_parser)(void);
if (uv_dlsym(&lib, symbol_buf, (void **)&lang_parser)) {
uv_dlclose(&lib);
luaL_error(L, "Failed to load parser: uv_dlsym: %s", uv_dlerror(&lib));
}
TSLanguage *lang = lang_parser();
if (lang == NULL) {
uv_dlclose(&lib);
luaL_error(L, "Failed to load parser %s: internal error", path);
}
return lang;
}
// Creates the language into the internal language map. // Creates the language into the internal language map.
// //
// Returns true if the language is correctly loaded in the language map // Returns true if the language is correctly loaded in the language map
@@ -80,34 +109,7 @@ int tslua_add_language(lua_State *L)
return 1; return 1;
} }
#define BUFSIZE 128 TSLanguage *lang = load_language(L, path, lang_name, symbol_name);
char symbol_buf[BUFSIZE];
snprintf(symbol_buf, BUFSIZE, "tree_sitter_%s", symbol_name);
#undef BUFSIZE
uv_lib_t lib;
if (uv_dlopen(path, &lib)) {
snprintf(IObuff, IOSIZE, "Failed to load parser for language '%s': uv_dlopen: %s",
lang_name, uv_dlerror(&lib));
uv_dlclose(&lib);
lua_pushstring(L, IObuff);
return lua_error(L);
}
TSLanguage *(*lang_parser)(void);
if (uv_dlsym(&lib, symbol_buf, (void **)&lang_parser)) {
snprintf(IObuff, IOSIZE, "Failed to load parser: uv_dlsym: %s",
uv_dlerror(&lib));
uv_dlclose(&lib);
lua_pushstring(L, IObuff);
return lua_error(L);
}
TSLanguage *lang = lang_parser();
if (lang == NULL) {
uv_dlclose(&lib);
return luaL_error(L, "Failed to load parser %s: internal error", path);
}
uint32_t lang_version = ts_language_version(lang); uint32_t lang_version = ts_language_version(lang);
if (lang_version < TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION if (lang_version < TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION
@@ -184,8 +186,7 @@ int tslua_inspect_lang(lua_State *L)
lua_setfield(L, -2, "fields"); // [retval] lua_setfield(L, -2, "fields"); // [retval]
uint32_t lang_version = ts_language_version(lang); lua_pushinteger(L, ts_language_version(lang)); // [retval, version]
lua_pushinteger(L, lang_version); // [retval, version]
lua_setfield(L, -2, "_abi_version"); lua_setfield(L, -2, "_abi_version");
return 1; return 1;