diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2022-03-29 22:14:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 04:14:37 +0800 |
| commit | 29aa08a09da088178bccc5ea29ac1c872bc4ab32 (patch) | |
| tree | 096b95311139ecc0ef4540f00c5a5fef4fb46d3c /src | |
| parent | 7a6978ba29572ca4346a795fcbcb67e047d0b776 (diff) | |
| download | rneovim-29aa08a09da088178bccc5ea29ac1c872bc4ab32.tar.gz rneovim-29aa08a09da088178bccc5ea29ac1c872bc4ab32.tar.bz2 rneovim-29aa08a09da088178bccc5ea29ac1c872bc4ab32.zip | |
vim-patch:8.2.3449: sort fails if the sort compare function returns 999 (#17909)
Problem: Sort fails if the sort compare function returns 999.
Solution: Adjust value to -1 / 0 / 1. (Yasuhiro Matsumoto, closes vim/vim#8884)
https://github.com/vim/vim/commit/c04f62346bfd6b92151908239a3c5ab1a7d18f2a
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval/funcs.c | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/test_sort.vim | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 41b419c150..ae9cb3b1e8 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -9466,6 +9466,11 @@ static int item_compare2(const void *s1, const void *s2, bool keep_zero) res = ITEM_COMPARE_FAIL; } else { res = tv_get_number_chk(&rettv, &sortinfo->item_compare_func_err); + if (res > 0) { + res = 1; + } else if (res < 0) { + res = -1; + } } if (sortinfo->item_compare_func_err) { res = ITEM_COMPARE_FAIL; // return value has wrong type diff --git a/src/nvim/testdir/test_sort.vim b/src/nvim/testdir/test_sort.vim index f72368fc59..5d7dd7bfff 100644 --- a/src/nvim/testdir/test_sort.vim +++ b/src/nvim/testdir/test_sort.vim @@ -59,6 +59,7 @@ endfunc func Test_sort_numbers() call assert_equal([3, 13, 28], sort([13, 28, 3], 'N')) call assert_equal(['3', '13', '28'], sort(['13', '28', '3'], 'N')) + call assert_equal([3997, 4996], sort([4996, 3997], 'Compare1')) endfunc func Test_sort_float() |