diff --git a/vlib/v/fmt/fmt.v b/vlib/v/fmt/fmt.v
index a2a7e9ba2c..d4b64f0329 100644
--- a/vlib/v/fmt/fmt.v
+++ b/vlib/v/fmt/fmt.v
@@ -571,248 +571,6 @@ fn abs(v int) int {
 	return if v >= 0 { v } else { -v }
 }
 
-const (
-	threshold_to_align_struct = 8
-)
-
-struct StructFieldAlignInfo {
-mut:
-	first_line   int
-	last_line    int
-	max_type_len int
-	max_len      int
-}
-
-fn (mut list []StructFieldAlignInfo) add_new_info(len int, type_len int, line int) {
-	list << StructFieldAlignInfo{
-		first_line: line
-		last_line: line
-		max_type_len: type_len
-		max_len: len
-	}
-}
-
-[direct_array_access]
-fn (mut list []StructFieldAlignInfo) add_info(len int, type_len int, line int) {
-	if list.len == 0 {
-		list.add_new_info(len, type_len, line)
-		return
-	}
-	i := list.len - 1
-	if line - list[i].last_line > 1 {
-		list.add_new_info(len, type_len, line)
-		return
-	}
-	list[i].last_line = line
-	if len > list[i].max_len {
-		list[i].max_len = len
-	}
-	if type_len > list[i].max_type_len {
-		list[i].max_type_len = type_len
-	}
-}
-
-struct CommentAndExprAlignInfo {
-mut:
-	max_attrs_len int
-	max_type_len  int
-	first_line    int
-	last_line     int
-}
-
-fn (mut list []CommentAndExprAlignInfo) add_new_info(attrs_len int, type_len int, line int) {
-	list << CommentAndExprAlignInfo{
-		max_attrs_len: attrs_len
-		max_type_len: type_len
-		first_line: line
-		last_line: line
-	}
-}
-
-fn (mut list []CommentAndExprAlignInfo) add_info(attrs_len int, type_len int, line int) {
-	if list.len == 0 {
-		list.add_new_info(attrs_len, type_len, line)
-		return
-	}
-	i := list.len - 1
-	if line - list[i].last_line > 1 {
-		list.add_new_info(attrs_len, type_len, line)
-		return
-	}
-	d_len := abs(list[i].max_attrs_len - attrs_len) + abs(list[i].max_type_len - type_len)
-	if !(d_len < fmt.threshold_to_align_struct) {
-		list.add_new_info(attrs_len, type_len, line)
-		return
-	}
-	list[i].last_line = line
-	if attrs_len > list[i].max_attrs_len {
-		list[i].max_attrs_len = attrs_len
-	}
-	if type_len > list[i].max_type_len {
-		list[i].max_type_len = type_len
-	}
-}
-
-pub fn (mut f Fmt) struct_decl(node ast.StructDecl) {
-	f.attrs(node.attrs)
-	if node.is_pub {
-		f.write('pub ')
-	}
-	if node.is_union {
-		f.write('union ')
-	} else {
-		f.write('struct ')
-	}
-	f.write_language_prefix(node.language)
-	name := node.name.after('.')
-	f.write(name)
-	if node.gen_types.len > 0 {
-		f.write(' <')
-		gtypes := node.gen_types.map(f.table.type_to_str(it)).join(', ')
-		f.write(gtypes)
-		f.write('>')
-	}
-	if node.fields.len == 0 && node.embeds.len == 0 && node.pos.line_nr == node.pos.last_line {
-		f.writeln(' {}')
-		return
-	}
-	f.writeln(' {')
-	mut field_aligns := []StructFieldAlignInfo{}
-	mut comment_aligns := []CommentAndExprAlignInfo{}
-	mut default_expr_aligns := []CommentAndExprAlignInfo{}
-	mut field_types := []string{cap: node.fields.len}
-	for i, field in node.fields {
-		mut ft := f.no_cur_mod(f.table.type_to_str(field.typ))
-		if !ft.contains('C.') && !ft.contains('JS.') && !ft.contains('fn (') && !ft.contains('chan') {
-			ft = f.short_module(ft)
-		}
-		field_types << ft
-		attrs_len := inline_attrs_len(field.attrs)
-		end_pos := field.pos.pos + field.pos.len
-		mut comments_len := 0 // Length of comments between field name and type
-		for comment in field.comments {
-			if comment.pos.pos >= end_pos {
-				if comment.pos.line_nr == field.pos.line_nr {
-					comment_aligns.add_info(attrs_len, field_types[i].len, comment.pos.line_nr)
-				}
-				continue
-			}
-			if comment.pos.pos > field.pos.pos {
-				comments_len += '/* ${comment.text.trim_left('\x01')} */ '.len
-			}
-		}
-		field_aligns.add_info(comments_len + field.name.len, ft.len, field.pos.line_nr)
-		if field.has_default_expr {
-			default_expr_aligns.add_info(attrs_len, field_types[i].len, field.pos.line_nr)
-		}
-	}
-	for embed in node.embeds {
-		f.mark_types_import_as_used(embed.typ)
-		styp := f.table.type_to_str(embed.typ)
-		f.writeln('\t$styp')
-	}
-	mut field_align_i := 0
-	mut comment_align_i := 0
-	mut default_expr_align_i := 0
-	mut inc_indent := false // for correct indents with multi line default exprs
-	for i, field in node.fields {
-		if i == node.mut_pos {
-			f.writeln('mut:')
-		} else if i == node.pub_pos {
-			f.writeln('pub:')
-		} else if i == node.pub_mut_pos {
-			f.writeln('pub mut:')
-		} else if i == node.global_pos {
-			f.writeln('__global:')
-		} else if i == node.module_pos {
-			f.writeln('module:')
-		} else if i > 0 {
-			// keep one empty line between fields (exclude one after mut:, pub:, ...)
-			mut before_last_line := node.fields[i - 1].pos.line_nr
-			if node.fields[i - 1].comments.len > 0 {
-				before_last_line = util.imax(before_last_line, node.fields[i - 1].comments.last().pos.last_line)
-			}
-			if node.fields[i - 1].has_default_expr {
-				before_last_line = util.imax(before_last_line, node.fields[i - 1].default_expr.position().last_line)
-			}
-
-			mut next_first_line := field.pos.line_nr
-			if field.comments.len > 0 {
-				next_first_line = util.imin(next_first_line, field.comments[0].pos.line_nr)
-			}
-			if next_first_line - before_last_line > 1 {
-				f.writeln('')
-			}
-		}
-		end_pos := field.pos.pos + field.pos.len
-		before_comments := field.comments.filter(it.pos.pos < field.pos.pos)
-		between_comments := field.comments[before_comments.len..].filter(it.pos.pos < end_pos)
-		after_type_comments := field.comments[(before_comments.len + between_comments.len)..]
-		// Handle comments before the field
-		f.comments_before_field(before_comments)
-		f.write('\t$field.name ')
-		// Handle comments between field name and type
-		before_len := f.line_len
-		f.comments(between_comments, iembed: true, has_nl: false)
-		comments_len := f.line_len - before_len
-		mut field_align := field_aligns[field_align_i]
-		if field_align.last_line < field.pos.line_nr {
-			field_align_i++
-			field_align = field_aligns[field_align_i]
-		}
-		f.write(strings.repeat(` `, field_align.max_len - field.name.len - comments_len))
-		f.write(field_types[i])
-		f.mark_types_import_as_used(field.typ)
-		attrs_len := inline_attrs_len(field.attrs)
-		has_attrs := field.attrs.len > 0
-		if has_attrs {
-			f.write(strings.repeat(` `, field_align.max_type_len - field_types[i].len))
-			f.single_line_attrs(field.attrs, inline: true)
-		}
-		if field.has_default_expr {
-			mut align := default_expr_aligns[default_expr_align_i]
-			if align.last_line < field.pos.line_nr {
-				default_expr_align_i++
-				align = default_expr_aligns[default_expr_align_i]
-			}
-			pad_len := align.max_attrs_len - attrs_len + align.max_type_len - field_types[i].len
-			f.write(strings.repeat(` `, pad_len))
-			f.write(' = ')
-			if !expr_is_single_line(field.default_expr) {
-				f.indent++
-				inc_indent = true
-			}
-			f.prefix_expr_cast_expr(field.default_expr)
-			if inc_indent {
-				f.indent--
-				inc_indent = false
-			}
-		}
-		// Handle comments after field type
-		if after_type_comments.len > 0 {
-			if after_type_comments[0].pos.line_nr > field.pos.line_nr {
-				f.writeln('')
-			} else {
-				if !field.has_default_expr {
-					mut align := comment_aligns[comment_align_i]
-					if align.last_line < field.pos.line_nr {
-						comment_align_i++
-						align = comment_aligns[comment_align_i]
-					}
-					pad_len := align.max_attrs_len - attrs_len + align.max_type_len - field_types[i].len
-					f.write(strings.repeat(` `, pad_len))
-				}
-				f.write(' ')
-			}
-			f.comments(after_type_comments, level: .indent)
-		} else {
-			f.writeln('')
-		}
-	}
-	f.comments_after_last_field(node.end_comments)
-	f.writeln('}\n')
-}
-
 pub fn (mut f Fmt) interface_decl(node ast.InterfaceDecl) {
 	if node.is_pub {
 		f.write('pub ')
@@ -2156,127 +1914,6 @@ pub fn (mut f Fmt) map_init(it ast.MapInit) {
 	f.write('}')
 }
 
-pub fn (mut f Fmt) struct_init(node ast.StructInit) {
-	struct_init_save := f.is_struct_init
-	f.is_struct_init = true
-	defer {
-		f.is_struct_init = struct_init_save
-	}
-
-	type_sym := f.table.get_type_symbol(node.typ)
-	// f.write('<old name: $type_sym.name>')
-	mut name := type_sym.name
-	if !name.starts_with('C.') {
-		name = f.no_cur_mod(f.short_module(type_sym.name)) // TODO f.type_to_str?
-	}
-	if name == 'void' {
-		name = ''
-	}
-	if node.fields.len == 0 && !node.has_update_expr {
-		// `Foo{}` on one line if there are no fields or comments
-		if node.pre_comments.len == 0 {
-			f.write('$name{}')
-		} else {
-			f.writeln('$name{')
-			f.comments(node.pre_comments, inline: true, has_nl: true, level: .indent)
-			f.write('}')
-		}
-		f.mark_import_as_used(name)
-	} else if node.is_short {
-		// `Foo{1,2,3}` (short syntax )
-		f.write('$name{')
-		f.mark_import_as_used(name)
-		if node.has_update_expr {
-			f.write('...')
-			f.expr(node.update_expr)
-			f.write(', ')
-		}
-		for i, field in node.fields {
-			f.prefix_expr_cast_expr(field.expr)
-			if i < node.fields.len - 1 {
-				f.write(', ')
-			}
-		}
-		f.write('}')
-	} else {
-		use_short_args := f.use_short_fn_args && !node.has_update_expr
-		f.use_short_fn_args = false
-		mut single_line_fields := f.single_line_fields
-		f.single_line_fields = false
-		if node.pos.line_nr < node.pos.last_line || node.pre_comments.len > 0 {
-			single_line_fields = false
-		}
-		if !use_short_args {
-			f.write('$name{')
-			f.mark_import_as_used(name)
-			if single_line_fields {
-				f.write(' ')
-			}
-		}
-		fields_start := f.out.len
-		fields_loop: for {
-			if !single_line_fields {
-				if use_short_args && f.out.buf[f.out.buf.len - 1] == ` ` {
-					//           v Remove space at tail of line
-					// f(a, b, c, \n
-					//     f1: 0\n
-					//     f2: 1\n
-					// )
-					f.out.go_back(1)
-				}
-				f.writeln('')
-				f.indent++
-			}
-			f.comments(node.pre_comments, inline: true, has_nl: true, level: .keep)
-			if node.has_update_expr {
-				f.write('...')
-				f.expr(node.update_expr)
-				if single_line_fields {
-					if node.fields.len > 0 {
-						f.write(', ')
-					}
-				} else {
-					f.writeln('')
-				}
-				f.comments(node.update_expr_comments, inline: true, has_nl: true, level: .keep)
-			}
-			for i, field in node.fields {
-				f.write('$field.name: ')
-				f.prefix_expr_cast_expr(field.expr)
-				f.comments(field.comments, inline: true, has_nl: false, level: .indent)
-				if single_line_fields {
-					if i < node.fields.len - 1 {
-						f.write(', ')
-					}
-				} else {
-					f.writeln('')
-				}
-				f.comments(field.next_comments, inline: false, has_nl: true, level: .keep)
-				if single_line_fields && (field.comments.len > 0
-					|| field.next_comments.len > 0
-					|| !expr_is_single_line(field.expr)
-					|| f.line_len > fmt.max_len.last()) {
-					single_line_fields = false
-					f.out.go_back_to(fields_start)
-					f.line_len = fields_start
-					f.remove_new_line({})
-					continue fields_loop
-				}
-			}
-			break
-		}
-		if !single_line_fields {
-			f.indent--
-		}
-		if !use_short_args {
-			if single_line_fields {
-				f.write(' ')
-			}
-			f.write('}')
-		}
-	}
-}
-
 pub fn (mut f Fmt) const_decl(it ast.ConstDecl) {
 	if it.is_pub {
 		f.write('pub ')
diff --git a/vlib/v/fmt/struct.v b/vlib/v/fmt/struct.v
new file mode 100644
index 0000000000..8e7d2f83ad
--- /dev/null
+++ b/vlib/v/fmt/struct.v
@@ -0,0 +1,371 @@
+// Copyright (c) 2019-2021 Alexander Medvednikov. All rights reserved.
+// Use of this source code is governed by an MIT license
+// that can be found in the LICENSE file.
+module fmt
+
+import strings
+import v.ast
+import v.util
+
+const (
+	threshold_to_align_struct = 8
+)
+
+struct StructFieldAlignInfo {
+mut:
+	first_line   int
+	last_line    int
+	max_type_len int
+	max_len      int
+}
+
+fn (mut list []StructFieldAlignInfo) add_new_info(len int, type_len int, line int) {
+	list << StructFieldAlignInfo{
+		first_line: line
+		last_line: line
+		max_type_len: type_len
+		max_len: len
+	}
+}
+
+[direct_array_access]
+fn (mut list []StructFieldAlignInfo) add_info(len int, type_len int, line int) {
+	if list.len == 0 {
+		list.add_new_info(len, type_len, line)
+		return
+	}
+	i := list.len - 1
+	if line - list[i].last_line > 1 {
+		list.add_new_info(len, type_len, line)
+		return
+	}
+	list[i].last_line = line
+	if len > list[i].max_len {
+		list[i].max_len = len
+	}
+	if type_len > list[i].max_type_len {
+		list[i].max_type_len = type_len
+	}
+}
+
+struct CommentAndExprAlignInfo {
+mut:
+	max_attrs_len int
+	max_type_len  int
+	first_line    int
+	last_line     int
+}
+
+fn (mut list []CommentAndExprAlignInfo) add_new_info(attrs_len int, type_len int, line int) {
+	list << CommentAndExprAlignInfo{
+		max_attrs_len: attrs_len
+		max_type_len: type_len
+		first_line: line
+		last_line: line
+	}
+}
+
+fn (mut list []CommentAndExprAlignInfo) add_info(attrs_len int, type_len int, line int) {
+	if list.len == 0 {
+		list.add_new_info(attrs_len, type_len, line)
+		return
+	}
+	i := list.len - 1
+	if line - list[i].last_line > 1 {
+		list.add_new_info(attrs_len, type_len, line)
+		return
+	}
+	d_len := abs(list[i].max_attrs_len - attrs_len) + abs(list[i].max_type_len - type_len)
+	if !(d_len < fmt.threshold_to_align_struct) {
+		list.add_new_info(attrs_len, type_len, line)
+		return
+	}
+	list[i].last_line = line
+	if attrs_len > list[i].max_attrs_len {
+		list[i].max_attrs_len = attrs_len
+	}
+	if type_len > list[i].max_type_len {
+		list[i].max_type_len = type_len
+	}
+}
+
+pub fn (mut f Fmt) struct_decl(node ast.StructDecl) {
+	f.attrs(node.attrs)
+	if node.is_pub {
+		f.write('pub ')
+	}
+	if node.is_union {
+		f.write('union ')
+	} else {
+		f.write('struct ')
+	}
+	f.write_language_prefix(node.language)
+	name := node.name.after('.')
+	f.write(name)
+	if node.gen_types.len > 0 {
+		f.write(' <')
+		gtypes := node.gen_types.map(f.table.type_to_str(it)).join(', ')
+		f.write(gtypes)
+		f.write('>')
+	}
+	if node.fields.len == 0 && node.embeds.len == 0 && node.pos.line_nr == node.pos.last_line {
+		f.writeln(' {}')
+		return
+	}
+	f.writeln(' {')
+	mut field_aligns := []StructFieldAlignInfo{}
+	mut comment_aligns := []CommentAndExprAlignInfo{}
+	mut default_expr_aligns := []CommentAndExprAlignInfo{}
+	mut field_types := []string{cap: node.fields.len}
+	for i, field in node.fields {
+		mut ft := f.no_cur_mod(f.table.type_to_str(field.typ))
+		if !ft.contains('C.') && !ft.contains('JS.') && !ft.contains('fn (') && !ft.contains('chan') {
+			ft = f.short_module(ft)
+		}
+		field_types << ft
+		attrs_len := inline_attrs_len(field.attrs)
+		end_pos := field.pos.pos + field.pos.len
+		mut comments_len := 0 // Length of comments between field name and type
+		for comment in field.comments {
+			if comment.pos.pos >= end_pos {
+				if comment.pos.line_nr == field.pos.line_nr {
+					comment_aligns.add_info(attrs_len, field_types[i].len, comment.pos.line_nr)
+				}
+				continue
+			}
+			if comment.pos.pos > field.pos.pos {
+				comments_len += '/* ${comment.text.trim_left('\x01')} */ '.len
+			}
+		}
+		field_aligns.add_info(comments_len + field.name.len, ft.len, field.pos.line_nr)
+		if field.has_default_expr {
+			default_expr_aligns.add_info(attrs_len, field_types[i].len, field.pos.line_nr)
+		}
+	}
+	for embed in node.embeds {
+		f.mark_types_import_as_used(embed.typ)
+		styp := f.table.type_to_str(embed.typ)
+		f.writeln('\t$styp')
+	}
+	mut field_align_i := 0
+	mut comment_align_i := 0
+	mut default_expr_align_i := 0
+	mut inc_indent := false // for correct indents with multi line default exprs
+	for i, field in node.fields {
+		if i == node.mut_pos {
+			f.writeln('mut:')
+		} else if i == node.pub_pos {
+			f.writeln('pub:')
+		} else if i == node.pub_mut_pos {
+			f.writeln('pub mut:')
+		} else if i == node.global_pos {
+			f.writeln('__global:')
+		} else if i == node.module_pos {
+			f.writeln('module:')
+		} else if i > 0 {
+			// keep one empty line between fields (exclude one after mut:, pub:, ...)
+			mut before_last_line := node.fields[i - 1].pos.line_nr
+			if node.fields[i - 1].comments.len > 0 {
+				before_last_line = util.imax(before_last_line, node.fields[i - 1].comments.last().pos.last_line)
+			}
+			if node.fields[i - 1].has_default_expr {
+				before_last_line = util.imax(before_last_line, node.fields[i - 1].default_expr.position().last_line)
+			}
+
+			mut next_first_line := field.pos.line_nr
+			if field.comments.len > 0 {
+				next_first_line = util.imin(next_first_line, field.comments[0].pos.line_nr)
+			}
+			if next_first_line - before_last_line > 1 {
+				f.writeln('')
+			}
+		}
+		end_pos := field.pos.pos + field.pos.len
+		before_comments := field.comments.filter(it.pos.pos < field.pos.pos)
+		between_comments := field.comments[before_comments.len..].filter(it.pos.pos < end_pos)
+		after_type_comments := field.comments[(before_comments.len + between_comments.len)..]
+		// Handle comments before the field
+		f.comments_before_field(before_comments)
+		f.write('\t$field.name ')
+		// Handle comments between field name and type
+		before_len := f.line_len
+		f.comments(between_comments, iembed: true, has_nl: false)
+		comments_len := f.line_len - before_len
+		mut field_align := field_aligns[field_align_i]
+		if field_align.last_line < field.pos.line_nr {
+			field_align_i++
+			field_align = field_aligns[field_align_i]
+		}
+		f.write(strings.repeat(` `, field_align.max_len - field.name.len - comments_len))
+		f.write(field_types[i])
+		f.mark_types_import_as_used(field.typ)
+		attrs_len := inline_attrs_len(field.attrs)
+		has_attrs := field.attrs.len > 0
+		if has_attrs {
+			f.write(strings.repeat(` `, field_align.max_type_len - field_types[i].len))
+			f.single_line_attrs(field.attrs, inline: true)
+		}
+		if field.has_default_expr {
+			mut align := default_expr_aligns[default_expr_align_i]
+			if align.last_line < field.pos.line_nr {
+				default_expr_align_i++
+				align = default_expr_aligns[default_expr_align_i]
+			}
+			pad_len := align.max_attrs_len - attrs_len + align.max_type_len - field_types[i].len
+			f.write(strings.repeat(` `, pad_len))
+			f.write(' = ')
+			if !expr_is_single_line(field.default_expr) {
+				f.indent++
+				inc_indent = true
+			}
+			f.prefix_expr_cast_expr(field.default_expr)
+			if inc_indent {
+				f.indent--
+				inc_indent = false
+			}
+		}
+		// Handle comments after field type
+		if after_type_comments.len > 0 {
+			if after_type_comments[0].pos.line_nr > field.pos.line_nr {
+				f.writeln('')
+			} else {
+				if !field.has_default_expr {
+					mut align := comment_aligns[comment_align_i]
+					if align.last_line < field.pos.line_nr {
+						comment_align_i++
+						align = comment_aligns[comment_align_i]
+					}
+					pad_len := align.max_attrs_len - attrs_len + align.max_type_len - field_types[i].len
+					f.write(strings.repeat(` `, pad_len))
+				}
+				f.write(' ')
+			}
+			f.comments(after_type_comments, level: .indent)
+		} else {
+			f.writeln('')
+		}
+	}
+	f.comments_after_last_field(node.end_comments)
+	f.writeln('}\n')
+}
+
+pub fn (mut f Fmt) struct_init(node ast.StructInit) {
+	struct_init_save := f.is_struct_init
+	f.is_struct_init = true
+	defer {
+		f.is_struct_init = struct_init_save
+	}
+
+	type_sym := f.table.get_type_symbol(node.typ)
+	// f.write('<old name: $type_sym.name>')
+	mut name := type_sym.name
+	if !name.starts_with('C.') {
+		name = f.no_cur_mod(f.short_module(type_sym.name)) // TODO f.type_to_str?
+	}
+	if name == 'void' {
+		name = ''
+	}
+	if node.fields.len == 0 && !node.has_update_expr {
+		// `Foo{}` on one line if there are no fields or comments
+		if node.pre_comments.len == 0 {
+			f.write('$name{}')
+		} else {
+			f.writeln('$name{')
+			f.comments(node.pre_comments, inline: true, has_nl: true, level: .indent)
+			f.write('}')
+		}
+		f.mark_import_as_used(name)
+	} else if node.is_short {
+		// `Foo{1,2,3}` (short syntax )
+		f.write('$name{')
+		f.mark_import_as_used(name)
+		if node.has_update_expr {
+			f.write('...')
+			f.expr(node.update_expr)
+			f.write(', ')
+		}
+		for i, field in node.fields {
+			f.prefix_expr_cast_expr(field.expr)
+			if i < node.fields.len - 1 {
+				f.write(', ')
+			}
+		}
+		f.write('}')
+	} else {
+		use_short_args := f.use_short_fn_args && !node.has_update_expr
+		f.use_short_fn_args = false
+		mut single_line_fields := f.single_line_fields
+		f.single_line_fields = false
+		if node.pos.line_nr < node.pos.last_line || node.pre_comments.len > 0 {
+			single_line_fields = false
+		}
+		if !use_short_args {
+			f.write('$name{')
+			f.mark_import_as_used(name)
+			if single_line_fields {
+				f.write(' ')
+			}
+		}
+		fields_start := f.out.len
+		fields_loop: for {
+			if !single_line_fields {
+				if use_short_args && f.out.buf[f.out.buf.len - 1] == ` ` {
+					//           v Remove space at tail of line
+					// f(a, b, c, \n
+					//     f1: 0\n
+					//     f2: 1\n
+					// )
+					f.out.go_back(1)
+				}
+				f.writeln('')
+				f.indent++
+			}
+			f.comments(node.pre_comments, inline: true, has_nl: true, level: .keep)
+			if node.has_update_expr {
+				f.write('...')
+				f.expr(node.update_expr)
+				if single_line_fields {
+					if node.fields.len > 0 {
+						f.write(', ')
+					}
+				} else {
+					f.writeln('')
+				}
+				f.comments(node.update_expr_comments, inline: true, has_nl: true, level: .keep)
+			}
+			for i, field in node.fields {
+				f.write('$field.name: ')
+				f.prefix_expr_cast_expr(field.expr)
+				f.comments(field.comments, inline: true, has_nl: false, level: .indent)
+				if single_line_fields {
+					if i < node.fields.len - 1 {
+						f.write(', ')
+					}
+				} else {
+					f.writeln('')
+				}
+				f.comments(field.next_comments, inline: false, has_nl: true, level: .keep)
+				if single_line_fields && (field.comments.len > 0
+					|| field.next_comments.len > 0
+					|| !expr_is_single_line(field.expr)
+					|| f.line_len > max_len.last()) {
+					single_line_fields = false
+					f.out.go_back_to(fields_start)
+					f.line_len = fields_start
+					f.remove_new_line({})
+					continue fields_loop
+				}
+			}
+			break
+		}
+		if !single_line_fields {
+			f.indent--
+		}
+		if !use_short_args {
+			if single_line_fields {
+				f.write(' ')
+			}
+			f.write('}')
+		}
+	}
+}