From 20e448882e1463958d13219d9418de9a4b73480b Mon Sep 17 00:00:00 2001 From: kiyan42 Date: Mon, 17 Aug 2020 00:21:34 +0200 Subject: some refacto, doc fixes and jsx queries - compute query language extensions *after* default ones (jsx after javascript) - remove outdated ts_utils functions from docs - add better regex detection to javascript - javascriptreact to use javascript queries - add javascript.jsx to javascript queries - write jsx.scm hl file --- lua/nvim-treesitter/parsers.lua | 3 ++- lua/nvim-treesitter/query.lua | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'lua') diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua index 38c6097ca..d7a87d629 100644 --- a/lua/nvim-treesitter/parsers.lua +++ b/lua/nvim-treesitter/parsers.lua @@ -7,7 +7,8 @@ list.javascript = { install_info = { url = "https://github.com/tree-sitter/tree-sitter-javascript", files = { "src/parser.c", "src/scanner.c" }, - } + }, + used_by = { 'javascriptreact' } } list.c = { diff --git a/lua/nvim-treesitter/query.lua b/lua/nvim-treesitter/query.lua index c630b366c..ec93d5bbb 100644 --- a/lua/nvim-treesitter/query.lua +++ b/lua/nvim-treesitter/query.lua @@ -26,7 +26,7 @@ M.base_language_map = { } M.query_extensions = { - javascript = { 'jsx' }, + javascript = { 'javascript.jsx' }, tsx = {'javascript.jsx'} } @@ -95,6 +95,9 @@ function M.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 in ipairs(extensions) do local l = lang local e = ext @@ -111,9 +114,7 @@ function M.get_query_files(lang, query_name) vim.list_extend(query_files, base_files) end - local lang_files = filtered_runtime_queries(lang, query_name) - - return vim.list_extend(query_files, lang_files) + return query_files end function M.has_query_files(lang, query_name) -- cgit v1.2.3-70-g09d2