From 156367e4cbd123bc9a70eeabeaa16f7cf9239e12 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 25 Mar 2023 15:52:02 +0100
Subject: [PATCH] fix: Move to non-deprecated `vim.treesitter` function calls
 (#278)

ref: neovim/neovim@cbbf8bd
---
 lua/treesitter-matchup/compat.lua            | 14 ++++++++++++++
 lua/treesitter-matchup/internal.lua          |  4 ++--
 lua/treesitter-matchup/third-party/query.lua |  4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 lua/treesitter-matchup/compat.lua

diff --git a/lua/treesitter-matchup/compat.lua b/lua/treesitter-matchup/compat.lua
new file mode 100644
index 0000000..6635722
--- /dev/null
+++ b/lua/treesitter-matchup/compat.lua
@@ -0,0 +1,14 @@
+local M = {}
+
+local ts = vim.treesitter
+local tsq = vim.treesitter.query
+
+M.get_node_text = function(node, source, opts)
+    return (ts.get_node_text or tsq.get_node_text)(node, source, opts)
+end
+
+M.get_query = function(lang, query_name)
+    return (tsq.get or tsq.get_query)(lang, query_name)
+end
+
+return M
diff --git a/lua/treesitter-matchup/internal.lua b/lua/treesitter-matchup/internal.lua
index ea1b14e..6e9b542 100644
--- a/lua/treesitter-matchup/internal.lua
+++ b/lua/treesitter-matchup/internal.lua
@@ -5,7 +5,7 @@ end
 
 local vim = vim
 local api = vim.api
-local ts = vim.treesitter
+local ts = require'treesitter-matchup.compat'
 local configs = require'nvim-treesitter.configs'
 local parsers = require'nvim-treesitter.parsers'
 local queries = require'treesitter-matchup.third-party.query'
@@ -155,7 +155,7 @@ function M.containing_scope(node, bufnr, key)
 end
 
 local function _node_text(node, bufnr)
-  local text = ts.query.get_node_text(node, bufnr)
+  local text = ts.get_node_text(node, bufnr)
   return text:match("(%S+).*")
 end
 
diff --git a/lua/treesitter-matchup/third-party/query.lua b/lua/treesitter-matchup/third-party/query.lua
index affc250..add114c 100644
--- a/lua/treesitter-matchup/third-party/query.lua
+++ b/lua/treesitter-matchup/third-party/query.lua
@@ -4,7 +4,7 @@
 -- See nvim-treesitter.LICENSE-APACHE-2.0
 
 local api = vim.api
-local tsq = require "vim.treesitter.query"
+local ts = require 'treesitter-matchup.compat'
 local tsrange = require "nvim-treesitter.tsrange"
 local utils = require "nvim-treesitter.utils"
 local parsers = require "nvim-treesitter.parsers"
@@ -52,7 +52,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]