From 8bbe33b10d560a1acc7f301421ada332e01b8eb2 Mon Sep 17 00:00:00 2001 From: Jędrzej Boczar Date: Sun, 18 Apr 2021 00:14:03 +0200 Subject: tests/indent: test cases with `normal o` for C/C++ --- lua/nvim-treesitter/test_utils.lua | 23 +++++++++++++++ lua/tests/indent/c_spec.lua | 43 ++++++++++++++++++++++++---- lua/tests/indent/cpp_spec.lua | 57 ++++++++++++++++++++++++++++++++------ 3 files changed, 108 insertions(+), 15 deletions(-) (limited to 'lua') diff --git a/lua/nvim-treesitter/test_utils.lua b/lua/nvim-treesitter/test_utils.lua index 5665f3ab9..9059aef4e 100644 --- a/lua/nvim-treesitter/test_utils.lua +++ b/lua/nvim-treesitter/test_utils.lua @@ -44,4 +44,27 @@ function M.indent_whole_file(file, opts) assert.are.same(before, after) end +-- Open a file, use `normal o` to insert a new line and compare results +-- @param file path to the initial file +-- @param spec a table with keys: +-- on_line: line on which `normal o` is executed +-- text: text inserted in the new line +-- indent: expected indent before the inserted text (string or int) +-- @param opts buffer options passed to M.set_buf_indent_opts +function M.indent_new_line(file, spec, opts) + local before, after = M.run_indent_test(file, function() + -- move to the line and input the new one + vim.cmd(string.format('normal! %dG', spec.on_line)) + vim.cmd(string.format('normal! o%s', spec.text)) + end, opts) + + local indent = type(spec.indent) == 'string' and spec.indent or string.rep(' ', spec.indent) + + -- print('# before:\n', table.concat(before, '\n')) + -- print('# after:\n', table.concat(after, '\n')) + + table.insert(before, spec.on_line + 1, indent .. spec.text) + assert.are.same(before, after) +end + return M diff --git a/lua/tests/indent/c_spec.lua b/lua/tests/indent/c_spec.lua index 386131036..2850023ab 100644 --- a/lua/tests/indent/c_spec.lua +++ b/lua/tests/indent/c_spec.lua @@ -1,18 +1,49 @@ local whole_file = require('nvim-treesitter.test_utils').indent_whole_file +local new_line = require('nvim-treesitter.test_utils').indent_new_line local scan_dir = require('plenary.scandir').scan_dir +local opts = { + tabstop = 4, + shiftwidth = 4, + softtabstop = 0, + expandtab = true, +} + describe('indent C:', function() describe('whole file:', function() local files = scan_dir('lua/tests/indent/c'); for _, file in ipairs(files) do it(vim.fn.fnamemodify(file, ':t'), function() - whole_file(file, { - tabstop = 4, - shiftwidth = 4, - softtabstop = 0, - expandtab = true, - }) + whole_file(file, opts) + end) + end + end) + + describe('new line:', function() + local run = function(file, spec, title) + title = title and title or tostring(spec.on_line) + it(string.format('%s[%s]', file, title), function() + new_line('lua/tests/indent/c/' .. file, spec, opts) end) end + + run('array.c', { on_line = 2, text = '0,', indent = 4 }) + run('cond.c', { on_line = 3, text = 'x++;', indent = 8 }) + run('cond.c', { on_line = 8, text = 'x++;', indent = 8 }) + run('expr.c', { on_line = 10, text = '2 *', indent = 8 }) + run('func.c', { on_line = 17, text = 'int z,', indent = 4 }) + run('label.c', { on_line = 3, text = 'normal:', indent = 0 }) + run('loop.c', { on_line = 3, text = 'x++;', indent = 8 }) + run('preproc_cond.c', { on_line = 5, text = 'x++;', indent = 4 }) + run('preproc_func.c', { on_line = 3, text = 'x++; \\', indent = 8 }) + run('string.c', { on_line = 1, text = 'brave new \\', indent = 0 }) + run('string.c', { on_line = 4, text = '"brave new "', indent = 4 }) + run('struct.c', { on_line = 4, text = 'int y;', indent = 8 }) + run('switch.c', { on_line = 3, text = 'x++;', indent = 12 }) + run('ternary.c', { on_line = 4, text = ': (x == 0) : 0', indent = 8 }) + -- the line after inserted one will be left with wrong indent but we only care about the inserted one + run('no_braces.c', { on_line = 4, text = 'x++;', indent = 8 }) + run('no_braces.c', { on_line = 7, text = 'x++;', indent = 8 }) + run('no_braces.c', { on_line = 10, text = 'x++;', indent = 8 }) end) end) diff --git a/lua/tests/indent/cpp_spec.lua b/lua/tests/indent/cpp_spec.lua index a785de5b5..fd1f35799 100644 --- a/lua/tests/indent/cpp_spec.lua +++ b/lua/tests/indent/cpp_spec.lua @@ -1,23 +1,62 @@ local whole_file = require('nvim-treesitter.test_utils').indent_whole_file +local new_line = require('nvim-treesitter.test_utils').indent_new_line local scan_dir = require('plenary.scandir').scan_dir local Path = require('plenary.path') +local opts = { + tabstop = 4, + shiftwidth = 4, + softtabstop = 0, + expandtab = true, + filetype = 'cpp', +} + +local get_name = function(file) + return Path:new(file):make_relative('lua/tests/indent') +end + describe('indent C++:', function() describe('whole file:', function() local files = scan_dir('lua/tests/indent/c'); vim.list_extend(files, scan_dir('lua/tests/indent/cpp')) for _, file in ipairs(files) do - local name = Path:new(file):make_relative('lua/tests/indent') - it(name, function() - whole_file(file, { - tabstop = 4, - shiftwidth = 4, - softtabstop = 0, - expandtab = true, - filetype = 'cpp', - }) + it(get_name(file), function() + whole_file(file, opts) + end) + end + end) + + describe('new line:', function() + local run = function(file, spec, title) + title = title and title or tostring(spec.on_line) + it(string.format('%s[%s]', get_name(file), title), function() + new_line(file, spec, opts) end) end + + run('lua/tests/indent/cpp/access.cpp', { on_line = 3, text = 'protected:', indent = 0 }) + run('lua/tests/indent/cpp/class.cpp', { on_line = 2, text = 'using T = int;', indent = 4 }) + run('lua/tests/indent/cpp/stream.cpp', { on_line = 5, text = '<< x + 3', indent = 8 }) + + -- TODO: find a clean way to import these from c_spec.lua + run('lua/tests/indent/c/array.c', { on_line = 2, text = '0,', indent = 4 }) + run('lua/tests/indent/c/cond.c', { on_line = 3, text = 'x++;', indent = 8 }) + run('lua/tests/indent/c/cond.c', { on_line = 8, text = 'x++;', indent = 8 }) + run('lua/tests/indent/c/expr.c', { on_line = 10, text = '2 *', indent = 8 }) + run('lua/tests/indent/c/func.c', { on_line = 17, text = 'int z,', indent = 4 }) + run('lua/tests/indent/c/label.c', { on_line = 3, text = 'normal:', indent = 0 }) + run('lua/tests/indent/c/loop.c', { on_line = 3, text = 'x++;', indent = 8 }) + run('lua/tests/indent/c/preproc_cond.c', { on_line = 5, text = 'x++;', indent = 4 }) + run('lua/tests/indent/c/preproc_func.c', { on_line = 3, text = 'x++; \\', indent = 8 }) + run('lua/tests/indent/c/string.c', { on_line = 1, text = 'brave new \\', indent = 0 }) + run('lua/tests/indent/c/string.c', { on_line = 4, text = '"brave new "', indent = 4 }) + run('lua/tests/indent/c/struct.c', { on_line = 4, text = 'int y;', indent = 8 }) + run('lua/tests/indent/c/switch.c', { on_line = 3, text = 'x++;', indent = 12 }) + run('lua/tests/indent/c/ternary.c', { on_line = 4, text = ': (x == 0) : 0', indent = 8 }) + -- the line after inserted one will be left with wrong indent but we only care about the inserted one + run('lua/tests/indent/c/no_braces.c', { on_line = 4, text = 'x++;', indent = 8 }) + run('lua/tests/indent/c/no_braces.c', { on_line = 7, text = 'x++;', indent = 8 }) + run('lua/tests/indent/c/no_braces.c', { on_line = 10, text = 'x++;', indent = 8 }) end) end) -- cgit v1.2.3-70-g09d2