Mercurial > vim
view src/testdir/test_wordcount.vim @ 34379:37b4c89ba420 v9.1.0116
patch 9.1.0116: win_split_ins may not check available room
Commit: https://github.com/vim/vim/commit/0fd44a5ad81ade342cb54d8984965bdedd2272c8
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Feb 20 20:28:15 2024 +0100
patch 9.1.0116: win_split_ins may not check available room
Problem: win_split_ins has no check for E36 when moving an existing
window
Solution: check for room and fix the issues in f_win_splitmove()
(Sean Dewar)
win_split_ins has no check for E36 when moving an existing window,
allowing for layouts with many overlapping zero-sized windows to be
created (which may also cause drawing issues with tablines and such).
f_win_splitmove also has some bugs.
So check for room and fix the issues in f_win_splitmove. Handle failure
in the two relevant win_split_ins callers by restoring the original
layout, and factor the common logic into win_splitmove.
Don't check for room when opening an autocommand window, as it's a
temporary window that's rarely interacted with or drawn anyhow, and is
rather important for some autocommands.
Issues fixed in f_win_splitmove:
- Error if splitting is disallowed.
- Fix heap-use-after-frees if autocommands fired from switching to "targetwin"
close "wp" or "oldwin".
- Fix splitting the wrong window if autocommands fired from switching to
"targetwin" switch to a different window.
- Ensure -1 is returned for all errors.
Also handle allocation failure a bit earlier in make_snapshot (callers,
except win_splitmove, don't really care if a snapshot can't be made, so
just ignore the return value).
Note: Test_smoothscroll_in_zero_width_window failed after these changes with
E36, as it was using the previous behaviour to create a zero-width window.
I've fixed the test such that it fails with UBSAN as expected when v9.0.1367 is
reverted (and simplified it too).
related: #14042
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 20 Feb 2024 22:30:04 +0100 |
parents | 08940efa6b4e |
children |
line wrap: on
line source
" Test for wordcount() function func Test_wordcount() let save_enc = &enc set encoding=utf-8 set selection=inclusive fileformat=unix fileformats=unix new " Test 1: empty window call assert_equal({'chars': 0, 'cursor_chars': 0, 'words': 0, 'cursor_words': 0, \ 'bytes': 0, 'cursor_bytes': 0}, wordcount()) " Test 2: some words, cursor at start call append(1, 'one two three') call cursor([1, 1, 0]) call assert_equal({'chars': 15, 'cursor_chars': 1, 'words': 3, 'cursor_words': 0, \ 'bytes': 15, 'cursor_bytes': 1}, wordcount()) " Test 3: some words, cursor at end %d _ call append(1, 'one two three') call cursor([2, 99, 0]) call assert_equal({'chars': 15, 'cursor_chars': 14, 'words': 3, 'cursor_words': 3, \ 'bytes': 15, 'cursor_bytes': 14}, wordcount()) " Test 4: some words, cursor at end, ve=all set ve=all %d _ call append(1, 'one two three') call cursor([2, 99, 0]) call assert_equal({'chars': 15, 'cursor_chars': 15, 'words': 3, 'cursor_words': 3, \ 'bytes': 15, 'cursor_bytes': 15}, wordcount()) set ve= " Test 5: several lines with words %d _ call append(1, ['one two three', 'one two three', 'one two three']) call cursor([4, 99, 0]) call assert_equal({'chars': 43, 'cursor_chars': 42, 'words': 9, 'cursor_words': 9, \ 'bytes': 43, 'cursor_bytes': 42}, wordcount()) " Test 6: one line with BOM set %d _ call append(1, 'one two three') set bomb w! Xtest call cursor([2, 99, 0]) call assert_equal({'chars': 15, 'cursor_chars': 14, 'words': 3, 'cursor_words': 3, \ 'bytes': 18, 'cursor_bytes': 14}, wordcount()) set nobomb w! call delete('Xtest') " Test 7: one line with multibyte words %d _ call append(1, ['Äne M¤ne Müh']) call cursor([2, 99, 0]) call assert_equal({'chars': 14, 'cursor_chars': 13, 'words': 3, 'cursor_words': 3, \ 'bytes': 17, 'cursor_bytes': 16}, wordcount()) " Test 8: several lines with multibyte words %d _ call append(1, ['Äne M¤ne Müh', 'und raus bist dü!']) call cursor([3, 99, 0]) call assert_equal({'chars': 32, 'cursor_chars': 31, 'words': 7, 'cursor_words': 7, \ 'bytes': 36, 'cursor_bytes': 35}, wordcount()) " Visual map to capture wordcount() in visual mode vnoremap <expr> <F2> execute("let g:visual_stat = wordcount()") " Test 9: visual mode, complete buffer let g:visual_stat = {} %d _ call append(1, ['Äne M¤ne Müh', 'und raus bist dü!']) " start visual mode and select the complete buffer 0 exe "normal V2j\<F2>y" call assert_equal({'chars': 32, 'words': 7, 'bytes': 36, 'visual_chars': 32, \ 'visual_words': 7, 'visual_bytes': 36}, g:visual_stat) " Test 10: visual mode (empty) %d _ call append(1, ['Äne M¤ne Müh', 'und raus bist dü!']) " start visual mode and select the complete buffer 0 exe "normal v$\<F2>y" call assert_equal({'chars': 32, 'words': 7, 'bytes': 36, 'visual_chars': 1, \ 'visual_words': 0, 'visual_bytes': 1}, g:visual_stat) " Test 11: visual mode, single line %d _ call append(1, ['Äne M¤ne Müh', 'und raus bist dü!']) " start visual mode and select the complete buffer 2 exe "normal 0v$\<F2>y" call assert_equal({'chars': 32, 'words': 7, 'bytes': 36, 'visual_chars': 13, \ 'visual_words': 3, 'visual_bytes': 16}, g:visual_stat) set selection& fileformat& fileformats& let &enc = save_enc enew! close endfunc " vim: shiftwidth=2 sts=2 expandtab