fix: shim 0.9 deprecations

6 files changed, 27 insertions, 8 deletions

diff --git a/lua/nvim-treesitter/compat.lua b/lua/nvim-treesitter/compat.lua
new file mode 100644
index 000000000..072b4dc58
--- /dev/null
+++ b/lua/nvim-treesitter/compat.lua
@@ -0,0 +1,18 @@
+-- Shim module to address deprecations across nvim versions
+local tsq = vim.treesitter.query
+
+local M = {}
+
+function M.get_query_files(lang, query_group, is_included)
+  return (tsq.get_files or tsq.get_query_files)(lang, query_group, is_included)
+end
+
+function M.get_query(lang, query_name)
+  return (tsq.get or tsq.get_query)(lang, query_name)
+end
+
+function M.parse_query(lang, query)
+  return (tsq.parse or tsq.parse_query)(lang, query)
+end
+
+return M
diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index a3f4063cd..99fc6b840 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -1,7 +1,7 @@
 local api = vim.api
 
 local queries = require "nvim-treesitter.query"
-local ts_query = require "vim.treesitter.query"
+local ts = require "nvim-treesitter.compat"
 local parsers = require "nvim-treesitter.parsers"
 local utils = require "nvim-treesitter.utils"
 local caching = require "nvim-treesitter.caching"
@@ -271,7 +271,7 @@ end
 ---@param lang string
 function M.edit_query_file(query_group, lang)
   lang = lang or parsers.get_buf_lang()
-  local files = ts_query.get_query_files(lang, query_group, true)
+  local files = ts.get_query_files(lang, query_group, true)
   if #files == 0 then
     utils.notify "No query file found! Creating a new one!"
     M.edit_query_file_user_after(query_group, lang)
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 7edd77ed8..f81d35fbf 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -6,6 +6,7 @@ local info = require "nvim-treesitter.info"
 local shell = require "nvim-treesitter.shell_command_selectors"
 local install = require "nvim-treesitter.install"
 local utils = require "nvim-treesitter.utils"
+local ts = require "nvim-treesitter.compat"
 
 local health = vim.health or require "health"
 
@@ -147,13 +148,13 @@ function M.check()
       local lang, type, err = unpack(p)
       local lines = {}
       table.insert(lines, lang .. "(" .. type .. "): " .. err)
-      local files = vim.treesitter.query.get_query_files(lang, type)
+      local files = ts.get_query_files(lang, type)
       if #files > 0 then
         table.insert(lines, lang .. "(" .. type .. ") is concatenated from the following files:")
         for _, file in ipairs(files) do
           local fd = io.open(file, "r")
           if fd then
-            local ok, file_err = pcall(vim.treesitter.query.parse_query, lang, fd:read "*a")
+            local ok, file_err = pcall(ts.parse_query, lang, fd:read "*a")
             if ok then
               table.insert(lines, '|    [OK]:"' .. file .. '"')
             else
diff --git a/lua/nvim-treesitter/query.lua b/lua/nvim-treesitter/query.lua
index c7f1f952e..18c416a38 100644
--- a/lua/nvim-treesitter/query.lua
+++ b/lua/nvim-treesitter/query.lua
@@ -1,5 +1,5 @@
 local api = vim.api
-local tsq = require "vim.treesitter.query"
+local ts = require "nvim-treesitter.compat"
 local tsrange = require "nvim-treesitter.tsrange"
 local utils = require "nvim-treesitter.utils"
 local parsers = require "nvim-treesitter.parsers"
@@ -105,7 +105,7 @@ do
   ---@param query_name string
   function M.get_query(lang, query_name)
     if cache[lang][query_name] == nil then
-      cache[lang][query_name] = tsq.get_query(lang, query_name)
+      cache[lang][query_name] = ts.get_query(lang, query_name)
     end
 
     return cache[lang][query_name]
diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua
index 8c0a4c947..106f90a8d 100644
--- a/lua/nvim-treesitter/query_predicates.lua
+++ b/lua/nvim-treesitter/query_predicates.lua
@@ -168,7 +168,7 @@ query.add_directive("downcase!", function(match, _, bufnr, pred, metadata)
     text = value
   else
     local node = match[value]
-    text = query.get_node_text(node, bufnr) or ""
+    text = vim.treesitter.get_node_text(node, bufnr) or ""
   end
 
   if #pred == 3 then
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 51957461e..bb3d119f5 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -14,7 +14,7 @@
 ((function_call
   name: (_) @_vimcmd_identifier
   arguments: (arguments (string content: _ @query) .))
-  (#any-of? @_vimcmd_identifier "vim.treesitter.query.set_query" "vim.treesitter.query.parse_query"))
+  (#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse_query"))
 
 ;; highlight string as query if starts with `;; query`
 ((string ("string_content") @query) (#lua-match? @query "^%s*;+%s?query"))