Skip to content

Commit 41fab3e

Browse files
committed
patch 8.2.1451: Vim9: list type at script level only uses first item
Problem: Vim9: list type at script level only uses first item. Solution: Use all members, like in a compiled function. (closes #6712) Also for dictionary.
1 parent 7d69970 commit 41fab3e

3 files changed

Lines changed: 55 additions & 2 deletions

File tree

src/testdir/test_vim9_expr.vim

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,6 +1498,27 @@ def Test_expr7_list_vim9script()
14981498
let l = [11 , 22]
14991499
END
15001500
CheckScriptFailure(lines, 'E1068:')
1501+
1502+
lines =<< trim END
1503+
vim9script
1504+
let l: list<number> = [234, 'x']
1505+
END
1506+
CheckScriptFailure(lines, 'E1013:')
1507+
lines =<< trim END
1508+
vim9script
1509+
let l: list<number> = ['x', 234]
1510+
END
1511+
CheckScriptFailure(lines, 'E1013:')
1512+
lines =<< trim END
1513+
vim9script
1514+
let l: list<string> = ['x', 234]
1515+
END
1516+
CheckScriptFailure(lines, 'E1013:')
1517+
lines =<< trim END
1518+
vim9script
1519+
let l: list<string> = [234, 'x']
1520+
END
1521+
CheckScriptFailure(lines, 'E1013:')
15011522
enddef
15021523

15031524
def LambdaWithComments(): func
@@ -1679,6 +1700,27 @@ def Test_expr7_dict_vim9script()
16791700
let d = #{one: 1 , two: 2}
16801701
END
16811702
CheckScriptFailure(lines, 'E1068:')
1703+
1704+
lines =<< trim END
1705+
vim9script
1706+
let l: dict<number> = #{a: 234, b: 'x'}
1707+
END
1708+
CheckScriptFailure(lines, 'E1013:')
1709+
lines =<< trim END
1710+
vim9script
1711+
let l: dict<number> = #{a: 'x', b: 234}
1712+
END
1713+
CheckScriptFailure(lines, 'E1013:')
1714+
lines =<< trim END
1715+
vim9script
1716+
let l: dict<string> = #{a: 'x', b: 234}
1717+
END
1718+
CheckScriptFailure(lines, 'E1013:')
1719+
lines =<< trim END
1720+
vim9script
1721+
let l: dict<string> = #{a: 234, b: 'x'}
1722+
END
1723+
CheckScriptFailure(lines, 'E1013:')
16821724
enddef
16831725

16841726
let g:oneString = 'one'

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ static char *(features[]) =
754754

755755
static int included_patches[] =
756756
{ /* Add new patch number below this line */
757+
/**/
758+
1451,
757759
/**/
758760
1450,
759761
/**/

src/vim9type.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,17 @@ typval2type(typval_T *tv, garray_T *type_gap)
214214

215215
if (tv->v_type == VAR_LIST)
216216
{
217+
listitem_T *li;
218+
217219
if (tv->vval.v_list == NULL || tv->vval.v_list->lv_first == NULL)
218220
return &t_list_empty;
219221

220-
// Use the type of the first member, it is the most specific.
222+
// Use the common type of all members.
221223
member_type = typval2type(&tv->vval.v_list->lv_first->li_tv, type_gap);
224+
for (li = tv->vval.v_list->lv_first->li_next; li != NULL;
225+
li = li->li_next)
226+
common_type(typval2type(&li->li_tv, type_gap),
227+
member_type, &member_type, type_gap);
222228
return get_list_type(member_type, type_gap);
223229
}
224230

@@ -231,10 +237,13 @@ typval2type(typval_T *tv, garray_T *type_gap)
231237
|| tv->vval.v_dict->dv_hashtab.ht_used == 0)
232238
return &t_dict_empty;
233239

234-
// Use the type of the first value, it is the most specific.
240+
// Use the common type of all values.
235241
dict_iterate_start(tv, &iter);
236242
dict_iterate_next(&iter, &value);
237243
member_type = typval2type(value, type_gap);
244+
while (dict_iterate_next(&iter, &value) != NULL)
245+
common_type(typval2type(value, type_gap),
246+
member_type, &member_type, type_gap);
238247
return get_dict_type(member_type, type_gap);
239248
}
240249

0 commit comments

Comments
 (0)