Merge remote-tracking branch 'upstream/master' into mix_20240309

1 files changed, 11 insertions, 10 deletions

diff --git a/runtime/lua/vim/treesitter/_query_linter.lua b/runtime/lua/vim/treesitter/_query_linter.lua
index 12b4cbc7b9..c5e4b86e1e 100644
--- a/runtime/lua/vim/treesitter/_query_linter.lua
+++ b/runtime/lua/vim/treesitter/_query_linter.lua
@@ -40,7 +40,8 @@ end
 local function guess_query_lang(buf)
   local filename = api.nvim_buf_get_name(buf)
   if filename ~= '' then
-    return vim.F.npcall(vim.fn.fnamemodify, filename, ':p:h:t')
+    local resolved_filename = vim.F.npcall(vim.fn.fnamemodify, filename, ':p:h:t')
+    return resolved_filename and vim.treesitter.language.get_lang(resolved_filename)
   end
 end
 
@@ -64,7 +65,7 @@ local function normalize_opts(buf, opts)
 end
 
 local lint_query = [[;; query
-  (program [(named_node) (list) (grouping)] @toplevel)
+  (program [(named_node) (anonymous_node) (list) (grouping)] @toplevel)
   (named_node
     name: _ @node.named)
   (anonymous_node
@@ -170,17 +171,17 @@ function M.lint(buf, opts)
 
     --- @type (table|nil)
     local parser_info = vim.F.npcall(vim.treesitter.language.inspect, lang)
+    local lang_context = {
+      lang = lang,
+      parser_info = parser_info,
+      is_first_lang = i == 1,
+    }
 
-    local parser = vim.treesitter.get_parser(buf)
+    local parser = assert(vim.treesitter.get_parser(buf, nil, { error = false }))
     parser:parse()
     parser:for_each_tree(function(tree, ltree)
       if ltree:lang() == 'query' then
-        for _, match, _ in query:iter_matches(tree:root(), buf, 0, -1, { all = true }) do
-          local lang_context = {
-            lang = lang,
-            parser_info = parser_info,
-            is_first_lang = i == 1,
-          }
+        for _, match, _ in query:iter_matches(tree:root(), buf, 0, -1) do
           lint_match(buf, match, query, lang_context, diagnostics)
         end
       end
@@ -240,7 +241,7 @@ function M.omnifunc(findstart, base)
     end
   end
   for _, s in pairs(parser_info.symbols) do
-    local text = s[2] and s[1] or '"' .. s[1]:gsub([[\]], [[\\]]) .. '"' ---@type string
+    local text = s[2] and s[1] or string.format('%q', s[1]):gsub('\n', 'n') ---@type string
     if text:find(base, 1, true) then
       table.insert(items, text)
     end