From db199216e81865350a8d56a603bb86cab672bfad Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 12 Aug 2020 18:01:53 +0200 Subject: patch 8.2.1430: Vim9: error for missing comma instead of extra white space Problem: Vim9: error for missing comma instead of extra white space. Solution: Check if comma can be found after white space. (closes #6668) Also check for extra white space in literal dict. (closes #6670) --- src/dict.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/dict.c') diff --git a/src/dict.c b/src/dict.c index b381d476d..b6c901634 100644 --- a/src/dict.c +++ b/src/dict.c @@ -781,7 +781,7 @@ get_literal_key(char_u **arg, typval_T *tv) tv->v_type = VAR_STRING; tv->vval.v_string = vim_strnsave(*arg, p - *arg); - *arg = skipwhite(p); + *arg = p; return OK; } @@ -845,7 +845,12 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal) if (**arg != ':') { if (evaluate) - semsg(_(e_missing_dict_colon), *arg); + { + if (*skipwhite(*arg) == ':') + semsg(_(e_no_white_before), ":"); + else + semsg(_(e_missing_dict_colon), *arg); + } clear_tv(&tvkey); goto failret; } -- cgit v1.2.1