Mercurial > vim
changeset 31247:a864e75257dd v9.0.0957
patch 9.0.0957: tests fail without the terminal feature
Commit: https://github.com/vim/vim/commit/64fabf3802b8d38157c6b89010b9bea7766b3841
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 27 13:51:22 2022 +0000
patch 9.0.0957: tests fail without the terminal feature
Problem: Tests fail without the terminal feature.
Solution: Move functions to another utility script.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 27 Nov 2022 15:00:04 +0100 |
| parents | a536455a9b74 |
| children | 44fac9d1b2ff |
| files | src/testdir/term_util.vim src/testdir/view_util.vim src/version.c |
| diffstat | 3 files changed, 42 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/term_util.vim +++ b/src/testdir/term_util.vim @@ -189,43 +189,5 @@ func Term_getlines(buf, lines) return join(map(a:lines, 'term_getline(a:buf, v:val)'), '') 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 "key" without a modifier. -" Used for the Escape key. -func GetEscCodeCSIuWithoutModifier(key) - let key = printf("%d", char2nr(a:key)) - return "\<Esc>[" .. key .. 'u' -endfunc - " vim: shiftwidth=2 sts=2 expandtab
--- a/src/testdir/view_util.vim +++ b/src/testdir/view_util.vim @@ -62,3 +62,43 @@ 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 "key" without a modifier. +" Used for the Escape key. +func GetEscCodeCSIuWithoutModifier(key) + let key = printf("%d", char2nr(a:key)) + return "\<Esc>[" .. key .. 'u' +endfunc +