patch 8.2.3852: Vim9: not enough tests
Problem: Vim9: not enough tests.
Solution: Also run existing tests for Vim9 script. Make errors more
consistent.
diff --git a/src/errors.h b/src/errors.h
index 3fd8e5a..31f275d 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -286,6 +286,8 @@
#ifdef FEAT_EVAL
EXTERN char e_invalid_command_str[]
INIT(= N_("E476: Invalid command: %s"));
+EXTERN char e_cannot_index_a_funcref[]
+ INIT(= N_("E695: Cannot index a Funcref"));
EXTERN char e_list_value_has_more_items_than_targets[]
INIT(= N_("E710: List value has more items than targets"));
EXTERN char e_list_value_does_not_have_enough_items[]
diff --git a/src/eval.c b/src/eval.c
index d0ad7c6..4e720e8 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -4026,6 +4026,8 @@
}
else if (evaluate)
{
+ int error = FALSE;
+
#ifdef FEAT_FLOAT
// allow for indexing with float
if (vim9 && rettv->v_type == VAR_DICT
@@ -4035,7 +4037,11 @@
var1.v_type = VAR_STRING;
}
#endif
- if (tv_get_string_chk(&var1) == NULL)
+ if (vim9 && rettv->v_type == VAR_LIST)
+ tv_get_number_chk(&var1, &error);
+ else
+ error = tv_get_string_chk(&var1) == NULL;
+ if (error)
{
// not a number or string
clear_tv(&var1);
@@ -4118,7 +4124,7 @@
case VAR_FUNC:
case VAR_PARTIAL:
if (verbose)
- emsg(_("E695: Cannot index a Funcref"));
+ emsg(_(e_cannot_index_a_funcref));
return FAIL;
case VAR_FLOAT:
#ifdef FEAT_FLOAT
diff --git a/src/testdir/test_listdict.vim b/src/testdir/test_listdict.vim
index de63c79..ad36cb0 100644
--- a/src/testdir/test_listdict.vim
+++ b/src/testdir/test_listdict.vim
@@ -1291,12 +1291,19 @@
" List and dict indexing tests
func Test_listdict_index()
- call assert_fails('echo function("min")[0]', 'E695:')
- call assert_fails('echo v:true[0]', 'E909:')
+ call CheckLegacyAndVim9Failure(['echo function("min")[0]'], 'E695:')
+ call CheckLegacyAndVim9Failure(['echo v:true[0]'], 'E909:')
+ call CheckLegacyAndVim9Failure(['echo v:null[0]'], 'E909:')
+
let d = {'k' : 10}
call assert_fails('echo d.', 'E15:')
- call assert_fails('echo d[1:2]', 'E719:')
+ call CheckDefAndScriptFailure2(['var d = {k: 10}', 'echo d.'], 'E1127', 'E15:')
+
+ call CheckLegacyAndVim9Failure(['VAR d = {"k": 10}', 'echo d[1 : 2]'], 'E719:')
+
call assert_fails("let v = [4, 6][{-> 1}]", 'E729:')
+ call CheckDefAndScriptFailure2(['var v = [4, 6][() => 1]'], 'E1012', 'E703:')
+
call assert_fails("let v = range(5)[2:[]]", 'E730:')
call assert_fails("let v = range(5)[2:{-> 2}(]", ['E15:', 'E116:'])
call assert_fails("let v = range(5)[2:3", 'E111:')
diff --git a/src/version.c b/src/version.c
index d65a5c1..288b23a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3852,
+/**/
3851,
/**/
3850,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index d6fc6d8..ff96b10 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -3043,7 +3043,25 @@
}
else
{
- emsg(_(e_string_list_dict_or_blob_required));
+ switch (vartype)
+ {
+ case VAR_FUNC:
+ case VAR_PARTIAL:
+ emsg(_(e_cannot_index_a_funcref));
+ break;
+ case VAR_BOOL:
+ case VAR_SPECIAL:
+ case VAR_JOB:
+ case VAR_CHANNEL:
+ case VAR_INSTR:
+ case VAR_UNKNOWN:
+ case VAR_ANY:
+ case VAR_VOID:
+ emsg(_(e_cannot_index_special_variable));
+ break;
+ default:
+ emsg(_(e_string_list_dict_or_blob_required));
+ }
return FAIL;
}
return OK;