From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 6 Aug 2020 14:38:12 +0000 (+0200)
Subject: patch 8.2.1379: curly braces expression ending in " }" does not work
X-Git-Tag: v8.2.1379
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae95a3946b012d4e68bcb20b28f691f6d3b9caaf;p=vim

patch 8.2.1379: curly braces expression ending in " }" does not work

Problem:    Curly braces expression ending in " }" does not work.
Solution:   Skip over white space when checking for "}". (closes #6634)
---

diff --git a/src/dict.c b/src/dict.c
index af1e1e9c8..ad482cddd 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -817,7 +817,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
     {
 	if (eval1(&start, &tv, NULL) == FAIL)	// recursive!
 	    return FAIL;
-	if (*start == '}')
+	if (*skipwhite(start) == '}')
 	    return NOTDONE;
     }
 
diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim
index 6d95cc033..bca89f7a7 100644
--- a/src/testdir/test_eval_stuff.vim
+++ b/src/testdir/test_eval_stuff.vim
@@ -532,4 +532,26 @@ func Test_setreg_basic()
   call assert_fails('call setreg(1, ["", "", [], ""])', 'E730:')
 endfunc
 
+func Test_curly_assignment()
+  let s:svar = 'svar'
+  let g:gvar = 'gvar'
+  let lname = 'gvar'
+  let gname = 'gvar'
+  let {'s:'.lname} = {'g:'.gname}
+  call assert_equal('gvar', s:gvar)
+  let s:gvar = ''
+  let { 's:'.lname } = { 'g:'.gname }
+  call assert_equal('gvar', s:gvar)
+  let s:gvar = ''
+  let { 's:' . lname } = { 'g:' . gname }
+  call assert_equal('gvar', s:gvar)
+  let s:gvar = ''
+  let { 's:' .. lname } = { 'g:' .. gname }
+  call assert_equal('gvar', s:gvar)
+
+  unlet s:svar
+  unlet s:gvar
+  unlet g:gvar
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index ba24f693f..2ae04a974 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1379,
 /**/
     1378,
 /**/