Bram Moolenaar wrote:
> Patch 8.2.1933
> Problem: Cannot sort using locale ordering.
> Solution: Add a flag for :sort and sort() to use the locale. (Dominique
> Pellé, closes #7237)
> Files: runtime/doc/change.txt, runtime/doc/eval.txt, src/ex_cmds.c,
> src/list.c, src/testdir/test_sort.vim
Unfortunately, Test_sort_cmd() and Test_sort_strings() fail in CI on macOS.
The ordering using strtoll() does not look correct. I don' know why.
Maybe it's the same issue as https://bugs.php.net/bug.php?id=48322 ?
I don't have a mac to experiment. So I suggest to disable the tests for mac
(see attached patch) until someone can figure out why it fails.
Regards
Dominique
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/CAON-T_jrMwZwszvWtqgpGr5U%3D-AdcHsp3FMpwwJjYb3QFQccNA%40mail.gmail.com.
diff --git a/src/testdir/test_sort.vim b/src/testdir/test_sort.vim
index 93190a940..2e13a617b 100644
--- a/src/testdir/test_sort.vim
+++ b/src/testdir/test_sort.vim
@@ -22,17 +22,20 @@ func Test_sort_strings()
call assert_equal(['A', 'a', 'o', 'O', 'p', 'P', 'Ä', 'Ô', 'ä', 'ô', 'œ', 'œ'],
\ sort(['A', 'a', 'o', 'O', 'œ', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'i'))
- let lc = execute('language collate')
- " With the following locales, the accentuated letters are ordered
- " similarly to the non-accentuated letters...
- if lc =~? '"\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8"'
- call assert_equal(['a', 'A', 'ä', 'Ä', 'o', 'O', 'ô', 'Ô', 'œ', 'œ', 'p', 'P'],
- \ sort(['A', 'a', 'o', 'O', 'œ', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'l'))
- " ... whereas with a Swedish locale, the accentuated letters are ordered
- " after Z.
- elseif lc =~? '"sv.*utf-\?8"'
- call assert_equal(['a', 'A', 'o', 'O', 'p', 'P', 'ä', 'Ä', 'œ', 'œ', 'ô', 'Ô'],
- \ sort(['A', 'a', 'o', 'O', 'œ', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'l'))
+ " FIXME: Testing ordering with locale does not work on macOS.
+ if !has('mac')
+ let lc = execute('language collate')
+ " With the following locales, the accentuated letters are ordered
+ " similarly to the non-accentuated letters...
+ if lc =~? '"\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8"'
+ call assert_equal(['a', 'A', 'ä', 'Ä', 'o', 'O', 'ô', 'Ô', 'œ', 'œ', 'p', 'P'],
+ \ sort(['A', 'a', 'o', 'O', 'œ', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'l'))
+ " ... whereas with a Swedish locale, the accentuated letters are ordered
+ " after Z.
+ elseif lc =~? '"sv.*utf-\?8"'
+ call assert_equal(['a', 'A', 'o', 'O', 'p', 'P', 'ä', 'Ä', 'œ', 'œ', 'ô', 'Ô'],
+ \ sort(['A', 'a', 'o', 'O', 'œ', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'l'))
+ endif
endif
endfunc
@@ -1223,56 +1226,59 @@ func Test_sort_cmd()
\ },
\ ]
- " With the following locales, the accentuated letters are ordered
- " similarly to the non-accentuated letters...
- let lc = execute('language collate')
- if lc =~? '"\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8"'
- let tests += [
- \ {
- \ 'name' : 'sort with locale',
- \ 'cmd' : '%sort l',
- \ 'input' : [
- \ 'A',
- \ 'E',
- \ 'O',
- \ 'À',
- \ 'È',
- \ 'É',
- \ 'Ô',
- \ 'Œ',
- \ 'Z',
- \ 'a',
- \ 'e',
- \ 'o',
- \ 'à',
- \ 'è',
- \ 'é',
- \ 'ô',
- \ 'œ',
- \ 'z'
- \ ],
- \ 'expected' : [
- \ 'a',
- \ 'A',
- \ 'à',
- \ 'À',
- \ 'e',
- \ 'E',
- \ 'é',
- \ 'É',
- \ 'è',
- \ 'È',
- \ 'o',
- \ 'O',
- \ 'ô',
- \ 'Ô',
- \ 'œ',
- \ 'Œ',
- \ 'z',
- \ 'Z'
- \ ]
- \ },
- \ ]
+ " FIXME: Testing ordering with locale does not work on macOS.
+ if !has('mac')
+ " With the following locales, the accentuated letters are ordered
+ " similarly to the non-accentuated letters...
+ let lc = execute('language collate')
+ if lc =~? '"\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8"'
+ let tests += [
+ \ {
+ \ 'name' : 'sort with locale',
+ \ 'cmd' : '%sort l',
+ \ 'input' : [
+ \ 'A',
+ \ 'E',
+ \ 'O',
+ \ 'À',
+ \ 'È',
+ \ 'É',
+ \ 'Ô',
+ \ 'Œ',
+ \ 'Z',
+ \ 'a',
+ \ 'e',
+ \ 'o',
+ \ 'à',
+ \ 'è',
+ \ 'é',
+ \ 'ô',
+ \ 'œ',
+ \ 'z'
+ \ ],
+ \ 'expected' : [
+ \ 'a',
+ \ 'A',
+ \ 'à',
+ \ 'À',
+ \ 'e',
+ \ 'E',
+ \ 'é',
+ \ 'É',
+ \ 'è',
+ \ 'È',
+ \ 'o',
+ \ 'O',
+ \ 'ô',
+ \ 'Ô',
+ \ 'œ',
+ \ 'Œ',
+ \ 'z',
+ \ 'Z'
+ \ ]
+ \ },
+ \ ]
+ endif
endif
if has('float')
let tests += [
