# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1586640604 -7200
# Node ID f863aa96cae59410d8443a7151e10d6315cf6631
# Parent  f6ec09f04b0cf4a4dceb065c3ef361e17694fdd3
patch 8.2.0548: Vim9: not all possible func type errors tested

Commit: https://github.com/vim/vim/commit/08938eeba463e98d23ba7b88e81bd252c981d235
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Apr 11 23:17:17 2020 +0200

    patch 8.2.0548: Vim9: not all possible func type errors tested

    Problem:    Vim9: not all possible func type errors tested.
    Solution:   Add more tests.

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -442,6 +442,10 @@ def FuncOneArgRetNumber(arg: number): nu
   return arg
 enddef
 
+def FuncTwoArgNoRet(one: bool, two: number)
+  funcResult = two
+enddef
+
 def FuncOneArgRetString(arg: string): string
   return arg
 enddef
@@ -511,6 +515,14 @@ def Test_func_type_fails()
   CheckDefFailure(['let Ref1: func()', 'Ref1 = FuncNoArgRetNumber'], 'E1013: type mismatch, expected func() but got func(): number')
   CheckDefFailure(['let Ref1: func()', 'Ref1 = FuncOneArgNoRet'], 'E1013: type mismatch, expected func() but got func(number)')
   CheckDefFailure(['let Ref1: func()', 'Ref1 = FuncOneArgRetNumber'], 'E1013: type mismatch, expected func() but got func(number): number')
+  CheckDefFailure(['let Ref1: func(bool)', 'Ref1 = FuncTwoArgNoRet'], 'E1013: type mismatch, expected func(bool) but got func(bool, number)')
+  CheckDefFailure(['let Ref1: func(?bool)', 'Ref1 = FuncTwoArgNoRet'], 'E1013: type mismatch, expected func(?bool) but got func(bool, number)')
+  CheckDefFailure(['let Ref1: func(...bool)', 'Ref1 = FuncTwoArgNoRet'], 'E1013: type mismatch, expected func(...bool) but got func(bool, number)')
+
+  call CheckDefFailure(['let RefWrong: func(string ,number)'], 'E1068:')
+  call CheckDefFailure(['let RefWrong: func(string,number)'], 'E1069:')
+  call CheckDefFailure(['let RefWrong: func(bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool)'], 'E740:')
+  call CheckDefFailure(['let RefWrong: func(bool):string'], 'E1069:')
 enddef
 
 def Test_func_return_type()
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    548,
+/**/
     547,
 /**/
     546,
diff --git a/src/vim9compile.c b/src/vim9compile.c
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1648,7 +1648,10 @@ parse_type(char_u **arg, garray_T *type_
 			{
 			    ++p;
 			    if (!VIM_ISWHITE(*p))
+			    {
 				semsg(_(e_white_after), ",");
+				return &t_any;
+			    }
 			}
 			p = skipwhite(p);
 			if (argcount == MAX_FUNC_ARGS)
@@ -1675,7 +1678,7 @@ parse_type(char_u **arg, garray_T *type_
 		    *arg = skipwhite(*arg);
 		    ret_type = parse_type(arg, type_gap);
 		}
-		if (flags == 0 && first_optional == -1)
+		if (flags == 0 && first_optional == -1 && argcount <= 0)
 		    type = get_func_type(ret_type, argcount, type_gap);
 		else
 		{
@@ -1822,8 +1825,9 @@ vartype_name(vartype_T type)
 	case VAR_CHANNEL: return "channel";
 	case VAR_LIST: return "list";
 	case VAR_DICT: return "dict";
-	case VAR_FUNC: return "func";
-	case VAR_PARTIAL: return "partial";
+
+	case VAR_FUNC:
+	case VAR_PARTIAL: return "func";
     }
     return "unknown";
 }
@@ -1853,7 +1857,7 @@ type_name(type_T *type, char **tofree)
 	    return *tofree;
 	}
     }
-    if (type->tt_type == VAR_FUNC || type->tt_type == VAR_PARTIAL)
+    if (type->tt_type == VAR_FUNC)
     {
 	garray_T    ga;
 	int	    i;
@@ -1866,12 +1870,16 @@ type_name(type_T *type, char **tofree)
 	STRCPY(ga.ga_data, "func(");
 	ga.ga_len += 5;
 
-	for (i = 0; i < type->tt_argcount + varargs; ++i)
+	for (i = 0; i < type->tt_argcount; ++i)
 	{
 	    char *arg_free;
-	    char *arg_type = type_name(type->tt_args[i], &arg_free);
+	    char *arg_type;
 	    int  len;
 
+	    if (type->tt_args == NULL)
+		arg_type = "[unknown]";
+	    else
+		arg_type = type_name(type->tt_args[i], &arg_free);
 	    if (i > 0)
 	    {
 		STRCPY((char *)ga.ga_data + ga.ga_len, ", ");
@@ -1884,7 +1892,7 @@ type_name(type_T *type, char **tofree)
 		return "[unknown]";
 	    }
 	    *tofree = ga.ga_data;
-	    if (i == type->tt_argcount)
+	    if (varargs && i == type->tt_argcount - 1)
 	    {
 		STRCPY((char *)ga.ga_data + ga.ga_len, "...");
 		ga.ga_len += 3;
@@ -4007,8 +4015,7 @@ compile_assignment(char_u *arg, exarg_T 
 	}
 
 	// new local variable
-	if ((type->tt_type == VAR_FUNC || type->tt_type == VAR_PARTIAL)
-					    && var_check_func_name(name, TRUE))
+	if (type->tt_type == VAR_FUNC && var_check_func_name(name, TRUE))
 	    goto theend;
 	idx = reserve_local(cctx, arg, varlen, cmdidx == CMD_const, type);
 	if (idx < 0)