IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13253 from theHamsta/fix-baselang-order

Browse Source 
tree-sitter: Put base languages first in queries
This commit is contained in:
Thomas Vigouroux 2020-11-08 16:46:25 +01:00 committed by GitHub
commit 5caaacaafe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/lua/vim/treesitter/query.lua
View File

@ -38,9 +38,8 @@ end
local function get_query_files(lang, query_name, is_included) local function get_query_files(lang, query_name, is_included)
local lang_files = filtered_runtime_queries(lang, query_name) local lang_files = filtered_runtime_queries(lang, query_name)
local query_files = lang_files
if #query_files == 0 then return {} end if #lang_files == 0 then return {} end
local base_langs = {} local base_langs = {}
@ -51,7 +50,7 @@ local function get_query_files(lang, query_name, is_included)
-- {language} ::= {lang} | ({lang}) -- {language} ::= {lang} | ({lang})
local MODELINE_FORMAT = "^;+%s*inherits%s*:?%s*([a-z_,()]+)%s*$" local MODELINE_FORMAT = "^;+%s*inherits%s*:?%s*([a-z_,()]+)%s*$"
for _, file in ipairs(query_files) do for _, file in ipairs(lang_files) do
local modeline = vim.fn.readfile(file, "", 1) local modeline = vim.fn.readfile(file, "", 1)
if #modeline == 1 then if #modeline == 1 then
@ -73,10 +72,12 @@ local function get_query_files(lang, query_name, is_included)
end end
end end
local query_files = {}
for _, base_lang in ipairs(base_langs) do for _, base_lang in ipairs(base_langs) do
local base_files = get_query_files(base_lang, query_name, true) local base_files = get_query_files(base_lang, query_name, true)
vim.list_extend(query_files, base_files) vim.list_extend(query_files, base_files)
end end
vim.list_extend(query_files, lang_files)
return query_files return query_files
end end