vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

vfmt: fix extra whitspace in fn type decl with type-only args (#6888)

pull/6893/head
Lukas Neubert 2020-11-20 15:00:40 +01:00 committed by GitHub
parent 30ddb89e3c
commit 5d76e85a23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vlib/v/fmt/fmt.v
View File

@ -534,10 +534,11 @@ pub fn (mut f Fmt) type_decl(node ast.TypeDecl) {
should_add_type := true || is_last_arg || fn_info.params[i + 1].typ != arg.typ || should_add_type := true || is_last_arg || fn_info.params[i + 1].typ != arg.typ ||
(fn_info.is_variadic && i == fn_info.params.len - 2) (fn_info.is_variadic && i == fn_info.params.len - 2)
if should_add_type { if should_add_type {
ns := if arg.name == '' { '' } else { ' ' }
if fn_info.is_variadic && is_last_arg { if fn_info.is_variadic && is_last_arg {
f.write(' ...' + s) f.write(ns + '...' + s)
} else { } else {
f.write(' ' + s) f.write(ns + s)
} }
} }
if !is_last_arg { if !is_last_arg {

2
vlib/v/fmt/tests/types_expected.vv
View File

@ -24,3 +24,5 @@ type TwoSameArgs = fn (i int, j int) string // And a comment
type VarArgs = fn (s ...string) int type VarArgs = fn (s ...string) int
type NOVarArgs = fn (i int, s ...string) f64 type NOVarArgs = fn (i int, s ...string) f64
type NoNameArgs = fn (int, string, ...string)

2
vlib/v/fmt/tests/types_input.vv
View File

@ -33,3 +33,5 @@ type VarArgs = fn
(s ...string) int (s ...string) int
type NOVarArgs = fn(i int, s ...string) f64 type NOVarArgs = fn(i int, s ...string) f64
type NoNameArgs = fn( int, string , ...string)