aboutsummaryrefslogtreecommitdiffstats
path: root/lua
diff options
context:
space:
mode:
authorSantos Gallegos <stsewd@protonmail.com>2020-09-07 22:17:31 -0500
committerKiyan Yazdani <yazdani.kiyan@protonmail.com>2020-09-08 19:16:54 +0200
commit95a7d2418063cc877f89713d241cc60e2550617e (patch)
treeb546a4c4a4d35f640c3ade8ea2b90485376b368f /lua
parentFold: update docs (diff)
downloadnvim-treesitter-95a7d2418063cc877f89713d241cc60e2550617e.tar
nvim-treesitter-95a7d2418063cc877f89713d241cc60e2550617e.tar.gz
nvim-treesitter-95a7d2418063cc877f89713d241cc60e2550617e.tar.bz2
nvim-treesitter-95a7d2418063cc877f89713d241cc60e2550617e.tar.lz
nvim-treesitter-95a7d2418063cc877f89713d241cc60e2550617e.tar.xz
nvim-treesitter-95a7d2418063cc877f89713d241cc60e2550617e.tar.zst
nvim-treesitter-95a7d2418063cc877f89713d241cc60e2550617e.zip
Queries: merge query_extensions into base_language_map
These two are doing the same currently.
Diffstat (limited to 'lua')
-rw-r--r--lua/nvim-treesitter/query.lua14
1 files changed, 2 insertions, 12 deletions
diff --git a/lua/nvim-treesitter/query.lua b/lua/nvim-treesitter/query.lua
index 49a02948b..96fec99e6 100644
--- a/lua/nvim-treesitter/query.lua
+++ b/lua/nvim-treesitter/query.lua
@@ -13,12 +13,8 @@ local query_cache = caching.create_buffer_cache()
M.base_language_map = {
cpp = {'c'},
typescript = {'javascript'},
- tsx = {'typescript', 'javascript'},
-}
-
-M.query_extensions = {
- javascript = { 'jsx' },
- tsx = {'jsx'}
+ javascript = {'jsx'},
+ tsx = {'typescript', 'javascript', 'jsx'},
}
M.built_in_query_groups = {'highlights', 'locals', 'textobjects', 'fold'}
@@ -84,16 +80,10 @@ end
local function get_query_files(lang, query_name)
local query_files = {}
- local extensions = M.query_extensions[lang] or {}
local lang_files = filtered_runtime_queries(lang, query_name)
vim.list_extend(query_files, lang_files)
- for _, ext_lang in ipairs(extensions) do
- local ext_files = filtered_runtime_queries(ext_lang, query_name)
- vim.list_extend(query_files, ext_files)
- end
-
for _, base_lang in ipairs(M.base_language_map[lang] or {}) do
local base_files = filtered_runtime_queries(base_lang, query_name)
vim.list_extend(query_files, base_files)