IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

tree-sitter: error out when parsing fails

Browse Source 
This can happen when there is ABI mismatches, and removes the assumption
parsing alwasy succeeds (which is wrong).
This commit is contained in:
Thomas Vigouroux 2020-10-12 20:28:04 +02:00
parent ca7449db46
commit d3a63a1f71
No known key found for this signature in database
GPG Key ID: 88204BFB627E648D
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,8 @@ int tslua_add_language(lua_State *L)
}
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
|| lang_version > TREE_SITTER_LANGUAGE_VERSION) {
return luaL_error(
L,
"ABI version mismatch : expected %" PRIu32 ", found %" PRIu32,
@ -246,7 +247,12 @@ int tslua_push_parser(lua_State *L)
}
TSParser *parser = ts_parser_new();
ts_parser_set_language(parser, lang);
if (!ts_parser_set_language(parser, lang)) {
ts_parser_delete(parser);
return luaL_error(L, "Failed to load language : %s", lang_name);
}
TSLua_parser *p = lua_newuserdata(L, sizeof(TSLua_parser)); // [udata]
p->parser = parser;
p->tree = NULL;
@ -342,7 +348,7 @@ static int parser_parse(lua_State *L)
return 0;
}
TSTree *new_tree;
TSTree *new_tree = NULL;
size_t len;
const char *str;
long bufnr;
@ -374,6 +380,12 @@ static int parser_parse(lua_State *L)
return luaL_error(L, "invalid argument to parser:parse()");
}
// Sometimes parsing fails (timeout, or wrong parser ABI)
// In those case, just return an error.
if (!new_tree) {
return luaL_error(L, "An error occured when parsing.");
}
uint32_t n_ranges = 0;
TSRange *changed = p->tree ? ts_tree_get_changed_ranges(p->tree, new_tree,
&n_ranges) : NULL;