Merge pull request #12611 from janlazo/vim-8.0.1531

vim-patch:8.0.{1531,1544,1589,1591,1712,1745,1747},8.1.{819},8.2.{420,539,893,894,895,899,1114,1118,1169,1170,1171,1172,1173,1177,1179,1180,1181,1187,1188,1196,1198,1211,1214,1215,1222}
This commit is contained in:
Matthieu Coudron
2020-07-19 18:41:40 +02:00
committed by GitHub
15 changed files with 235 additions and 81 deletions

View File

@@ -47,10 +47,8 @@ describe('NULL', function()
-- Subjectable behaviour
-- FIXME Should return 1
null_expr_test('is equal to empty list', 'L == []', 0, 0)
-- FIXME Should return 1
null_expr_test('is equal to empty list (reverse order)', '[] == L', 0, 0)
null_expr_test('is equal to empty list', 'L == []', 0, 1)
null_expr_test('is equal to empty list (reverse order)', '[] == L', 0, 1)
-- Correct behaviour
null_expr_test('can be indexed with error message for empty list', 'L[0]',

View File

@@ -38,6 +38,9 @@ describe('assert function:', function()
call assert_equal(4, n)
let l = [1, 2, 3]
call assert_equal([1, 2, 3], l)
call assert_equal(v:_null_list, v:_null_list)
call assert_equal(v:_null_list, [])
call assert_equal([], v:_null_list)
fu Func()
endfu
let F1 = function('Func')
@@ -92,6 +95,11 @@ describe('assert function:', function()
call('assert_equal', 'foo', 'bar', 'testing')
expected_errors({"testing: Expected 'foo' but got 'bar'"})
end)
it('should shorten a long message', function()
call ('assert_equal', 'XxxxxxxxxxxxxxxxxxxxxxX', 'XyyyyyyyyyyyyyyyyyyyyyyyyyX')
expected_errors({"Expected 'X\\[x occurs 21 times]X' but got 'X\\[y occurs 25 times]X'"})
end)
end)
-- assert_notequal({expected}, {actual}[, {msg}])

View File

@@ -1234,13 +1234,13 @@ describe('typval.c', function()
local l = list()
local l2 = list()
-- NULL lists are not equal to empty lists
eq(false, lib.tv_list_equal(l, nil, true, false))
eq(false, lib.tv_list_equal(nil, l, false, false))
eq(false, lib.tv_list_equal(nil, l, false, true))
eq(false, lib.tv_list_equal(l, nil, true, true))
-- NULL lists are equal to empty lists
eq(true, lib.tv_list_equal(l, nil, true, false))
eq(true, lib.tv_list_equal(nil, l, false, false))
eq(true, lib.tv_list_equal(nil, l, false, true))
eq(true, lib.tv_list_equal(l, nil, true, true))
-- Yet NULL lists are equal themselves
-- NULL lists are equal themselves
eq(true, lib.tv_list_equal(nil, nil, true, false))
eq(true, lib.tv_list_equal(nil, nil, false, false))
eq(true, lib.tv_list_equal(nil, nil, false, true))
@@ -2648,13 +2648,13 @@ describe('typval.c', function()
local l2 = lua2typvalt(empty_list)
local nl = lua2typvalt(null_list)
-- NULL lists are not equal to empty lists
eq(false, lib.tv_equal(l, nl, true, false))
eq(false, lib.tv_equal(nl, l, false, false))
eq(false, lib.tv_equal(nl, l, false, true))
eq(false, lib.tv_equal(l, nl, true, true))
-- NULL lists are equal to empty lists
eq(true, lib.tv_equal(l, nl, true, false))
eq(true, lib.tv_equal(nl, l, false, false))
eq(true, lib.tv_equal(nl, l, false, true))
eq(true, lib.tv_equal(l, nl, true, true))
-- Yet NULL lists are equal themselves
-- NULL lists are equal themselves
eq(true, lib.tv_equal(nl, nl, true, false))
eq(true, lib.tv_equal(nl, nl, false, false))
eq(true, lib.tv_equal(nl, nl, false, true))