Mercurial > vim
view src/testdir/test_fileformat.vim @ 33713:9aa03e12b2b5 v9.0.2090
patch 9.0.2090: complete_info() skips entries with 'noselect'
Commit: https://github.com/vim/vim/commit/57f9ce1a0977da13e5923214086795ffa2d28ce1
Author: Christian Brabandt <cb@256bit.org>
Date: Sat Nov 4 09:58:14 2023 +0100
patch 9.0.2090: complete_info() skips entries with 'noselect'
Problem: complete_info() skips entries with 'noselect'
Solution: Check, if first entry is at original text state
Unfortunately, Commit daef8c74375141974d61b85199b383017644978c
introduced a regression, that when ':set completeopt+=noselect' is set
and no completion item has been selected yet, it did not fill the
complete_info['items'] list.
This happened, because the current match item did not have the
CP_ORIGINAL_TEXT flag set and then the cp->prev pointer did point to the
original flag item, which caused the following while loop to not being
run but being skipped instead.
So when the 'noselect' is set, only start with to the previous selection
item, if the initial completion item has the CP_ORIGINAL_TEXT flag set,
else use the 2nd previous item instead.
fixes: #13451
closes: #13452
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 04 Nov 2023 10:15:04 +0100 |
parents | a52697bcffa6 |
children |
line wrap: on
line source
" Test for 'fileformat' source shared.vim " Test behavior of fileformat after bwipeout of last buffer func Test_fileformat_after_bw() bwipeout set fileformat& if &fileformat == 'dos' let test_fileformats = 'unix' elseif &fileformat == 'unix' let test_fileformats = 'mac' else " must be mac let test_fileformats = 'dos' endif exec 'set fileformats='.test_fileformats bwipeout! call assert_equal(test_fileformats, &fileformat) set fileformats& endfunc func Test_fileformat_autocommand() let filecnt = ["", "foobar\<CR>", "eins\<CR>", "\<CR>", "zwei\<CR>", "drei", "vier", "fünf", ""] let ffs = &ffs call writefile(filecnt, 'Xffafile', 'bD') au BufReadPre Xffafile set ffs=dos ff=dos new Xffafile call assert_equal('dos', &l:ff) call assert_equal('dos', &ffs) " cleanup let &ffs = ffs au! BufReadPre Xffafile bw! endfunc func Test_fileformat_nomodifiable() new setlocal nomodifiable call assert_fails('set fileformat=latin1', 'E21:') bw endfunc " Convert the contents of a file into a literal string func s:file2str(fname) let b = readfile(a:fname, 'B') let s = '' for c in b let s .= nr2char(c) endfor return s endfunc " Concatenate the contents of files 'f1' and 'f2' and create 'destfile' func s:concat_files(f1, f2, destfile) let b1 = readfile(a:f1, 'B') let b2 = readfile(a:f2, 'B') let b3 = b1 + b2 call writefile(b3, a:destfile, 'B') endfun " Test for a lot of variations of the 'fileformats' option func Test_fileformats() " create three test files, one in each format call writefile(['unix', 'unix'], 'XXUnix', 'D') call writefile(["dos\r", "dos\r"], 'XXDos', 'D') call writefile(["mac\rmac\r"], 'XXMac', 'bD') " create a file with no End Of Line call writefile(["noeol"], 'XXEol', 'bD') " create mixed format files call s:concat_files('XXUnix', 'XXDos', 'XXUxDs') call s:concat_files('XXUnix', 'XXMac', 'XXUxMac') call s:concat_files('XXDos', 'XXMac', 'XXDosMac') call s:concat_files('XXMac', 'XXEol', 'XXMacEol') call s:concat_files('XXUxDs', 'XXMac', 'XXUxDsMc') " The :bwipe commands below cause us to get back to the current buffer. " Avoid stray errors for various 'fileformat' values which may cause a " modeline to be misinterpreted by wiping the buffer and editing a new one. only! bwipe! enew " Test 1: try reading and writing with 'fileformats' empty set fileformats= " try with 'fileformat' set to 'unix' set fileformat=unix e! XXUnix w! Xtest call assert_equal("unix\nunix\n", s:file2str('Xtest')) e! XXDos w! Xtest call assert_equal("dos\r\ndos\r\n", s:file2str('Xtest')) e! XXMac w! Xtest call assert_equal("mac\rmac\r\n", s:file2str('Xtest')) bwipe XXUnix XXDos XXMac " try with 'fileformat' set to 'dos' set fileformat=dos e! XXUnix w! Xtest call assert_equal("unix\r\nunix\r\n", s:file2str('Xtest')) e! XXDos w! Xtest call assert_equal("dos\r\ndos\r\n", s:file2str('Xtest')) e! XXMac w! Xtest call assert_equal("mac\rmac\r\r\n", s:file2str('Xtest')) bwipe XXUnix XXDos XXMac " try with 'fileformat' set to 'mac' set fileformat=mac e! XXUnix w! Xtest call assert_equal("unix\nunix\n\r", s:file2str('Xtest')) e! XXDos w! Xtest call assert_equal("dos\r\ndos\r\n\r", s:file2str('Xtest')) e! XXMac w! Xtest call assert_equal("mac\rmac\r", s:file2str('Xtest')) bwipe XXUnix XXDos XXMac " Test 2: try reading and writing with 'fileformats' set to one format " try with 'fileformats' set to 'unix' set fileformats=unix e! XXUxDsMc w! Xtest call assert_equal("unix\nunix\ndos\r\ndos\r\nmac\rmac\r\n", \ s:file2str('Xtest')) bwipe XXUxDsMc " try with 'fileformats' set to 'dos' set fileformats=dos e! XXUxDsMc w! Xtest call assert_equal("unix\r\nunix\r\ndos\r\ndos\r\nmac\rmac\r\r\n", \ s:file2str('Xtest')) bwipe XXUxDsMc " try with 'fileformats' set to 'mac' set fileformats=mac e! XXUxDsMc w! Xtest call assert_equal("unix\nunix\ndos\r\ndos\r\nmac\rmac\r", \ s:file2str('Xtest')) bwipe XXUxDsMc " Test 3: try reading and writing with 'fileformats' set to two formats " try with 'fileformats' set to 'unix,dos' set fileformats=unix,dos e! XXUxDsMc w! Xtest call assert_equal("unix\nunix\ndos\r\ndos\r\nmac\rmac\r\n", \ s:file2str('Xtest')) bwipe XXUxDsMc e! XXUxMac w! Xtest call assert_equal("unix\nunix\nmac\rmac\r\n", s:file2str('Xtest')) bwipe XXUxMac e! XXDosMac w! Xtest call assert_equal("dos\r\ndos\r\nmac\rmac\r\r\n", s:file2str('Xtest')) bwipe XXDosMac " try with 'fileformats' set to 'unix,mac' set fileformats=unix,mac e! XXUxDs w! Xtest call assert_equal("unix\nunix\ndos\r\ndos\r\n", s:file2str('Xtest')) bwipe XXUxDs e! XXUxDsMc w! Xtest call assert_equal("unix\nunix\ndos\r\ndos\r\nmac\rmac\r\n", \ s:file2str('Xtest')) bwipe XXUxDsMc e! XXDosMac w! Xtest call assert_equal("dos\r\ndos\r\nmac\rmac\r", s:file2str('Xtest')) bwipe XXDosMac e! XXEol exe "normal ggO\<C-R>=&ffs\<CR>:\<C-R>=&ff\<CR>" w! Xtest call assert_equal("unix,mac:unix\nnoeol\n", s:file2str('Xtest')) bwipe! XXEol " try with 'fileformats' set to 'dos,mac' set fileformats=dos,mac e! XXUxDs w! Xtest call assert_equal("unix\r\nunix\r\ndos\r\ndos\r\n", s:file2str('Xtest')) bwipe XXUxDs e! XXUxMac exe "normal ggO\<C-R>=&ffs\<CR>:\<C-R>=&ff\<CR>" w! Xtest call assert_equal("dos,mac:dos\r\nunix\r\nunix\r\nmac\rmac\r\r\n", \ s:file2str('Xtest')) bwipe! XXUxMac e! XXUxDsMc w! Xtest call assert_equal("unix\r\nunix\r\ndos\r\ndos\r\nmac\rmac\r\r\n", \ s:file2str('Xtest')) bwipe XXUxDsMc e! XXMacEol exe "normal ggO\<C-R>=&ffs\<CR>:\<C-R>=&ff\<CR>" w! Xtest call assert_equal("dos,mac:mac\rmac\rmac\rnoeol\r", s:file2str('Xtest')) bwipe! XXMacEol " Test 4: try reading and writing with 'fileformats' set to three formats set fileformats=unix,dos,mac e! XXUxDsMc w! Xtest call assert_equal("unix\nunix\ndos\r\ndos\r\nmac\rmac\r\n", \ s:file2str('Xtest')) bwipe XXUxDsMc e! XXEol exe "normal ggO\<C-R>=&ffs\<CR>:\<C-R>=&ff\<CR>" w! Xtest call assert_equal("unix,dos,mac:unix\nnoeol\n", s:file2str('Xtest')) bwipe! XXEol set fileformats=mac,dos,unix e! XXUxDsMc w! Xtest call assert_equal("unix\nunix\ndos\r\ndos\r\nmac\rmac\r\n", \ s:file2str('Xtest')) bwipe XXUxDsMc e! XXEol exe "normal ggO\<C-R>=&ffs\<CR>:\<C-R>=&ff\<CR>" w! Xtest call assert_equal("mac,dos,unix:mac\rnoeol\r", s:file2str('Xtest')) bwipe! XXEol " Test 5: try with 'binary' set set fileformats=mac,unix,dos set binary e! XXUxDsMc w! Xtest call assert_equal("unix\nunix\ndos\r\ndos\r\nmac\rmac\r", \ s:file2str('Xtest')) bwipe XXUxDsMc set fileformats=mac e! XXUxDsMc w! Xtest call assert_equal("unix\nunix\ndos\r\ndos\r\nmac\rmac\r", \ s:file2str('Xtest')) bwipe XXUxDsMc set fileformats=dos e! XXUxDsMc w! Xtest call assert_equal("unix\nunix\ndos\r\ndos\r\nmac\rmac\r", \ s:file2str('Xtest')) bwipe XXUxDsMc e! XXUnix w! Xtest call assert_equal("unix\nunix\n", s:file2str('Xtest')) bwipe! XXUnix set nobinary ff& ffs& " cleanup only %bwipe! call delete('XXUxDs') call delete('XXUxMac') call delete('XXDosMac') call delete('XXMacEol') call delete('XXUxDsMc') call delete('Xtest') endfunc " Test for changing the fileformat using ++read func Test_fileformat_plusplus_read() new call setline(1, ['one', 'two', 'three']) w ++ff=dos Xfile1 enew! set ff=unix " A :read doesn't change the fileformat, but does apply to the read lines. r ++fileformat=unix Xfile1 call assert_equal('unix', &fileformat) call assert_equal("three\r", getline('$')) 3r ++edit Xfile1 call assert_equal('dos', &fileformat) close! call delete('Xfile1') set fileformat& call assert_fails('e ++fileformat Xfile1', 'E474:') call assert_fails('e ++ff=abc Xfile1', 'E474:') call assert_fails('e ++abc1 Xfile1', 'E474:') endfunc " When Vim starts up with an empty buffer the first item in 'fileformats' is " used as the 'fileformat'. func Test_fileformat_on_startup() let after =<< trim END call writefile([&fileformat], 'Xonsfile', 'a') quit END call RunVim(["set ffs=dos,unix,mac"], after, '') call RunVim(["set ffs=mac,dos,unix"], after, '') call RunVim(["set ffs=unix,mac,dos"], after, '') call assert_equal(['dos', 'mac', 'unix'], readfile('Xonsfile')) call delete('Xonsfile') endfunc " vim: shiftwidth=2 sts=2 expandtab