leigh/telescope.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: current_buffer_fuzzy_find highlighter (#2394)

Browse Source
This commit is contained in:
Simon Hauser
2023-02-20 22:43:15 +01:00
committed by GitHub
parent 3915d933dc
commit a486ac3e8f
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lua/telescope/builtin/__files.lua
View File

@@ -456,9 +456,6 @@ files.current_buffer_fuzzy_find = function(opts)
if parser_ok and query_ok and ts_ok and ts_configs.is_enabled("highlight", filetype, opts.bufnr) then if parser_ok and query_ok and ts_ok and ts_configs.is_enabled("highlight", filetype, opts.bufnr) then
local root = parser:parse()[1]:root() local root = parser:parse()[1]:root()
local highlighter = vim.treesitter.highlighter.new(parser)
local highlighter_query = highlighter:get_query(filetype)
local line_highlights = setmetatable({}, { local line_highlights = setmetatable({}, {
__index = function(t, k) __index = function(t, k)
local obj = {} local obj = {}
@@ -469,9 +466,23 @@ files.current_buffer_fuzzy_find = function(opts)
-- update to changes on Neovim master, see https://github.com/neovim/neovim/pull/19931 -- update to changes on Neovim master, see https://github.com/neovim/neovim/pull/19931
-- TODO(clason): remove when dropping support for Neovim 0.7 -- TODO(clason): remove when dropping support for Neovim 0.7
local on_nvim_master = vim.fn.has "nvim-0.8" == 1 local get_hl_from_capture = (function()
if vim.fn.has "nvim-0.8" == 1 then
return function(q, id)
return "@" .. q.captures[id]
end
else
local highlighter = vim.treesitter.highlighter.new(parser)
local highlighter_query = highlighter:get_query(filetype)
return function(_, id)
return highlighter_query:_get_hl_from_capture(id)
end
end
end)()
for id, node in query:iter_captures(root, opts.bufnr, 0, -1) do for id, node in query:iter_captures(root, opts.bufnr, 0, -1) do
local hl = on_nvim_master and query.captures[id] or highlighter_query:_get_hl_from_capture(id) local hl = get_hl_from_capture(query, id)
if hl and type(hl) ~= "number" then if hl and type(hl) ~= "number" then
local row1, col1, row2, col2 = node:range() local row1, col1, row2, col2 = node:range()