From 069f4bd290f28bcf6cef29115bbcbeed36319aca Mon Sep 17 00:00:00 2001 From: Tobias Wild Date: Sun, 23 Aug 2020 18:50:50 +0200 Subject: [PATCH] fix: add query extensions lastly, so they always override --- lua/nvim-treesitter/query.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/nvim-treesitter/query.lua b/lua/nvim-treesitter/query.lua index 2dd85e2aa..6f3cde3d9 100644 --- a/lua/nvim-treesitter/query.lua +++ b/lua/nvim-treesitter/query.lua @@ -89,6 +89,11 @@ function M.get_query_files(lang, query_name) local lang_files = filtered_runtime_queries(lang, query_name) vim.list_extend(query_files, lang_files) + 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) + end + for _, ext in ipairs(extensions) do local l = lang local e = ext @@ -100,11 +105,6 @@ function M.get_query_files(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) - end - return query_files end