mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 14:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

treesitter: call bufload before parsing (#12603)

Browse Source
This commit is contained in:
Thomas Vigouroux
2020-07-10 15:33:27 +02:00
committed by GitHub
parent b39edb5b60
commit 529251d5e4
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/lua/vim/treesitter.lua
View File

@@ -75,6 +75,9 @@ function M.create_parser(bufnr, lang, id)
if bufnr == 0 then if bufnr == 0 then
bufnr = a.nvim_get_current_buf() bufnr = a.nvim_get_current_buf()
end end
vim.fn.bufload(bufnr)
local self = setmetatable({bufnr=bufnr, lang=lang, valid=false}, Parser) local self = setmetatable({bufnr=bufnr, lang=lang, valid=false}, Parser)
self._parser = vim._create_ts_parser(lang) self._parser = vim._create_ts_parser(lang)
self.change_cbs = {} self.change_cbs = {}

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

@@ -307,11 +307,13 @@ static int parser_parse_buf(lua_State *L)
} }
long bufnr = lua_tointeger(L, 2); long bufnr = lua_tointeger(L, 2);
void *payload = handle_get_buffer(bufnr); buf_T *buf = handle_get_buffer(bufnr);
if (!payload) {
if (!buf) {
return luaL_error(L, "invalid buffer handle: %d", bufnr); return luaL_error(L, "invalid buffer handle: %d", bufnr);
} }
TSInput input = { payload, input_cb, TSInputEncodingUTF8 };
TSInput input = { (void *)buf, input_cb, TSInputEncodingUTF8 };
TSTree *new_tree = ts_parser_parse(p->parser, p->tree, input); TSTree *new_tree = ts_parser_parse(p->parser, p->tree, input);
uint32_t n_ranges = 0; uint32_t n_ranges = 0;