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

wip trying to fix the highlighter

Browse Source
This commit is contained in:
Thomas Vigouroux 2020-09-03 15:36:11 +02:00 committed by Björn Linse
parent 82fb6a8818
commit cf0e1bc1fe
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/lua/vim/treesitter/highlighter.lua
View File

@ -60,14 +60,11 @@ function TSHighlighter.new(query, bufnr, ft)
ft,
{
on_changedtree = function(...) self:on_changedtree(...) end,
on_bytes = function() self.root = self.parser:parse():root() end
on_bytes = function() self.parser:parse() end
}
)
self.buf = self.parser.bufnr
local tree = self.parser:parse()
self.root = tree:root()
self:set_query(query)
self.edit_count = 0
self.redraw_count = 0
@ -126,17 +123,17 @@ function TSHighlighter:set_query(query)
end
})
self:on_changedtree({{self.root:range()}})
self:on_changedtree({{self.parser:parse():root():range()}})
end
function TSHighlighter:on_changedtree(changes)
-- Get a fresh root
self.root = self.parser.tree:root()
local root = self.parser:parse():root()
for _, ch in ipairs(changes or {}) do
a.nvim_buf_clear_namespace(self.buf, ts_hs_ns, ch[1], ch[3] + 1)
a.nvim_buf_clear_namespace(self.buf, ts_hs_ns, ch[1], ch[3]+1)
for capture, node in self.query:iter_captures(self.root, self.buf, ch[1], ch[3] + 1) do
for capture, node in self.query:iter_captures(root, self.buf, ch[1], ch[3] + 1) do
local start_row, start_col, end_row, end_col = node:range()
local hl = self.hl_cache[capture]
if hl then