Skip to content

Commit

Permalink
fix(preview): update buffer previewer to upstream changes (#2150)
Browse files Browse the repository at this point in the history
neovim/neovim#19931 removed `_get_hl_from_capture(id)` since captures are now implicitly mapped to highlight groups with the same name.
(cherry picked from commit b923665)
  • Loading branch information
clason authored and Conni2461 committed Sep 4, 2022
1 parent 8dce937 commit 51faca4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
6 changes: 5 additions & 1 deletion lua/telescope/builtin/__files.lua
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,12 @@ files.current_buffer_fuzzy_find = function(opts)
return obj
end,
})

-- update to changes on Neovim master, see https://github.com/neovim/neovim/pull/19931
-- TODO(clason): remove when dropping support for Neovim 0.7
local on_nvim_master = vim.fn.has "nvim-0.8" == 1
for id, node in query:iter_captures(root, opts.bufnr, 0, -1) do
local hl = highlighter_query:_get_hl_from_capture(id)
local hl = on_nvim_master and query.captures[id] or highlighter_query:_get_hl_from_capture(id)
if hl and type(hl) ~= "number" then
local row1, col1, row2, col2 = node:range()

Expand Down
5 changes: 0 additions & 5 deletions lua/telescope/builtin/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@
--- </code>
---@brief ]]

if 1 ~= vim.fn.has "nvim-0.7.0" then
vim.api.nvim_err_writeln "Telescope.nvim requires at least nvim-0.7.0. See `:h telescope.changelog-1851`"
return
end

local builtin = {}

-- Ref: https://github.com/tjdevries/lazy.nvim
Expand Down

0 comments on commit 51faca4

Please sign in to comment.