wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(treesitter): properly combine injection.combined regions

Browse Source 
Problem:
It doesn't make much sense to flatten each region (= list of ranges).
This coincidentally worked for region with a single range.

Solution:
Custom function for combining regions.
This commit is contained in:
Jaehwang Jung 2023-09-16 23:43:22 +09:00 committed by Lewis Russell
parent f40a109716
commit 7e5ce42977
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
runtime/lua/vim/treesitter/languagetree.lua
View File

@ -788,6 +788,19 @@ function LanguageTree:_get_injection(match, metadata)
return lang, combined, ranges
end
--- Can't use vim.tbl_flatten since a range is just a table.
---@param regions Range6[][]
---@return Range6[]
local function combine_regions(regions)
local result = {} ---@type Range6[]
for _, region in ipairs(regions) do
for _, range in ipairs(region) do
result[#result + 1] = range
end
end
return result
end
--- Gets language injection points by language.
---
--- This is where most of the injection processing occurs.
@ -833,11 +846,7 @@ function LanguageTree:_get_injections()
for _, entry in pairs(patterns) do
if entry.combined then
---@diagnostic disable-next-line:no-unknown
local regions = vim.tbl_map(function(e)
return vim.tbl_flatten(e)
end, entry.regions)
table.insert(result[lang], regions)
table.insert(result[lang], combine_regions(entry.regions))
else
for _, ranges in pairs(entry.regions) do
table.insert(result[lang], ranges)