Mercurial > vim

diff src/userfunc.c @ 27869:6a0ecde89d35 v8.2.4460

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4460: Vim9: wrong error for defining dict function Commit: https://github.com/vim/vim/commit/dea5ab0fc5bb51105078d5349f987496b1aa8d6f Author: Bram Moolenaar <Bram@vim.org> Date: Wed Feb 23 22:12:02 2022 +0000 patch 8.2.4460: Vim9: wrong error for defining dict function Problem: Vim9: wrong error for defining dict function. Solution: Explicitly check for trying to define a dict function. (closes 9827)
author Bram Moolenaar <Bram@vim.org>
date Wed, 23 Feb 2022 23:15:03 +0100
parents 292a6bd86c30
children 8e630053c59c
line wrap: on
line diff
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -4268,10 +4268,21 @@ define_function(exarg_T *eap, char_u *na
     }
     else
     {
-	if (vim9script && p[0] == 's' && p[1] == ':')
+	if (vim9script)
 	{
-	    semsg(_(e_cannot_use_s_colon_in_vim9_script_str), p);
-	    return NULL;
+	    if (p[0] == 's' && p[1] == ':')
+	    {
+		semsg(_(e_cannot_use_s_colon_in_vim9_script_str), p);
+		return NULL;
+	    }
+	    p = to_name_end(p, TRUE);
+	    if (*skipwhite(p) == '.' && vim_strchr(p, '(') != NULL)
+	    {
+		semsg(_(e_cannot_define_dict_func_in_vim9_script_str),
+								     eap->arg);
+		return NULL;
+	    }
+	    p = eap->arg;
 	}
 
 	name = save_function_name(&p, &is_global, eap->skip,