Mercurial > vim
changeset 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 | 5abc63ecc7a4 |
children | 75e53f66302e |
files | src/dict.c src/list.c src/testdir/test_vim9_expr.vim src/version.c src/vim9compile.c |
diffstat | 5 files changed, 41 insertions(+), 3 deletions(-) [+] |
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; }
--- a/src/list.c +++ b/src/list.c @@ -1219,7 +1219,12 @@ eval_list(char_u **arg, typval_T *rettv, if (!had_comma) { if (do_error) - semsg(_("E696: Missing comma in List: %s"), *arg); + { + if (**arg == ',') + semsg(_(e_no_white_before), ","); + else + semsg(_("E696: Missing comma in List: %s"), *arg); + } goto failret; } }
--- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1383,7 +1383,10 @@ def Test_expr7_list() call CheckDefExecFailure(["let x = g:anint[3]"], 'E714:') call CheckDefFailure(["let x = g:list_mixed[xxx]"], 'E1001:') + call CheckDefFailure(["let x = [1,2,3]"], 'E1069:') + call CheckDefFailure(["let x = [1 ,2, 3]"], 'E1068:') + call CheckDefExecFailure(["let x = g:list_mixed['xx']"], 'E1029:') call CheckDefFailure(["let x = g:list_mixed["], 'E1097:') call CheckDefFailure(["let x = g:list_mixed[0"], 'E1097:') @@ -1422,6 +1425,12 @@ def Test_expr7_list_vim9script() let l = [11,22] END CheckScriptFailure(lines, 'E1069:') + + lines =<< trim END + vim9script + let l = [11 , 22] + END + CheckScriptFailure(lines, 'E1068:') enddef def Test_expr7_lambda() @@ -1556,6 +1565,18 @@ def Test_expr7_dict_vim9script() let d = #{one: 1,two: 2} END CheckScriptFailure(lines, 'E1069:') + + lines =<< trim END + vim9script + let d = #{one : 1} + END + CheckScriptFailure(lines, 'E1068:') + + lines =<< trim END + vim9script + let d = #{one:1} + END + CheckScriptFailure(lines, 'E1069:') enddef let g:oneString = 'one'