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

fix(highlight): Use TS built-in is_enabled function (#1513)

Browse Source 
The function just replicated the logic from is_enabled and assumed the
`disable` setting is always a table. This is no longer the case
(https://github.com/nvim-treesitter/nvim-treesitter/pull/2009), it can
now also be a function.
This commit is contained in:
Patrick Ziegler
2021-11-30 21:18:08 +01:00
committed by GitHub
parent c9439871ef
commit ce8c8d4a45
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lua/telescope/previewers/utils.lua
View File

@@ -96,25 +96,23 @@ end
local treesitter_attach = function(bufnr, ft)
local lang = ts_parsers.ft_to_lang(ft)
if ts_parsers.has_parser(lang) then
local config = ts_configs.get_module "highlight"
if vim.tbl_contains(config.disable, lang) then
return false
end
for k, v in pairs(config.custom_captures) do
vim.treesitter.highlighter.hl_map[k] = v
end
vim.treesitter.highlighter.new(ts_parsers.get_parser(bufnr, lang))
local is_table = type(config.additional_vim_regex_highlighting) == "table"
if
config.additional_vim_regex_highlighting
and (not is_table or vim.tbl_contains(config.additional_vim_regex_highlighting, lang))
then
vim.api.nvim_buf_set_option(bufnr, "syntax", ft)
end
return true
if not ts_configs.is_enabled("highlight", lang, bufnr) then
return false
end
return false
local config = ts_configs.get_module "highlight"
for k, v in pairs(config.custom_captures) do
vim.treesitter.highlighter.hl_map[k] = v
end
vim.treesitter.highlighter.new(ts_parsers.get_parser(bufnr, lang))
local is_table = type(config.additional_vim_regex_highlighting) == "table"
if
config.additional_vim_regex_highlighting
and (not is_table or vim.tbl_contains(config.additional_vim_regex_highlighting, lang))
then
vim.api.nvim_buf_set_option(bufnr, "syntax", ft)
end
return true
end
-- Attach ts highlighter