Mercurial > vim

changeset 18536:c0cd979000f9 v8.1.2262

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2262: unpack assignment in function not recognized Commit: https://github.com/vim/vim/commit/1e673b9eb686459bd0e7fc3f2199dd077546a18e Author: Bram Moolenaar <Bram@vim.org> Date: Wed Nov 6 15:02:50 2019 +0100 patch 8.1.2262: unpack assignment in function not recognized Problem: Unpack assignment in function not recognized. Solution: Skip over "[a, b]". (closes https://github.com/vim/vim/issues/5051)
author Bram Moolenaar <Bram@vim.org>
date Wed, 06 Nov 2019 15:15:03 +0100
parents 669d5689143b
children ced72f20e074
files src/testdir/test_let.vim src/userfunc.c src/version.c
diffstat 3 files changed, 30 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_let.vim
+++ b/src/testdir/test_let.vim
@@ -303,4 +303,12 @@ E
      END
   endif
   call assert_equal([], check)
+
+  " unpack assignment
+  let [a, b, c] =<< END
+     x
+     \y
+     z
+END
+  call assert_equal(['     x', '     \y', '     z'], [a, b, c])
 endfunc
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -2482,25 +2482,31 @@ ex_function(exarg_T *eap)
 	    }
 
 	    // Check for ":let v =<< [trim] EOF"
+	    //       and ":let [a, b] =<< [trim] EOF"
 	    arg = skipwhite(skiptowhite(p));
-	    arg = skipwhite(skiptowhite(arg));
-	    if (arg[0] == '=' && arg[1] == '<' && arg[2] =='<'
-		    && ((p[0] == 'l'
-			    && p[1] == 'e'
-			    && (!ASCII_ISALNUM(p[2])
-				|| (p[2] == 't' && !ASCII_ISALNUM(p[3]))))))
+	    if (*arg == '[')
+		arg = vim_strchr(arg, ']');
+	    if (arg != NULL)
 	    {
-		p = skipwhite(arg + 3);
-		if (STRNCMP(p, "trim", 4) == 0)
+		arg = skipwhite(skiptowhite(arg));
+		if ( arg[0] == '=' && arg[1] == '<' && arg[2] =='<'
+			&& ((p[0] == 'l'
+				&& p[1] == 'e'
+				&& (!ASCII_ISALNUM(p[2])
+				    || (p[2] == 't' && !ASCII_ISALNUM(p[3]))))))
 		{
-		    // Ignore leading white space.
-		    p = skipwhite(p + 4);
-		    heredoc_trimmed = vim_strnsave(theline,
+		    p = skipwhite(arg + 3);
+		    if (STRNCMP(p, "trim", 4) == 0)
+		    {
+			// Ignore leading white space.
+			p = skipwhite(p + 4);
+			heredoc_trimmed = vim_strnsave(theline,
 					  (int)(skipwhite(theline) - theline));
+		    }
+		    skip_until = vim_strnsave(p, (int)(skiptowhite(p) - p));
+		    do_concat = FALSE;
+		    is_heredoc = TRUE;
 		}
-		skip_until = vim_strnsave(p, (int)(skiptowhite(p) - p));
-		do_concat = FALSE;
-		is_heredoc = TRUE;
 	    }
 	}
 
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2262,
+/**/
     2261,
 /**/
     2260,