Merge #41462 from janlazo/na-patch-vim9-final

build(vim-patch): n/a vim9 const,final,types
This commit is contained in:
Justin M. Keyes
2026-08-24 05:27:01 -04:00
committed by GitHub

View File

@@ -976,7 +976,7 @@ is_na_patch() {
'-I^#\s*define\s+(FEAT|POPUPWIN|XDG|t)_[^_]' \
'-I^\s+(&&|\|\|)\s.*defined\(.*FEAT_[^_]' \
'-IEVENT_TERMINALWINOPEN' \
'-I^#\s*define\s+POPF_CURSORLINE\s' \
'-I^#\s*define\s+(ASSIGN_VAR|POPF_CURSORLINE)\s' \
'-I^typedef enum \{$' \
'-I^\s+POPCLOSE_[A-Z]+,?$' \
'-I^\} popclose_T;$' \
@@ -990,6 +990,7 @@ is_na_patch() {
'-I^EXTERN char e_.*vim9' \
'-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' \
'-I^EXTERN char e_dictionary_not_set' \
'-I^EXTERN char e_dictnull' \
'-I\sINIT\(= .+"E[0-9]+: (Abstract|Class|Enum|Interface|Type) ' \
@@ -998,10 +999,12 @@ is_na_patch() {
'-I\sINIT\(= .+"E[0-9]+: .*([vV]im9|interface)' \
'-I\sINIT\(= .+"E1016: Cannot declare .* variable: ' \
'-I\sINIT\(= .+"E1103: Dictionary not set' \
'-I\sINIT\(= .+"E1365: Cannot use a return type with the \\"new\\" function"' \
'-I\sINIT\(= .+"E1370: Cannot define a .+ as static' \
'-I\s(bool|char(|_u))\s+w_popup_image_[_a-zA-Z]+;' \
'-I\schar(|_u)\s+\*w_popup_title;' \
'-I\sint\s+ch_[_a-zA-Z]+;' \
'-I\sint\s+sv_const;' \
'-I\sint\s+w_(filter_mode|firstline|popup_drag|want_scrollbar);' \
'-I\slist_T\s+\*w_popup_mask;' \
'-I\spopclose_T\sw_popup_close;' \
@@ -1016,7 +1019,7 @@ is_na_patch() {
HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \
'-I^\s+$' \
'-I^\s*/?\*/?$' \
'-I^\s*(//|/?\*).*\s([vV]im9|E[0-9]{4} - |FEAT_|channel|job|popup|sound|terminal)' \
'-I^\s*(//|/?\*).*\s([vV]im9|E[0-9]{4} - |FEAT_|channel|job|popup|sound|terminal|uf_type_list)' \
'-I^#\s*((ifdef|ifndef|undef)|(if|elif)\s.*defined\().*FEAT_[^_]' \
'-I^#\s*(else|endif)' \
'-I^#\s*define\s+(FEAT|POPUPWIN|XDG|t)_[^_]' \
@@ -1030,10 +1033,12 @@ is_na_patch() {
'-I[.>]b_p_key' \
'-I[_.>]sc_version = ' \
'-I[_.>]uf_script_ctx_version = ' \
'-I[_.>]uf_type_list' \
'-I = skip_type\(.+\);$' \
'-Icheck_typval_type\(.+\)' \
'-Icrypt_get_method_nr\(.+\)' \
'-I\spopup_set_firstline\(.+\);' \
'-I\supdate_vim9_script_var\(.+\);$' \
'-I\svim_free\(.*w_popup_title\);' \
"$patch" -- "${file}")
if test -n "$HUNKS"; then