tests/indent: refactor indent test runner and auto-discover language test files

lua/nvim-treesitter/test_utils.lua

@@ -3,7 +3,7 @@ local M = {}
 local assert = require('luassert')
 
 function M.set_buf_indent_opts(opts)
-    local optnames = {'tabstop', 'shiftwidth', 'softtabstop', 'expandtab'}
+  local optnames = {'tabstop', 'shiftwidth', 'softtabstop', 'expandtab', 'filetype'}
   for _, opt in ipairs(optnames) do
     if opts[opt] ~= nil then
       vim.bo[opt] = opts[opt]
@@ -11,12 +11,12 @@ function M.set_buf_indent_opts(opts)
   end
 end
 
-function M.indent_whole_file(file, opts)
+function M.run_indent_test(file, runner, opts)
   assert.are.same(1, vim.fn.filereadable(file))
 
   -- load reference file
   vim.cmd(string.format('edit %s', file))
-  local reference = vim.api.nvim_buf_get_lines(0, 0, -1, true)
+  local before = vim.api.nvim_buf_get_lines(0, 0, -1, true)
 
   -- FIXME: why this is not set automatically?
   vim.bo.indentexpr = 'nvim_treesitter#indent()'
@@ -24,15 +24,24 @@ function M.indent_whole_file(file, opts)
 
   M.set_buf_indent_opts(opts)
 
-  -- indent the whole file
+  -- perform the test
-  vim.cmd 'silent normal gg=G'
+  runner()
-  local indented =  vim.api.nvim_buf_get_lines(0, 0, -1, true)
+
+  -- get file content after the test
+  local after = vim.api.nvim_buf_get_lines(0, 0, -1, true)
 
   -- clear any changes to avoid 'No write since last change (add ! to override)'
   vim.cmd 'edit!'
 
-  -- compare before and after
+  return before, after
-  assert.are.same(reference, indented)
+end
+
+function M.indent_whole_file(file, opts)
+  local before, after = M.run_indent_test(file, function()
+    vim.cmd 'silent normal gg=G'
+  end, opts)
+
+  assert.are.same(before, after)
 end
 
 return M

lua/tests/indent/c_spec.lua

@@ -1,13 +1,12 @@
 local whole_file = require('nvim-treesitter.test_utils').indent_whole_file
+local scan_dir = require('plenary.scandir').scan_dir
 
-describe('indent C', function()
+describe('indent C:', function()
-  local files = {
+  describe('whole file:', function()
-    'basic.c',
+    local files = scan_dir('lua/tests/indent/c');
-    'no_braces.c',
-  }
     for _, file in ipairs(files) do
-    it(file, function()
+      it(vim.fn.fnamemodify(file, ':t'), function()
-      whole_file('lua/tests/indent/c/' .. file, {
+        whole_file(file, {
           tabstop = 4,
           shiftwidth = 4,
           softtabstop = 0,
@@ -16,3 +15,4 @@ describe('indent C', function()
       end)
     end
   end)
+end)

lua/tests/indent/python_spec.lua

@@ -1,21 +1,12 @@
 local whole_file = require('nvim-treesitter.test_utils').indent_whole_file
+local scan_dir = require('plenary.scandir').scan_dir
 
-describe('indent python', function()
+describe('indent Python:', function()
-  local files = {
+  describe('whole file:', function()
-    'aligned_indent.py',
+    local files = scan_dir('lua/tests/indent/python');
-    'basic_blocks.py',
-    'basic_collections.py',
-    'branches.py',
-    'comprehensions.py',
-    'control_flow.py',
-    'hanging_indent.py',
-    'join_lines.py',
-    'nested_collections.py',
-    'strings.py',
-  }
     for _, file in ipairs(files) do
-    it(file, function()
+      it(vim.fn.fnamemodify(file, ':t'), function()
-      whole_file('lua/tests/indent/python/' .. file, {
+        whole_file(file, {
           tabstop = 4,
           shiftwidth = 4,
           softtabstop = 0,
@@ -24,3 +15,4 @@ describe('indent python', function()
       end)
     end
   end)
+end)

lua/tests/indent/rust_spec.lua

@@ -1,12 +1,12 @@
 local whole_file = require('nvim-treesitter.test_utils').indent_whole_file
+local scan_dir = require('plenary.scandir').scan_dir
 
-describe('indent rust', function()
+describe('indent Rust:', function()
-  local files = {
+  describe('whole file:', function()
-    'basic.rs',
+    local files = scan_dir('lua/tests/indent/rust');
-  }
     for _, file in ipairs(files) do
-    it(file, function()
+      it(vim.fn.fnamemodify(file, ':t'), function()
-      whole_file('lua/tests/indent/rust/' .. file, {
+        whole_file(file, {
           tabstop = 4,
           shiftwidth = 4,
           softtabstop = 0,
@@ -15,3 +15,4 @@ describe('indent rust', function()
       end)
     end
   end)
+end)