aboutsummaryrefslogtreecommitdiff
path: root/runtime/lua/vim/treesitter
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/lua/vim/treesitter')
-rw-r--r--runtime/lua/vim/treesitter/highlighter.lua3
-rw-r--r--runtime/lua/vim/treesitter/languagetree.lua5
2 files changed, 5 insertions, 3 deletions
diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index 60db7f24cf..275e960e28 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -219,7 +219,8 @@ local function on_line_impl(self, buf, line)
a.nvim_buf_set_extmark(buf, ns, start_row, start_col,
{ end_line = end_row, end_col = end_col,
hl_group = hl,
- ephemeral = true
+ ephemeral = true,
+ priority = 100 -- Low but leaves room below
})
end
if start_row > line then
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 70e2ac4c62..a8b62e21b9 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -104,12 +104,14 @@ function LanguageTree:parse()
parser:set_included_ranges(ranges)
local tree, tree_changes = parser:parse(old_tree, self._source)
+ self:_do_callback('changedtree', tree_changes, tree)
table.insert(self._trees, tree)
vim.list_extend(changes, tree_changes)
end
else
local tree, tree_changes = parser:parse(old_trees[1], self._source)
+ self:_do_callback('changedtree', tree_changes, tree)
table.insert(self._trees, tree)
vim.list_extend(changes, tree_changes)
@@ -146,7 +148,6 @@ function LanguageTree:parse()
self._valid = true
- self:_do_callback('changedtree', changes)
return self._trees, changes
end
@@ -432,7 +433,7 @@ local function region_contains(region, range)
end
function LanguageTree:contains(range)
- for _, region in pairs(self._region) do
+ for _, region in pairs(self._regions) do
if region_contains(region, range) then
return true
end