2021-08-22 03:22:04 -07:00
|
|
|
local helpers = require('test.functional.helpers')(after_each)
|
|
|
|
local clear = helpers.clear
|
|
|
|
local exec_lua = helpers.exec_lua
|
|
|
|
local eq = helpers.eq
|
|
|
|
local pcall_err = helpers.pcall_err
|
|
|
|
|
|
|
|
describe('xdiff bindings', function()
|
|
|
|
before_each(function()
|
|
|
|
clear()
|
|
|
|
end)
|
|
|
|
|
|
|
|
describe('can diff text', function()
|
|
|
|
before_each(function()
|
|
|
|
exec_lua [[
|
|
|
|
a1 = 'Hello\n'
|
|
|
|
b1 = 'Helli\n'
|
|
|
|
|
|
|
|
a2 = 'Hello\nbye\nfoo\n'
|
|
|
|
b2 = 'Helli\nbye\nbar\nbaz\n'
|
|
|
|
]]
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('with no callback', function()
|
|
|
|
eq(
|
|
|
|
table.concat({
|
|
|
|
'@@ -1 +1 @@',
|
|
|
|
'-Hello',
|
|
|
|
'+Helli',
|
|
|
|
'',
|
|
|
|
}, '\n'),
|
|
|
|
exec_lua('return vim.diff(a1, b1)')
|
|
|
|
)
|
|
|
|
|
|
|
|
eq(
|
|
|
|
table.concat({
|
|
|
|
'@@ -1 +1 @@',
|
|
|
|
'-Hello',
|
|
|
|
'+Helli',
|
|
|
|
'@@ -3 +3,2 @@',
|
|
|
|
'-foo',
|
|
|
|
'+bar',
|
|
|
|
'+baz',
|
|
|
|
'',
|
|
|
|
}, '\n'),
|
|
|
|
exec_lua('return vim.diff(a2, b2)')
|
|
|
|
)
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('with callback', function()
|
|
|
|
exec_lua([[on_hunk = function(sa, ca, sb, cb)
|
|
|
|
exp[#exp+1] = {sa, ca, sb, cb}
|
|
|
|
end]])
|
|
|
|
|
|
|
|
eq(
|
|
|
|
{ { 1, 1, 1, 1 } },
|
|
|
|
exec_lua [[
|
|
|
|
exp = {}
|
|
|
|
assert(vim.diff(a1, b1, {on_hunk = on_hunk}) == nil)
|
|
|
|
return exp
|
|
|
|
]]
|
|
|
|
)
|
|
|
|
|
|
|
|
eq(
|
|
|
|
{ { 1, 1, 1, 1 }, { 3, 1, 3, 2 } },
|
|
|
|
exec_lua [[
|
|
|
|
exp = {}
|
|
|
|
assert(vim.diff(a2, b2, {on_hunk = on_hunk}) == nil)
|
|
|
|
return exp
|
|
|
|
]]
|
|
|
|
)
|
|
|
|
|
|
|
|
-- gives higher precedence to on_hunk over result_type
|
|
|
|
eq(
|
|
|
|
{ { 1, 1, 1, 1 }, { 3, 1, 3, 2 } },
|
|
|
|
exec_lua [[
|
|
|
|
exp = {}
|
|
|
|
assert(vim.diff(a2, b2, {on_hunk = on_hunk, result_type='indices'}) == nil)
|
|
|
|
return exp
|
|
|
|
]]
|
|
|
|
)
|
|
|
|
end)
|
|
|
|
|
|
|
|
it('with error callback', function()
|
2022-11-14 03:01:35 -07:00
|
|
|
exec_lua [[
|
|
|
|
on_hunk = function(sa, ca, sb, cb)
|
2021-08-22 03:22:04 -07:00
|
|
|
error('ERROR1')
|
2022-11-14 03:01:35 -07:00
|
|
|
end
|
|
|
|
]]
|
2021-08-22 03:22:04 -07:00
|
|
|
|
2022-11-14 03:01:35 -07:00
|
|
|
eq(
|
|
|
|
[[error running function on_hunk: [string "<nvim>"]:0: ERROR1]],
|
2021-08-22 03:22:04 -07:00
|
|
|
pcall_err(exec_lua, [[vim.diff(a1, b1, {on_hunk = on_hunk})]])
|
2024-01-02 18:09:18 -07:00
|
|
|
)
|
2021-08-22 03:22:04 -07:00
|
|
|
end)
|
|
|
|
|
|
|
|
it('with hunk_lines', function()
|
|
|
|
eq({ { 1, 1, 1, 1 } }, exec_lua([[return vim.diff(a1, b1, {result_type = 'indices'})]]))
|
|
|
|
|
|
|
|
eq(
|
|
|
|
{ { 1, 1, 1, 1 }, { 3, 1, 3, 2 } },
|
|
|
|
exec_lua([[return vim.diff(a2, b2, {result_type = 'indices'})]])
|
2024-01-02 18:09:18 -07:00
|
|
|
)
|
2021-08-22 03:22:04 -07:00
|
|
|
end)
|
|
|
|
|
2022-02-05 10:49:48 -07:00
|
|
|
it('can run different algorithms', function()
|
|
|
|
local a = table.concat({
|
|
|
|
'.foo1 {',
|
|
|
|
' margin: 0;',
|
|
|
|
'}',
|
|
|
|
'',
|
|
|
|
'.bar {',
|
|
|
|
' margin: 0;',
|
|
|
|
'}',
|
|
|
|
'',
|
|
|
|
}, '\n')
|
|
|
|
|
|
|
|
local b = table.concat({
|
|
|
|
'.bar {',
|
|
|
|
' margin: 0;',
|
|
|
|
'}',
|
|
|
|
'',
|
|
|
|
'.foo1 {',
|
|
|
|
' margin: 0;',
|
|
|
|
' color: green;',
|
|
|
|
'}',
|
|
|
|
'',
|
|
|
|
}, '\n')
|
|
|
|
|
|
|
|
eq(
|
|
|
|
table.concat({
|
|
|
|
'@@ -1,4 +0,0 @@',
|
|
|
|
'-.foo1 {',
|
|
|
|
'- margin: 0;',
|
|
|
|
'-}',
|
|
|
|
'-',
|
|
|
|
'@@ -7,0 +4,5 @@',
|
|
|
|
'+',
|
|
|
|
'+.foo1 {',
|
|
|
|
'+ margin: 0;',
|
|
|
|
'+ color: green;',
|
|
|
|
'+}',
|
|
|
|
'',
|
|
|
|
}, '\n'),
|
|
|
|
exec_lua(
|
|
|
|
[[
|
|
|
|
local args = {...}
|
|
|
|
return vim.diff(args[1], args[2], {
|
|
|
|
algorithm = 'patience'
|
|
|
|
})
|
|
|
|
]],
|
|
|
|
a,
|
|
|
|
b
|
|
|
|
)
|
2024-01-02 18:09:18 -07:00
|
|
|
)
|
2022-02-05 10:49:48 -07:00
|
|
|
end)
|
2021-08-22 03:22:04 -07:00
|
|
|
end)
|
|
|
|
|
|
|
|
it('can handle bad args', function()
|
|
|
|
eq([[Expected at least 2 arguments]], pcall_err(exec_lua, [[vim.diff('a')]]))
|
|
|
|
|
2022-11-14 03:01:35 -07:00
|
|
|
eq([[bad argument #1 to 'diff' (expected string)]], pcall_err(exec_lua, [[vim.diff(1, 2)]]))
|
2021-08-22 03:22:04 -07:00
|
|
|
|
2022-11-14 03:01:35 -07:00
|
|
|
eq(
|
|
|
|
[[bad argument #3 to 'diff' (expected table)]],
|
2021-08-22 03:22:04 -07:00
|
|
|
pcall_err(exec_lua, [[vim.diff('a', 'b', true)]])
|
2024-01-02 18:09:18 -07:00
|
|
|
)
|
2021-08-22 03:22:04 -07:00
|
|
|
|
2024-02-11 11:13:38 -07:00
|
|
|
eq([[invalid key: bad_key]], pcall_err(exec_lua, [[vim.diff('a', 'b', { bad_key = true })]]))
|
2021-08-22 03:22:04 -07:00
|
|
|
|
2024-01-02 18:09:18 -07:00
|
|
|
eq(
|
2022-11-14 03:01:35 -07:00
|
|
|
[[on_hunk is not a function]],
|
2021-08-22 03:22:04 -07:00
|
|
|
pcall_err(exec_lua, [[vim.diff('a', 'b', { on_hunk = true })]])
|
2024-01-02 18:09:18 -07:00
|
|
|
)
|
2021-08-22 03:22:04 -07:00
|
|
|
end)
|
|
|
|
end)
|