tree-sitter: objectify API

This commit is contained in:
Björn Linse
2019-06-07 18:19:59 +02:00
parent 005b6d638c
commit 1e9e2451be
4 changed files with 30 additions and 35 deletions

View File

@@ -7,7 +7,7 @@ end
local my_ns = __treesitter_rt_ns
function ts_inspect_pos(row,col)
local tree = parse_tree(theparser)
local tree = theparser:parse_tree()
local root = tree:root()
local node = root:descendant_for_point_range(row,col,row,col)
show_node(node)

View File

@@ -1,47 +1,55 @@
local a = vim.api
function parse_tree(tsstate, force)
if tsstate.valid and not force then
return tsstate.tree
local Parser = {}
Parser.__index = Parser
function Parser:parse_tree(force)
if self.valid and not force then
return self.tree
end
tsstate.tree = tsstate.parser:parse_buf(tsstate.bufnr)
tsstate.valid = true
return tsstate.tree
self.tree = self._parser:parse_buf(self.bufnr)
self.valid = true
return self.tree
end
local function change_cb(tsstate, ev, bufnr, tick, start_row, oldstopline, stop_row)
local function change_cb(self, ev, bufnr, tick, start_row, oldstopline, stop_row)
local start_byte = a.nvim_buf_get_offset(bufnr,start_row)
-- a bit messy, should we expose edited but not reparsed tree?
-- are multiple edits safe in general?
local root = tsstate.parser:tree():root()
local root = self._parser:tree():root()
-- TODO: add proper lookup function!
local inode = root:descendant_for_point_range(oldstopline+9000,0, oldstopline,0)
if inode == nil then
local stop_byte = a.nvim_buf_get_offset(bufnr,stop_row)
tsstate.parser:edit(start_byte,stop_byte,stop_byte,start_row,0,stop_row,0,stop_row,0)
self._parser:edit(start_byte,stop_byte,stop_byte,start_row,0,stop_row,0,stop_row,0)
else
local fakeoldstoprow, fakeoldstopcol, fakebyteoldstop = inode:start()
local fake_rows = fakeoldstoprow-oldstopline
local fakestop = stop_row+fake_rows
local fakebytestop = a.nvim_buf_get_offset(bufnr,fakestop)+fakeoldstopcol
tsstate.parser:edit(start_byte,fakebyteoldstop,fakebytestop,start_row,0,fakeoldstoprow,fakeoldstopcol,fakestop,fakeoldstopcol)
self._parser:edit(start_byte,fakebyteoldstop,fakebytestop,start_row,0,fakeoldstoprow,fakeoldstopcol,fakestop,fakeoldstopcol)
end
tsstate.valid = false
self.valid = false
end
function create_parser(bufnr)
local function create_parser(bufnr)
if bufnr == 0 then
bufnr = a.nvim_get_current_buf()
end
local ft = a.nvim_buf_get_option(bufnr, "filetype")
local tsstate = {}
tsstate.bufnr = bufnr
tsstate.parser = vim.ts_parser(ft.."_parser.so", ft)
parse_tree(tsstate)
local self = setmetatable({bufnr=bufnr, valid=false}, Parser)
self._parser = vim._create_ts_parser(ft.."_parser.so", ft)
self:parse_tree()
local function cb(ev, ...)
return change_cb(tsstate, ev, ...)
-- TODO: use weakref to self, so that the parser is free'd is no plugin is
-- using it.
return change_cb(self, ev, ...)
end
a.nvim_buf_attach(tsstate.bufnr, false, {on_lines=cb})
return tsstate
a.nvim_buf_attach(self.bufnr, false, {on_lines=cb})
return self
end
-- TODO: weak table with reusable parser per buffer.
return {create_parser=create_parser}