mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

fmt: fix trailing arg formatting (#10155)

Browse Source
This commit is contained in:
zakuro 2021-05-21 12:14:07 +09:00 committed by GitHub
parent be92f81b2e
commit d8cf26aaba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vlib/v/fmt/fmt.v
View File

@ -1584,14 +1584,6 @@ pub fn (mut f Fmt) at_expr(node ast.AtExpr) {
} }
pub fn (mut f Fmt) call_expr(node ast.CallExpr) { pub fn (mut f Fmt) call_expr(node ast.CallExpr) {
old_short_arg_state := f.use_short_fn_args
f.use_short_fn_args = false
if node.args.len > 0 && node.args.last().expr is ast.StructInit {
struct_expr := node.args.last().expr as ast.StructInit
if struct_expr.typ == ast.void_type {
f.use_short_fn_args = true
}
}
for arg in node.args { for arg in node.args {
f.comments(arg.comments, {}) f.comments(arg.comments, {})
} }
@ -1639,7 +1631,6 @@ pub fn (mut f Fmt) call_expr(node ast.CallExpr) {
f.write(')') f.write(')')
f.or_expr(node.or_block) f.or_expr(node.or_block)
f.comments(node.comments, has_nl: false) f.comments(node.comments, has_nl: false)
f.use_short_fn_args = old_short_arg_state
} }
fn (mut f Fmt) write_generic_if_require(node ast.CallExpr) { fn (mut f Fmt) write_generic_if_require(node ast.CallExpr) {
@ -1662,10 +1653,19 @@ fn (mut f Fmt) write_generic_if_require(node ast.CallExpr) {
pub fn (mut f Fmt) call_args(args []ast.CallArg) { pub fn (mut f Fmt) call_args(args []ast.CallArg) {
f.single_line_fields = true f.single_line_fields = true
old_short_arg_state := f.use_short_fn_args
f.use_short_fn_args = false
defer { defer {
f.single_line_fields = false f.single_line_fields = false
f.use_short_fn_args = old_short_arg_state
} }
for i, arg in args { for i, arg in args {
if i == args.len - 1 && arg.expr is ast.StructInit {
struct_expr := arg.expr as ast.StructInit
if struct_expr.typ == ast.void_type {
f.use_short_fn_args = true
}
}
if arg.is_mut { if arg.is_mut {
f.write(arg.share.str() + ' ') f.write(arg.share.str() + ' ')
} }

7
vlib/v/fmt/tests/fn_trailing_arg_syntax_expected.vv
View File

@ -22,6 +22,10 @@ fn main() {
y: 0 y: 0
} }
) )
bar2_func({}, {})
bar2_func({ x: 's' },
x: 's'
)
baz_func('foo', 'bar', baz_func('foo', 'bar',
x: 0 x: 0
y: 0 y: 0
@ -40,4 +44,7 @@ fn main() {
fn bar_func(bar Bar) { fn bar_func(bar Bar) {
} }
fn bar2_func(bar1 Bar, bar2 Bar) {
}
fn baz_func(a string, b string, baz Baz) {} fn baz_func(a string, b string, baz Baz) {}

5
vlib/v/fmt/tests/fn_trailing_arg_syntax_input.vv
View File

@ -16,6 +16,8 @@ fn main() {
x: 0 x: 0
y: 0 y: 0
}) })
bar2_func({}, {})
bar2_func({x: 's'}, {x: 's'})
baz_func('foo', 'bar', x: 0 baz_func('foo', 'bar', x: 0
y: 0 y: 0
) )
@ -28,4 +30,7 @@ fn main() {
fn bar_func(bar Bar) { fn bar_func(bar Bar) {
} }
fn bar2_func(bar1 Bar, bar2 Bar) {
}
fn baz_func(a string, b string, baz Baz) {} fn baz_func(a string, b string, baz Baz) {}