Skip to content

Commit 6328413

Browse files
MeanderingProgrammerMeanderingProgrammer
committed
chore(testing): use varargs for a few mark creator methods instead of lists
1 parent 9fcac37 commit 6328413

File tree

4 files changed

+40
-40
lines changed

4 files changed

+40
-40
lines changed

‎tests/indent_spec.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ describe('indent', function()
5252
marks:add(row:get(0), { 0 }, border(2, 'below'))
5353

5454
local sections = {
55-
util.table.border(true, true, { 5, 5 }),
56-
util.table.delimiter({ { 5 }, { 5 } }),
55+
util.table.border(true, true, 5, 5),
56+
util.table.delimiter(0, { 5 }, { 5 }),
5757
}
5858
marks:add(row:get(1), { 0 }, util.indent.virtual(sections[1], l2))
5959
marks:add(row:get(0), { 0 }, util.indent.inline(l2))
@@ -116,8 +116,8 @@ describe('indent', function()
116116
marks:add(row:get(0), { 0 }, util.indent.inline(l2))
117117

118118
local sections = {
119-
util.table.border(true, true, { 5, 5 }),
120-
util.table.delimiter({ { 5 }, { 5 } }),
119+
util.table.border(true, true, 5, 5),
120+
util.table.delimiter(0, { 5 }, { 5 }),
121121
}
122122
marks:add(row:get(1), { 0 }, util.indent.virtual(sections[1], l2))
123123
marks:add(row:get(0), { 0 }, util.indent.inline(l2))

‎tests/list_table_spec.lua‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ describe('list_table.md', function()
4242
marks:add(row:get(0, 1), { 0, 0 }, util.heading.bg(1))
4343

4444
local sections = {
45-
util.table.border(false, true, { 8, 15, 7, 6 }),
46-
util.table.delimiter({ { 1, 7 }, { 1, 13, 1 }, { 6, 1 }, { 6 } }),
47-
util.table.border(false, false, { 8, 15, 7, 6 }),
45+
util.table.border(false, true, 8, 15, 7, 6),
46+
util.table.delimiter(0, { 1, 7 }, { 1, 13, 1 }, { 6, 1 }, { 6 }),
47+
util.table.border(false, false, 8, 15, 7, 6),
4848
}
4949
marks:add(row:get(0), { 0 }, sections[1])
5050
marks:add(row:get(1, 0), { 0, 1 }, util.table.pipe(true))
@@ -169,9 +169,9 @@ describe('list_table.md', function()
169169
marks:add(row:get(0, 1), { 0, 0 }, util.heading.bg(1))
170170

171171
local sections = {
172-
util.table.border(false, true, { 10, 15, 7, 6 }),
173-
util.table.delimiter({ { 1, 9 }, { 1, 13, 1 }, { 6, 1 }, { 6 } }),
174-
util.table.border(false, false, { 10, 15, 7, 6 }),
172+
util.table.border(false, true, 10, 15, 7, 6),
173+
util.table.delimiter(0, { 1, 9 }, { 1, 13, 1 }, { 6, 1 }, { 6 }),
174+
util.table.border(false, false, 10, 15, 7, 6),
175175
}
176176
marks:add(row:get(0), { 0 }, sections[1])
177177
marks:add(row:get(1, 0), { 0, 1 }, util.table.pipe(true))

‎tests/table_spec.lua‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ describe('table', function()
2121
local marks, row = util.marks(), util.row()
2222

2323
local sections1 = {
24-
util.table.border(false, true, { 11, 24 }),
25-
util.table.delimiter({ { 11 }, { 23, 1 } }),
26-
util.table.border(false, false, { 11, 24 }),
24+
util.table.border(false, true, 11, 24),
25+
util.table.delimiter(0, { 11 }, { 23, 1 }),
26+
util.table.border(false, false, 11, 24),
2727
}
2828
marks:add(row:get(0), { 0 }, sections1[1])
2929
marks:add(row:get(1, 0), { 0, 1 }, util.table.pipe(true))
@@ -52,9 +52,9 @@ describe('table', function()
5252
marks:add(row:get(1), { 0 }, sections1[3])
5353

5454
local sections2 = {
55-
util.table.border(true, true, { 11, 11 }),
56-
util.table.delimiter({ { 11 }, { 11 } }),
57-
util.table.border(true, false, { 11, 11 }),
55+
util.table.border(true, true, 11, 11),
56+
util.table.delimiter(0, { 11 }, { 11 }),
57+
util.table.border(true, false, 11, 11),
5858
}
5959
marks:add(row:get(1), { 0 }, sections2[1])
6060
marks:add(row:get(0, 0), { 0, 1 }, util.table.pipe(true))
@@ -89,9 +89,9 @@ describe('table', function()
8989
local marks, row = util.marks(), util.row()
9090

9191
local sections1 = {
92-
util.table.border(false, true, { 11, 11 }),
93-
util.table.delimiter({ { 11 }, { 10, 1 } }, 13),
94-
util.table.border(false, false, { 11, 11 }),
92+
util.table.border(false, true, 11, 11),
93+
util.table.delimiter(13, { 11 }, { 10, 1 }),
94+
util.table.border(false, false, 11, 11),
9595
}
9696
marks:add(row:get(0), { 0 }, sections1[1])
9797
marks:add(row:get(1, 0), { 0, 1 }, util.table.pipe(true))
@@ -119,9 +119,9 @@ describe('table', function()
119119
marks:add(row:get(1), { 0 }, sections1[3])
120120

121121
local sections2 = {
122-
util.table.border(true, true, { 11, 11 }),
123-
util.table.delimiter({ { 11 }, { 11 } }),
124-
util.table.border(true, false, { 11, 11 }),
122+
util.table.border(true, true, 11, 11),
123+
util.table.delimiter(0, { 11 }, { 11 }),
124+
util.table.border(true, false, 11, 11),
125125
}
126126
marks:add(row:get(1), { 0 }, sections2[1])
127127
marks:add(row:get(0, 0), { 0, 1 }, util.table.pipe(true))
@@ -156,7 +156,7 @@ describe('table', function()
156156
local marks, row = util.marks(), util.row()
157157

158158
local sections1 = {
159-
util.table.delimiter({ { 11 }, { 23, 1 } }),
159+
util.table.delimiter(0, { 11 }, { 23, 1 }),
160160
}
161161
marks:add(row:get(1, 0), { 0, 1 }, util.table.pipe(true))
162162
marks:add(row:get(0, 0), { 12, 13 }, util.table.pipe(true))
@@ -176,9 +176,9 @@ describe('table', function()
176176
marks:add(row:get(0, 0), { 38, 39 }, util.table.pipe(false))
177177

178178
local sections2 = {
179-
util.table.border(false, true, { 11, 11 }),
180-
util.table.delimiter({ { 11 }, { 11 } }),
181-
util.table.border(true, false, { 11, 11 }),
179+
util.table.border(false, true, 11, 11),
180+
util.table.delimiter(0, { 11 }, { 11 }),
181+
util.table.border(true, false, 11, 11),
182182
}
183183
marks:add(row:get(1), { 0 }, sections2[1])
184184
marks:add(row:get(1, 0), { 0, 1 }, util.table.pipe(true))
@@ -212,9 +212,9 @@ describe('table', function()
212212
local marks, row = util.marks(), util.row()
213213

214214
local sections1 = {
215-
util.table.border(false, true, { 11, 24 }),
216-
util.table.delimiter({ { 11 }, { 23, 1 } }),
217-
util.table.border(false, false, { 11, 24 }),
215+
util.table.border(false, true, 11, 24),
216+
util.table.delimiter(0, { 11 }, { 23, 1 }),
217+
util.table.border(false, false, 11, 24),
218218
}
219219
marks:add(row:get(0), { 0 }, sections1[1])
220220
marks:add(row:get(1, 0), { 0, 38 }, {
@@ -254,9 +254,9 @@ describe('table', function()
254254
marks:add(row:get(1), { 0 }, sections1[3])
255255

256256
local sections2 = {
257-
util.table.border(true, true, { 11, 11 }),
258-
util.table.delimiter({ { 11 }, { 11 } }),
259-
util.table.border(true, false, { 11, 11 }),
257+
util.table.border(true, true, 11, 11),
258+
util.table.delimiter(0, { 11 }, { 11 }),
259+
util.table.border(true, false, 11, 11),
260260
}
261261
marks:add(row:get(1), { 0 }, sections2[1])
262262
marks:add(row:get(0, 0), { 0, 25 }, {

‎tests/util.lua‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -326,14 +326,14 @@ end
326326

327327
---@param virtual boolean
328328
---@param above boolean
329-
---@param lengths integer[]
329+
---@param ... integer
330330
---@return vim.api.keyset.set_extmark
331-
function M.table.border(virtual, above, lengths)
331+
function M.table.border(virtual, above, ...)
332332
local chars = above and { '┌', '┬', '┐' } or { '└', '┴', '┘' }
333333
local highlight = above and 'RmTableHead' or 'RmTableRow'
334334
local parts = vim.tbl_map(function(length)
335335
return ('─'):rep(length)
336-
end, lengths)
336+
end, { ... })
337337
local text = chars[1] .. table.concat(parts, chars[2]) .. chars[3]
338338
if virtual then
339339
---@type vim.api.keyset.set_extmark
@@ -350,20 +350,20 @@ function M.table.border(virtual, above, lengths)
350350
end
351351
end
352352

353-
---@param sections integer[][]
354-
---@param padding? integer
353+
---@param padding integer
354+
---@param ... integer[]
355355
---@return vim.api.keyset.set_extmark
356-
function M.table.delimiter(sections, padding)
356+
function M.table.delimiter(padding, ...)
357357
local parts = vim.tbl_map(function(widths)
358358
local section = vim.tbl_map(function(amount)
359359
return amount == 1 and '━' or ('─'):rep(amount)
360360
end, widths)
361361
return table.concat(section, '')
362-
end, sections)
362+
end, { ... })
363363
local line = {
364364
{ '├' .. table.concat(parts, '┼') .. '┤', 'RmTableHead' },
365365
}
366-
if padding then
366+
if padding > 0 then
367367
line[#line + 1] = { (' '):rep(padding), 'Normal' }
368368
end
369369
---@type vim.api.keyset.set_extmark

0 commit comments

Comments
 (0)