test: fix tests

Author: bennypowers

tests/helpers/util.lua

@@ -2,7 +2,8 @@ local regexplainer = require 'regexplainer'
 local buffers = require 'regexplainer.buffers'
 local parsers = require "nvim-treesitter.parsers"
 
-local get_node_text = vim.treesitter.get_node_text or vim.treesitter.query.get_node_text
+local get_parser = vim.treesitter.get_parser
+local get_node_text = vim.treesitter.get_node_text
 
 local query = vim.treesitter.query.get('javascript', 'regexplainer_test')
 if not query then error('could not get query') end
@@ -74,24 +75,27 @@ local function get_buffer_text(bufnr)
   return table.concat(vim.api.nvim_buf_get_lines(bufnr, 0, -1, false), '\n')
 end
 
----@param text string contents of test fixture buffer
+---@param pattern string regexp pattern to test
 ---@return number bufnr bufnr of test fixture buffer
-local function setup_test_buffer(text)
-  local newbuf = vim.api.nvim_create_buf(true, true)
+local function setup_test_buffer(pattern)
+  local newbuf = vim.api.nvim_create_buf(true, false)
+  vim.api.nvim_win_set_buf(0, newbuf)
   vim.opt_local.filetype = 'javascript'
-  vim.api.nvim_set_current_line(text)
+  vim.api.nvim_set_current_line('/'..pattern..'/;')
+  vim.treesitter.start(newbuf, 'javascript')
   return newbuf
 end
 
-local function show_and_get_regexplainer_buffer()
+local function show_and_get_regexplainer_buffer(bufnr)
   local buffer
   repeat
+    get_parser(0):parse()
     vim.uv.sleep(10)
     local row, col = unpack(vim.api.nvim_win_get_cursor(0));
     vim.api.nvim_win_set_cursor(0, {row, col + 1})
     local cursor_node = vim.treesitter.get_node()
     if (cursor_node) then
-      for id, node in query:iter_captures(cursor_node, 0) do
+      for id, node in query:iter_captures(cursor_node, bufnr) do
         if query[id] == 'test.pattern' and node then
           local range = node:range()
           vim.api.nvim_win_set_cursor(0, { range[0], range[1] })
@@ -129,9 +133,12 @@ function M.clear_test_state()
   assert(vim.fn.getreg(M.register_name) == '', "Failed to properly clear register")
 end
 
-function M.assert_string(regexp, expected, message)
-  local newbufnr = setup_test_buffer(regexp)
-  local rebufnr = show_and_get_regexplainer_buffer()
+---@param pattern string regexp pattern to test
+---@param expected string expected markdown output
+---@param message string test description
+function M.assert_string(pattern, expected, message)
+  local newbufnr = setup_test_buffer(pattern)
+  local rebufnr = show_and_get_regexplainer_buffer(newbufnr)
   local text = get_buffer_text(rebufnr)
   -- Cleanup any remaining buffers
   vim.api.nvim_buf_delete(newbufnr, { force = true })