diff src/dict.c @ 21761:5a2373c25a86 v8.2.1430

patch 8.2.1430: Vim9: error for missing comma instead of extra white space Commit: https://github.com/vim/vim/commit/db199216e81865350a8d56a603bb86cab672bfad Author: Bram Moolenaar <Bram@vim.org> Date: Wed Aug 12 18:01:53 2020 +0200 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 https://github.com/vim/vim/issues/6668) Also check for extra white space in literal dict. (closes #6670)
author Bram Moolenaar <Bram@vim.org>
date Wed, 12 Aug 2020 18:15:04 +0200
parents f41c646cb8b9
children 703ea7603d3e
line wrap: on
line diff
--- a/src/dict.c
+++ b/src/dict.c
@@ -781,7 +781,7 @@ get_literal_key(char_u **arg, typval_T *
     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,
 	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;
 	}