IntenseFinance/neovim
3
0 Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-11-03 04:40:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #41550 from janlazo/na-patch-channel

Browse Source 
build(vim-patch): n/a channel,terminal,test,unicode patches
This commit is contained in:
Justin M. Keyes authored and GitHub committed 2026-08-30 08:45:06 -04:00
2 parents 39862231b2 97f06b936e
commit 97cf2041c1
5 files changed
+137 -132
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

scripts/vim-patch.sh
+8 -3
View File
@@ -928,6 +928,7 @@ is_na_patch() {
local NA_FILELIST="$NVIM_SOURCE_DIR/scripts/vim_na_files.txt"
local NA_HUNKS_C="$NVIM_SOURCE_DIR/scripts/vim_na_hunks_c.txt"
local NA_HUNKS_H="$NVIM_SOURCE_DIR/scripts/vim_na_hunks_h.txt"
local NA_HUNKS_HELP="$NVIM_SOURCE_DIR/scripts/vim_na_hunks_help.txt"
local NA_HUNKS_VIM="$NVIM_SOURCE_DIR/scripts/vim_na_hunks_vim.txt"
local FILES_REMAINING HUNKS HUNK_NUM_FINAL
@@ -948,12 +949,13 @@ is_na_patch() {
'-I^popup_[_a-z]+\(' \
'-I\*\s+For Vim version [0-9]\.[0-9]\.\s+Last change: [0-9]+ [A-Z][a-z]+ [0-9]+' \
'-I compiled (with|without) .*\(\|.+\|\) feature\.$' \
'-I\|channel-open-[^|]+\|' \
'-I\|popup-windows\|' \
'-I\|tabpanel\|' \
'-I\spopup window\s' \
"$patch" -- "${file}")
if test -n "$HUNKS"; then
HUNK_NUM_FINAL=$(echo "$HUNKS" | grep '^@@ .* @@' | sed 's/^@@ .* @@ //' | grep -cv -f "$NA_HUNKS_VIM")
HUNK_NUM_FINAL=$(echo "$HUNKS" | grep '^@@ .* @@' | sed 's/^@@ .* @@ //' | grep -cv -f "$NA_HUNKS_HELP")
test "$HUNK_NUM_FINAL" -ne 0 && return 1
fi
;;
@@ -973,7 +975,7 @@ is_na_patch() {
HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \
"$patch" -- "${file}")
if test -n "$HUNKS"; then
HUNK_NUM_FINAL=$(echo "$HUNKS" | grep '^@@ .* @@' | sed 's/^@@ .* @@ //' | grep -cv -e '^func RunVimInTerminal(')
HUNK_NUM_FINAL=$(echo "$HUNKS" | grep '^@@ .* @@' | sed 's/^@@ .* @@ //' | grep -cv -f "$NA_HUNKS_VIM")
test "$HUNK_NUM_FINAL" -ne 0 && return 1
fi
;;
@@ -989,7 +991,7 @@ is_na_patch() {
'-IEVENT_TERMINALWINOPEN' \
'-I^#\s*define\s+(ASSIGN_VAR|POPF_CURSORLINE)\s' \
'-I^typedef enum \{$' \
'-I^\s+POPCLOSE_[A-Z]+,?$' \
'-I^\s+(CH_MODE|POPCLOSE)_[A-Z]+,?$' \
'-I^\} popclose_T;$' \
'-I^EXTERN\schar\s+\*popup_transparent' \
'-I^EXTERN\sint\s+disable_vterm_title_for_testing' \
@@ -1000,6 +1002,7 @@ is_na_patch() {
'-I^EXTERN char e_.*def_function' \
'-I^EXTERN char e_.*enddef' \
'-I^EXTERN char e_.*vim9' \
'-I^EXTERN char e_[_a-z]+_channel' \
'-I^EXTERN char e_cannot_declare_.*variable_str' \
'-I^EXTERN char e_cannot_define_new_.+_as_static' \
'-I^EXTERN char e_cannot_use_a_return_type_with_new' \
@@ -1009,6 +1012,7 @@ is_na_patch() {
'-I\sINIT\(= .+"E[0-9]+: .*:def ' \
'-I\sINIT\(= .+"E[0-9]+: .*enddef"' \
'-I\sINIT\(= .+"E[0-9]+: .*([vV]im9|interface)' \
'-I\sINIT\(= .+"E[0-9]+: .* (ch|channel)_[_a-z]+\(\)' \
'-I\sINIT\(= .+"E1016: Cannot declare .* variable: ' \
'-I\sINIT\(= .+"E1103: Dictionary not set' \
'-I\sINIT\(= .+"E1365: Cannot use a return type with the \\"new\\" function"' \
@@ -1039,6 +1043,7 @@ is_na_patch() {
'-IEVENT_TERMINALWINOPEN' \
'-I^#\s*include\s+<proto/' \
'-I^\s+\{"(popup|prop|sound)_[_a-z]+",.*f_(popup|prop|sound)_[_a-z]+},$' \
'-I^\s+ret_[a-z]+,\s+JOB_FUNC\(f_.+\)},$' \
'-I^\s*(static)?\s(char(|_u)|hashtab_T|int|void)( \*)?$' \
'-I^static\s(char(|_u)|hashtab_T|int|void)\s\*?[^*]+\(.+\);$' \
'-I#\s*define.*ex_ni$' \
scripts/vim_na_hunks_c.txt
+4
View File
@@ -53,9 +53,13 @@
^parse_argument_types(
^parse_queued_messages(
^restore_buffer(bufref_T
^shortpath_[_a-zA-Z0-9]\+(
^static convertStruct [a-zA-Z]\+\[\] =
^static int included_patches\[\] =
^static struct interval emoji_all\[\] =
^switch_buffer(bufref_T
^typedef struct ss_pending_cmd_S
^utf_iscomposing(
^vim_free(
^vim_isNormalIDc(
^vim_isalpha(
scripts/vim_na_hunks_help.txt
+123
View File
@@ -0,0 +1,123 @@
^:vim9.\+ .\+\*:vim9.\+\*
^balloon_[a-zA-Z0-9_]\+(.\+balloon_[a-zA-Z0-9_]\+(
^cscope_connection(.\+cscope_connection(
^js_decode(.\+js_decode(
^js_encode(.\+js_encode(
^json_decode(.\+json_decode(
^json_encode(.\+json_encode(
^err_teapot(.\+err_teapot(
^listener_[a-zA-Z0-9]\+(.\+listener_[a-zA-Z0-9]\+(
^redraw_listener_[a-zA-Z0-9]\+(.\+redraw_listener_[a-zA-Z0-9]\+(
^remote_[a-z]\+(.\+remote_[a-z]\+(
^server2client(.\+server2client(
^serverlist(.\+serverlist(
^test_alloc_fail(.\+test_alloc_fail(
^test_autochdir(.\+test_autochdir(
^test_feedinput(.\+test_feedinput(
^test_garbagecollect_soon(.\+test_garbagecollect_soon(
^test_getvalue(.\+test_getvalue(
^test_ignore_error(.\+test_ignore_error(
^test_mswin_[_a-zA-Z0-9]\+(
^test_null_channel(.\+test_null_channel(
^test_null_job(.\+test_null_job(
^test_option_not_set(.\+test_option_not_set(
^test_override(.\+test_override(
^test_scrollbar(.\+test_scrollbar(
^test_setmouse(.\+test_setmouse(
^test_settime(.\+test_settime(
^test_srand_seed(.\+test_srand_seed(
^test_void(.\+test_void(
\*'aleph'\*
\*'antialias'\*
\*'balloon[a-z]\+'\*
\*'bioskey'\*
\*'compatible'\*
\*'conskey'\*
\*'cryptmethod'\*
\*'cscope[a-z]\+'\*
\*'edcompatible'\*
\*'esckeys'\*
\*'guifontset'\*
\*'guiheadroom'\*
\*'guiligatures'\*
\*'guipty'\*
\*'hkmap\(p\)\?'\*
\*'highlight'\*
\*'imactivatekey'\*
\*'imcmdline'\*
\*'imdisable'\*
\*'insertmode'\*
\*'key'\*
\*'keyprotocol'\*
\*'macatsui'\*
\*'maxmem'\*
\*'maxmemtot'\*
\*'opendevice'\*
\*'pastetoggle'\*
\*'print[a-z]\+'\*
\*'prompt'\*
\*'remap'\*
\*'restorescreen'\*
\*'shelltype'\*
\*'shortname'\*
\*'swapsync'\*
\*'t_.\+'\*
\*'termcap[a-zA-Z-]*'\*
\*'termencoding'\*
\*'termwinscroll'\*
\*'terse'\*
\*'textauto'\*
\*'toolbar'\*
\*'toolbariconsize'\*
\*'ttybuiltin'\*
\*'ttymouse'\*
\*'ttyscroll'\*
\*'ttytype'\*
\*'weirdinvert'\*
\*'[a-z]\+dll'\*
\*--literal\*
\*--serverlist\*
\*--servername\*
\*-v\*
\*:Print\*
\*:Vimuntar\*
\*:X\*
\*:behave\*
\*:fixdel\*
\*:helpfind\*
\*:open\*
\*:promptfind\*
\*:promptrepl\*
\*:scriptversion\*
\*:shell\*
\*:smile\*
\*:version\*
\*DirChanged\*
\*DirChangedPre\*
\*E984\*
\*E999\*
\*E119[3-9]\*
\*HelpToc-mappings\*
\*SafeStateAgain\*
\*SigUSR1\*
\*TerminalOpen\*
\*TerminalWinOpen\*
\*autocommand-events\*
\*blowfish\*
\*builtin-function-list\*
\*emacs[_-]tags\*
\*global-ime\*
\*help-toc-install\*
\*job_[a-zA-Z0-9]\+()\*
\*multibyte-ime\*
\*os-support\*
\*patches-\(after-\)\?[0-9].*\*
\*pkzip\*
\*popup-window-functions\*
\*sound-functions\*
\*sound_[a-zA-Z0-9]\+()\*
\*term++\(close\|open\)\*
\*term_start()\*
\*test_gui_[a-zA-Z0-9_]\+()\*
\*v:none\*
\*v:sizeof[a-z]\+\*
scripts/vim_na_hunks_vim.txt
+2 -122
View File
@@ -1,122 +1,2 @@
^:vim9.\+ .\+\*:vim9.\+\*
^balloon_[a-zA-Z0-9_]\+(.\+balloon_[a-zA-Z0-9_]\+(
^cscope_connection(.\+cscope_connection(
^js_decode(.\+js_decode(
^js_encode(.\+js_encode(
^json_decode(.\+json_decode(
^json_encode(.\+json_encode(
^err_teapot(.\+err_teapot(
^listener_[a-zA-Z0-9]\+(.\+listener_[a-zA-Z0-9]\+(
^redraw_listener_[a-zA-Z0-9]\+(.\+redraw_listener_[a-zA-Z0-9]\+(
^remote_[a-z]\+(.\+remote_[a-z]\+(
^server2client(.\+server2client(
^serverlist(.\+serverlist(
^test_alloc_fail(.\+test_alloc_fail(
^test_autochdir(.\+test_autochdir(
^test_feedinput(.\+test_feedinput(
^test_garbagecollect_soon(.\+test_garbagecollect_soon(
^test_getvalue(.\+test_getvalue(
^test_ignore_error(.\+test_ignore_error(
^test_mswin_[_a-zA-Z0-9]\+(
^test_null_channel(.\+test_null_channel(
^test_null_job(.\+test_null_job(
^test_option_not_set(.\+test_option_not_set(
^test_override(.\+test_override(
^test_scrollbar(.\+test_scrollbar(
^test_setmouse(.\+test_setmouse(
^test_settime(.\+test_settime(
^test_srand_seed(.\+test_srand_seed(
^test_void(.\+test_void(
\*'aleph'\*
\*'antialias'\*
\*'balloon[a-z]\+'\*
\*'bioskey'\*
\*'compatible'\*
\*'conskey'\*
\*'cryptmethod'\*
\*'cscope[a-z]\+'\*
\*'edcompatible'\*
\*'esckeys'\*
\*'guifontset'\*
\*'guiheadroom'\*
\*'guiligatures'\*
\*'guipty'\*
\*'hkmap\(p\)\?'\*
\*'highlight'\*
\*'imactivatekey'\*
\*'imcmdline'\*
\*'imdisable'\*
\*'insertmode'\*
\*'key'\*
\*'keyprotocol'\*
\*'macatsui'\*
\*'maxmem'\*
\*'maxmemtot'\*
\*'opendevice'\*
\*'pastetoggle'\*
\*'print[a-z]\+'\*
\*'prompt'\*
\*'remap'\*
\*'restorescreen'\*
\*'shelltype'\*
\*'shortname'\*
\*'swapsync'\*
\*'t_.\+'\*
\*'termcap[a-zA-Z-]*'\*
\*'termencoding'\*
\*'terse'\*
\*'textauto'\*
\*'toolbar'\*
\*'toolbariconsize'\*
\*'ttybuiltin'\*
\*'ttymouse'\*
\*'ttyscroll'\*
\*'ttytype'\*
\*'weirdinvert'\*
\*'[a-z]\+dll'\*
\*--literal\*
\*--serverlist\*
\*--servername\*
\*-v\*
\*:Print\*
\*:Vimuntar\*
\*:X\*
\*:behave\*
\*:fixdel\*
\*:helpfind\*
\*:open\*
\*:promptfind\*
\*:promptrepl\*
\*:scriptversion\*
\*:shell\*
\*:smile\*
\*:version\*
\*DirChanged\*
\*DirChangedPre\*
\*E984\*
\*E999\*
\*E119[3-9]\*
\*HelpToc-mappings\*
\*SafeStateAgain\*
\*SigUSR1\*
\*TerminalOpen\*
\*TerminalWinOpen\*
\*autocommand-events\*
\*blowfish\*
\*builtin-function-list\*
\*emacs[_-]tags\*
\*global-ime\*
\*help-toc-install\*
\*job_[a-zA-Z0-9]\+()\*
\*multibyte-ime\*
\*os-support\*
\*patches-\(after-\)\?[0-9].*\*
\*pkzip\*
\*popup-window-functions\*
\*sound-functions\*
\*sound_[a-zA-Z0-9]\+()\*
\*term++\(close\|open\)\*
\*term_start()\*
\*test_gui_[a-zA-Z0-9_]\+()\*
\*v:none\*
\*v:sizeof[a-z]\+\*
^func RunVimInTerminal(
^func Test_python3_vim_bindeval(