2 files changed, 7 insertions, 5 deletions
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index c015884f5b..0b8e08f36c 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -138,8 +138,9 @@ end
 function M.formatting_sync(options, timeout_ms)
   local params = util.make_formatting_params(options)
   local result = vim.lsp.buf_request_sync(0, "textDocument/formatting", params, timeout_ms)
-  if not result then return end
-  result = result[1].result
+  if not result or vim.tbl_isempty(result) then return end
+  local _, formatting_result = next(result)
+  result = formatting_result.result
   if not result then return end
   vim.lsp.util.apply_text_edits(result)
 end
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index cc7dc2656d..3537ba78f5 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -38,9 +38,8 @@ end
 
 local function get_query_files(lang, query_name, is_included)
   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 = {}
 
@@ -51,7 +50,7 @@ local function get_query_files(lang, query_name, is_included)
   -- {language} ::= {lang} | ({lang})
   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)
 
     if #modeline == 1 then
@@ -73,10 +72,12 @@ local function get_query_files(lang, query_name, is_included)
     end
   end
 
+  local query_files = {}
   for _, base_lang in ipairs(base_langs) do
     local base_files = get_query_files(base_lang, query_name, true)
     vim.list_extend(query_files, base_files)
   end
+  vim.list_extend(query_files, lang_files)
 
   return query_files
 end