test: fix tests

Author: bennypowers

Makefile

@@ -15,8 +15,7 @@ watch:
 test:
 	@REGEXPLAINER_DEBOUNCE=false \
 		nvim \
-			--clean \
-		  --headless \
+			--headless \
 			--noplugin \
 			-u tests/mininit.lua \
 			-c "lua require'plenary.test_harness'.test_directory('tests/regexplainer/', {minimal_init='tests/mininit.lua',sequential=true})"\

lua/regexplainer.lua

@@ -78,7 +78,7 @@ local local_config = vim.tbl_deep_extend('keep', default_config, {})
 --
 local function show(options)
   options = vim.tbl_deep_extend('force', local_config, options or {})
-  local node, error = tree.get_regexp_pattern_at_cursor(options)
+  local node, error = tree.get_regexp_pattern_at_cursor()
 
   if error and options.debug then
     utils.notify('Rexexplainer: ' .. error, 'debug')
@@ -101,7 +101,6 @@ local function show(options)
     local buffer = Buffers.get_buffer(options)
 
     if not buffer and options.debug then
-      print('no buffer')
       renderer = require'regexplainer.renderers.debug'
     end
 

lua/regexplainer/buffers/init.lua

@@ -108,7 +108,7 @@ end
 --- Hide the last-opened Regexplainer buffer
 --
 function M.hide_last()
-  M.kill_buffer(M.get_all_buffers())
+  M.kill_buffer(M.get_last_buffer())
 end
 
 --- Hide all known Regexplainer buffers

lua/regexplainer/utils/treesitter.lua

@@ -157,27 +157,22 @@ end
 ---@return any, string|nil
 --
 function M.get_regexp_pattern_at_cursor()
-  local filetype = vim.bo[0].ft
-  local lang = vim.treesitter.language.get_lang(filetype);
-  local root_lang_tree = vim.treesitter.get_parser(0, lang)
+  local lang_tree = vim.treesitter.get_parser(0, 'regex')
   local query = vim.treesitter.query.get('regex', 'regexplainer')
-  if not query then
-   return nil, 'no regex query'
-  end
-  local cursor_range = vim.api.nvim_win_get_cursor(0)
-  local cursor_row, cursor_col = unpack(cursor_range)
-  local cursor_node = get_node_at_cursor(root_lang_tree)
-  local cursor_tree = cursor_node and cursor_node:tree()
-  local cursor_root = cursor_tree and cursor_tree:root()
-  if cursor_root then
-    for id, node in query:iter_captures(cursor_root, 0, cursor_row - 1, cursor_row) do
-      local name = query.captures[id] -- name of the capture in the query
-      if name == 'regexplainer.pattern' and is_in_node_range(node, cursor_row - 1, cursor_col) then
-        return node, nil
+  if query then
+    local cursor_range = vim.api.nvim_win_get_cursor(0)
+    local cursor_row, cursor_col = unpack(cursor_range)
+    local cursor_node = get_node_at_cursor(lang_tree)
+    if cursor_node then
+      for id, node in query:iter_captures(cursor_node:tree():root(), 0) do
+        local name = query.captures[id] -- name of the capture in the query
+        if name == 'regexplainer.pattern' and is_in_node_range(node, cursor_row - 1, cursor_col) then
+          return node, nil
+        end
       end
     end
   end
-  return nil, nil
+  return nil, 'no node'
 end
 
 return M

tests/helpers/util.lua

@@ -17,9 +17,9 @@ M.register_name = 'test'
 
 local parse_query = vim.treesitter.query.parse or vim.treesitter.query.parse_query
 local query_js = parse_query('javascript', [[
-  (comment) @comment
+  (comment) @test.comment
   (expression_statement
-    (regex (regex_pattern) @test.pattern)) @test.expr
+    (regex pattern: (regex_pattern) @test.pattern)) @test.expr
   ]])
 
 local function get_expected_from_jsdoc(comment)
@@ -41,17 +41,27 @@ local function get_cases()
   local parser = parsers.get_parser(0)
   local tree = parser:parse()[1]
 
+  local row
+  local expected
+  local pattern
   for id, node in query_js:iter_captures(tree:root(), 0) do
     local name = query_js.captures[id] -- name of the capture in the query
-    local prev = node:prev_sibling()
-    if name == 'test.expr' and prev and prev:type() == 'test.comment' then
-      local text = get_node_text(node:named_child('pattern'), 0)
-      local expected = get_expected_from_jsdoc(get_node_text(prev, 0))
+    if name == 'test.comment' then
+      local jsdoc_text = get_node_text(node, 0);
+      expected = get_expected_from_jsdoc(jsdoc_text)
+    elseif name == 'test.pattern' then
+      pattern = get_node_text(node, 0)
+      row = node:start()
+    end
+    if row and expected and pattern then
       table.insert(results, {
-        text = text,
-        example = expected,
-        row = node:start(),
+        pattern = pattern,
+        expected = expected,
+        row = row,
       })
+      pattern = nil
+      expected = nil
+      row = nil
     end
   end
 
@@ -103,13 +113,16 @@ function M.clear_test_state()
 end
 
 function M.assert_string(regexp, expected, message)
-  vim.cmd[[new]]
-  vim.opt_local.filetype = 'javascript';
-  vim.api.nvim_buf_set_lines(0, 0, 0, false, { regexp })
+  local newbuf = vim.api.nvim_create_buf(true, true)
+
+  vim.opt_local.filetype = 'javascript'
+  vim.api.nvim_set_current_line(regexp)
 
-  local buffer = M.show_and_get_regexplainer_buffer()
+  local buffer
   repeat
-    vim.uv.sleep(500)
+    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})
     buffer = M.show_and_get_regexplainer_buffer()
   until buffer
 
@@ -120,10 +133,11 @@ function M.assert_string(regexp, expected, message)
     false
   ), '\n')
 
-  regexplainer.hide()
 
   -- Cleanup any remaining buffers
-  vim.api.nvim_buf_delete(0, { force = true })
+  vim.api.nvim_buf_delete(newbuf, { force = true })
+
+  regexplainer.hide()
 
   return assert.are.same(expected, text, message)
 end
@@ -142,10 +156,7 @@ function M.show_and_get_regexplainer_buffer()
       end
     end
   end
-  regexplainer.show()
-  local row, col = unpack(vim.api.nvim_win_get_cursor(0));
-  vim.api.nvim_win_set_cursor(0, {row, col + 1})
-  vim.uv.sleep(500)
+  regexplainer.show({debug = true})
   return buffers.get_last_buffer()
 end
 

tests/regexplainer/nvim-regexplainer_spec.lua

@@ -29,13 +29,12 @@ describe("Regexplainer", function()
     local files = vim.tbl_filter(file_filter, all_files)
     for _, file in ipairs(files) do
       local category = file:gsub('tests/fixtures/narrative/%d+ (.*)%.js', '%1')
-      if category ~= 'Simple Patterns' then return end
       describe(category, function()
         before_each(setup_narrative)
         for result in Utils.iter_regexes_with_descriptions(file) do
           if (row_filter(result.row)) then
-            it(result.text, function()
-              Utils.assert_string(result.text, result.example, file .. ':' .. result.row)
+            it(result.pattern, function()
+              Utils.assert_string(result.pattern, result.expected, file .. ':' .. result.row)
             end)
           end
         end