Mercurial > vim
view src/testdir/view_util.vim @ 34686:83875247fbc0 v9.1.0224
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 12:01:14 2024 +0100
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Problem: If a line has "right" & "below" virtual text properties,
where the "below" property may be stored first due to lack of
ordering between them, then the line height is calculated to
be 1 more and causes the cursor to far over the line.
Solution: Remove some unnecessary setting of a
`next_right_goes_below = TRUE` flag for "below" and "above"
text properties. (Dylan Thacker-Smith)
I modified a regression test I recently added to cover this case,
leveraging the fact that "after", "right" & "below" text properties are
being stored in the reverse of the order they are added in. The
previous version of this regression test was crafted to workaround this
issue so it can be addressed by this separate patch.
closes: #14317
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 28 Mar 2024 12:15:03 +0100 |
parents | 9fc3b3928ad5 |
children | a20bd67056d7 |
line wrap: on
line source
" Functions about view shared by several tests " Only load this script once. if exists('*Screenline') finish endif " Get line "lnum" as displayed on the screen. " Trailing white space is trimmed. func Screenline(lnum) let chars = [] for c in range(1, winwidth(0)) call add(chars, nr2char(screenchar(a:lnum, c))) endfor let line = join(chars, '') return matchstr(line, '^.\{-}\ze\s*$') endfunc " Get text on the screen, including composing characters. " ScreenLines(lnum, width) or " ScreenLines([start, end], width) func ScreenLines(lnum, width) abort redraw! if type(a:lnum) == v:t_list let start = a:lnum[0] let end = a:lnum[1] else let start = a:lnum let end = a:lnum endif let lines = [] for l in range(start, end) let lines += [join(map(range(1, a:width), 'screenstring(l, v:val)'), '')] endfor return lines endfunc func ScreenAttrs(lnum, width) abort redraw! if type(a:lnum) == v:t_list let start = a:lnum[0] let end = a:lnum[1] else let start = a:lnum let end = a:lnum endif let attrs = [] for l in range(start, end) let attrs += [map(range(1, a:width), 'screenattr(l, v:val)')] endfor return attrs endfunc " Create a new window with the requested size and fix it. func NewWindow(height, width) abort exe a:height . 'new' exe a:width . 'vsp' set winfixwidth winfixheight redraw! endfunc func CloseWindow() abort bw! redraw! endfunc " When using RunVimInTerminal() we expect modifyOtherKeys level 2 to be enabled " automatically. The key + modifier Escape codes must then use the " modifyOtherKeys encoding. They are recognized anyway, thus it's safer to use " than the raw code. " Return the modifyOtherKeys level 2 encoding for "key" with "modifier" " (number value, e.g. CTRL is 5). func GetEscCodeCSI27(key, modifier) let key = printf("%d", char2nr(a:key)) let mod = printf("%d", a:modifier) return "\<Esc>[27;" .. mod .. ';' .. key .. '~' endfunc " Return the modifyOtherKeys level 2 encoding for "key" with "modifier" " (character value, e.g. CTRL is "C"). func GetEscCodeWithModifier(modifier, key) let modifier = get({'C': 5}, a:modifier, '') if modifier == '' echoerr 'Unknown modifier: ' .. a:modifier endif return GetEscCodeCSI27(a:key, modifier) endfunc " Return the kitty keyboard protocol encoding for "key" with "modifier" " (number value, e.g. CTRL is 5). func GetEscCodeCSIu(key, modifier) let key = printf("%d", char2nr(a:key)) let mod = printf("%d", a:modifier) return "\<Esc>[" .. key .. ';' .. mod .. 'u' endfunc " Return the kitty keyboard protocol encoding for a function key: " CSI {key} " CSS 1;{modifier} {key} func GetEscCodeFunckey(key, modifier) if a:modifier == 0 return "\<Esc>[" .. a:key endif let mod = printf("%d", a:modifier) return "\<Esc>[1;".. mod .. a:key endfunc " Return the kitty keyboard protocol encoding for "key" without a modifier. " Used for the Escape key. func GetEscCodeCSIuWithoutModifier(key) let key = printf("%d", char2nr(a:key)) return "\<Esc>[" .. key .. 'u' endfunc