TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-11 08:25:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

fmt: update determining of struct field comments (#21066)

Browse Source
This commit is contained in:
Turiiya 2024-03-20 07:09:54 +01:00 committed by GitHub
parent f6e57697ab
commit 9894c03e14
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
vlib/v/fmt/struct.v
View File

@ -100,23 +100,23 @@ pub fn (mut f Fmt) struct_decl(node ast.StructDecl, is_anon bool) {
} }
else {} else {}
} }
end_pos := field.pos.pos + field.pos.len mut pre_cmts, mut end_cmts, mut next_line_cmts := []ast.Comment{}, []ast.Comment{}, []ast.Comment{}
before_comments := field.comments.filter(it.pos.pos < field.pos.pos) for cmt in field.comments {
between_comments := field.comments[before_comments.len..].filter(it.pos.pos < end_pos) match true {
after_type_comments := field.comments[(before_comments.len + between_comments.len)..] cmt.pos.pos < field.pos.pos { pre_cmts << cmt }
cmt.pos.line_nr > field.pos.last_line { next_line_cmts << cmt }
else { end_cmts << cmt }
}
}
// Handle comments before the field // Handle comments before the field
f.comments_before_field(before_comments) f.comments_before_field(pre_cmts)
volatile_prefix := if field.is_volatile { 'volatile ' } else { '' } volatile_prefix := if field.is_volatile { 'volatile ' } else { '' }
f.write('\t${volatile_prefix}${field.name} ') f.write('\t${volatile_prefix}${field.name} ')
// Handle comments between field name and type
before_len := f.line_len
f.comments(between_comments, has_nl: false)
comments_len := f.line_len - before_len
if field_aligns[field_align_i].line_nr < field.pos.line_nr { if field_aligns[field_align_i].line_nr < field.pos.line_nr {
field_align_i++ field_align_i++
} }
field_align := field_aligns[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(strings.repeat(` `, field_align.max_len - field.name.len))
// Handle anon structs recursively // Handle anon structs recursively
if !f.write_anon_struct_field_decl(field.typ, field.anon_struct_decl) { if !f.write_anon_struct_field_decl(field.typ, field.anon_struct_decl) {
f.write(field_types[i]) f.write(field_types[i])
@ -153,11 +153,8 @@ pub fn (mut f Fmt) struct_decl(node ast.StructDecl, is_anon bool) {
f.write(strings.repeat(` `, field_align.max_type_len - field_types[i].len)) f.write(strings.repeat(` `, field_align.max_type_len - field_types[i].len))
f.single_line_attrs(field.attrs, same_line: true) f.single_line_attrs(field.attrs, same_line: true)
} }
// Handle comments after field type // Handle comments at the end of the line
if after_type_comments.len > 0 { if end_cmts.len > 0 {
if after_type_comments[0].pos.line_nr > field.pos.line_nr {
f.writeln('')
} else {
if !field.has_default_expr { if !field.has_default_expr {
if comment_aligns[comment_align_i].line_nr < field.pos.line_nr { if comment_aligns[comment_align_i].line_nr < field.pos.line_nr {
comment_align_i++ comment_align_i++
@ -167,11 +164,14 @@ pub fn (mut f Fmt) struct_decl(node ast.StructDecl, is_anon bool) {
f.write(strings.repeat(` `, pad_len)) f.write(strings.repeat(` `, pad_len))
} }
f.write(' ') f.write(' ')
} f.comments(end_cmts, level: .indent)
f.comments(after_type_comments, level: .indent)
} else { } else {
f.writeln('') f.writeln('')
} }
// Handle comments on the next lines
if next_line_cmts.len > 0 {
f.comments(next_line_cmts, level: .indent)
}
} }
if is_anon || node.end_comments.len > 0 { if is_anon || node.end_comments.len > 0 {
f.write('}') f.write('}')