Use the new get_node_text in nvim 0.7 but rely on older code in older…

… nvim
Olical · Apr 24, 2022 · 251d8ef · 251d8ef
1 parent 9be3db4
commit 251d8ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/fnl/conjure/tree-sitter.fnl b/fnl/conjure/tree-sitter.fnl
@@ -31,7 +31,10 @@
   "Turn the node into a string, nils flow through. Separate forms are joined by
   new lines."
   (when node
-    (vim.treesitter.query.get_node_text node (nvim.get_current_buf))))
+    (if (= 1 (nvim.fn.has "nvim-0.7"))
+      (vim.treesitter.query.get_node_text node (nvim.get_current_buf))
+      (-> (vim.treesitter.query.get_node_text node)
+          (->> (str.join "\n"))))))
 
 (defn parent [node]
   "Get the parent if possible."

diff --git a/lua/conjure/tree-sitter.lua b/lua/conjure/tree-sitter.lua
@@ -45,7 +45,11 @@ end
 _2amodule_2a["enabled?"] = enabled_3f
 local function node__3estr(node)
   if node then
-    return vim.treesitter.query.get_node_text(node, nvim.get_current_buf())
+    if (1 == nvim.fn.has("nvim-0.7")) then
+      return vim.treesitter.query.get_node_text(node, nvim.get_current_buf())
+    else
+      return str.join("\n", vim.treesitter.query.get_node_text(node))
+    end
   else
     return nil
   end