benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-11 07:50:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix using highlight query extension for every query type

Browse source
This commit is contained in:
kyazdani42 2020-09-07 21:17:03 +02:00 • committed by Thomas Vigouroux
parent 9c456edb3a
commit 8d6c40ce24
2 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lua/nvim-treesitter/query.lua
View file

@ -17,8 +17,8 @@ M.base_language_map = {
} }
M.query_extensions = { M.query_extensions = {
javascript = { 'javascript.jsx' }, javascript = { 'jsx' },
tsx = {'javascript.jsx'} tsx = {'jsx'}
} }
M.built_in_query_groups = {'highlights', 'locals', 'textobjects', 'fold'} M.built_in_query_groups = {'highlights', 'locals', 'textobjects', 'fold'}
@ -82,21 +82,15 @@ local function filtered_runtime_queries(lang, query_name)
return filter_files(api.nvim_get_runtime_file(string.format('queries/%s/%s.scm', lang, query_name), true) or {}) return filter_files(api.nvim_get_runtime_file(string.format('queries/%s/%s.scm', lang, query_name), true) or {})
end end
function M.get_query_files(lang, query_name) local function get_query_files(lang, query_name)
local query_files = {} local query_files = {}
local extensions = M.query_extensions[lang] or {} local extensions = M.query_extensions[lang] or {}
local lang_files = filtered_runtime_queries(lang, query_name) local lang_files = filtered_runtime_queries(lang, query_name)
vim.list_extend(query_files, lang_files) vim.list_extend(query_files, lang_files)
for _, ext in ipairs(extensions) do for _, ext_lang in ipairs(extensions) do
local l = lang local ext_files = filtered_runtime_queries(ext_lang, query_name)
local e = ext
if e:match('%.') ~= nil then
l = e:match('.*%.'):sub(0, -2)
e = e:match('%..*'):sub(2, -1)
end
local ext_files = filtered_runtime_queries(l, e)
vim.list_extend(query_files, ext_files) vim.list_extend(query_files, ext_files)
end end
@ -109,13 +103,13 @@ function M.get_query_files(lang, query_name)
end end
function M.has_query_files(lang, query_name) function M.has_query_files(lang, query_name)
local query_files = M.get_query_files(lang, query_name) local query_files = get_query_files(lang, query_name)
return #query_files > 0 return #query_files > 0
end end
function M.get_query(lang, query_name) function M.get_query(lang, query_name)
local query_files = M.get_query_files(lang, query_name) local query_files = get_query_files(lang, query_name)
local query_string = read_query_files(query_files) local query_string = read_query_files(query_files)
if #query_string > 0 then if #query_string > 0 then

0
queries/javascript/jsx.scm → queries/jsx/highlights.scm
View file