IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20827 from zeertzjq/vim-8.2.4234

Browse Source 
vim-patch:8.2.{2653,4234}
This commit is contained in:
zeertzjq 2022-10-27 13:32:47 +08:00 committed by GitHub
commit c41873ab63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval/typval.c
View File

@ -43,7 +43,7 @@
static char e_string_required_for_argument_nr[] static char e_string_required_for_argument_nr[]
= N_("E1174: String required for argument %d"); = N_("E1174: String required for argument %d");
static char e_non_empty_string_required_for_argument_nr[] static char e_non_empty_string_required_for_argument_nr[]
= N_("E1142: Non-empty string required for argument %d"); = N_("E1175: Non-empty string required for argument %d");
static char e_number_required_for_argument_nr[] static char e_number_required_for_argument_nr[]
= N_("E1210: Number required for argument %d"); = N_("E1210: Number required for argument %d");

2
src/nvim/globals.h
View File

@ -997,8 +997,6 @@ EXTERN char e_luv_api_disabled[] INIT(= N_("E5560: %s must not be called in a lu
EXTERN char e_floatonly[] INIT(= N_("E5601: Cannot close window, only floating window would remain")); EXTERN char e_floatonly[] INIT(= N_("E5601: Cannot close window, only floating window would remain"));
EXTERN char e_floatexchange[] INIT(= N_("E5602: Cannot exchange or rotate float")); EXTERN char e_floatexchange[] INIT(= N_("E5602: Cannot exchange or rotate float"));
EXTERN char e_non_empty_string_required[] INIT(= N_("E1142: Non-empty string required"));
EXTERN char e_cannot_define_autocommands_for_all_events[] INIT(= N_("E1155: Cannot define autocommands for ALL events")); EXTERN char e_cannot_define_autocommands_for_all_events[] INIT(= N_("E1155: Cannot define autocommands for ALL events"));
EXTERN char e_resulting_text_too_long[] INIT(= N_("E1240: Resulting text too long")); EXTERN char e_resulting_text_too_long[] INIT(= N_("E1240: Resulting text too long"));

6
src/nvim/testdir/test_functions.vim
View File

@ -2206,6 +2206,12 @@ func Test_range()
call assert_equal([0, 1, 2, 3, 4], uniq(range(5))) call assert_equal([0, 1, 2, 3, 4], uniq(range(5)))
endfunc endfunc
func Test_garbagecollect_now_fails()
let v:testing = 0
call assert_fails('call test_garbagecollect_now()', 'E1142:')
let v:testing = 1
endfunc
" Test for the eval() function " Test for the eval() function
func Test_eval() func Test_eval()
call assert_fails("call eval('5 a')", 'E488:') call assert_fails("call eval('5 a')", 'E488:')

9
src/nvim/testing.c
View File

@ -14,6 +14,9 @@
# include "testing.c.generated.h" # include "testing.c.generated.h"
#endif #endif
static char e_calling_test_garbagecollect_now_while_v_testing_is_not_set[]
= N_("E1142: Calling test_garbagecollect_now() while v:testing is not set");
/// Prepare "gap" for an assert error and add the sourcing position. /// Prepare "gap" for an assert error and add the sourcing position.
static void prepare_assert_error(garray_T *gap) static void prepare_assert_error(garray_T *gap)
{ {
@ -614,7 +617,11 @@ void f_test_garbagecollect_now(typval_T *argvars, typval_T *rettv, EvalFuncData
{ {
// This is dangerous, any Lists and Dicts used internally may be freed // This is dangerous, any Lists and Dicts used internally may be freed
// while still in use. // while still in use.
garbage_collect(true); if (!get_vim_var_nr(VV_TESTING)) {
emsg(_(e_calling_test_garbagecollect_now_while_v_testing_is_not_set));
} else {
garbage_collect(true);
}
} }
/// "test_write_list_log()" function /// "test_write_list_log()" function

2
test/functional/vimscript/exepath_spec.lua
View File

@ -23,7 +23,7 @@ describe('exepath()', function()
for _, input in ipairs({'v:null', 'v:true', 'v:false', '{}', '[]'}) do for _, input in ipairs({'v:null', 'v:true', 'v:false', '{}', '[]'}) do
eq('Vim(call):E1174: String required for argument 1', exc_exec('call exepath('..input..')')) eq('Vim(call):E1174: String required for argument 1', exc_exec('call exepath('..input..')'))
end end
eq('Vim(call):E1142: Non-empty string required for argument 1', exc_exec('call exepath("")')) eq('Vim(call):E1175: Non-empty string required for argument 1', exc_exec('call exepath("")'))
command('let $PATH = fnamemodify("./test/functional/fixtures/bin", ":p")') command('let $PATH = fnamemodify("./test/functional/fixtures/bin", ":p")')
for _, input in ipairs({'v:null', 'v:true', 'v:false'}) do for _, input in ipairs({'v:null', 'v:true', 'v:false'}) do
eq('Vim(call):E1174: String required for argument 1', exc_exec('call exepath('..input..')')) eq('Vim(call):E1174: String required for argument 1', exc_exec('call exepath('..input..')'))