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: minor optimization in struct.v (#14898)

Browse Source
This commit is contained in:
yuyi 2022-07-01 00:52:49 +08:00 committed by GitHub
parent 3f147cbc38
commit d3c1e671f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,6 @@ module fmt
import strings import strings
import v.ast import v.ast
import v.mathutil as mu
pub fn (mut f Fmt) struct_decl(node ast.StructDecl) { pub fn (mut f Fmt) struct_decl(node ast.StructDecl) {
f.attrs(node.attrs) f.attrs(node.attrs)
@ -88,15 +87,21 @@ pub fn (mut f Fmt) struct_decl(node ast.StructDecl) {
// keep one empty line between fields (exclude one after mut:, pub:, ...) // keep one empty line between fields (exclude one after mut:, pub:, ...)
mut before_last_line := node.fields[i - 1].pos.line_nr mut before_last_line := node.fields[i - 1].pos.line_nr
if node.fields[i - 1].comments.len > 0 { if node.fields[i - 1].comments.len > 0 {
before_last_line = mu.max(before_last_line, node.fields[i - 1].comments.last().pos.last_line) if before_last_line < node.fields[i - 1].comments.last().pos.last_line {
before_last_line = node.fields[i - 1].comments.last().pos.last_line
}
} }
if node.fields[i - 1].has_default_expr { if node.fields[i - 1].has_default_expr {
before_last_line = mu.max(before_last_line, node.fields[i - 1].default_expr.pos().last_line) if before_last_line < node.fields[i - 1].default_expr.pos().last_line {
before_last_line = node.fields[i - 1].default_expr.pos().last_line
}
} }
mut next_first_line := field.pos.line_nr mut next_first_line := field.pos.line_nr
if field.comments.len > 0 { if field.comments.len > 0 {
next_first_line = mu.min(next_first_line, field.comments[0].pos.line_nr) if next_first_line > field.comments[0].pos.line_nr {
next_first_line = field.comments[0].pos.line_nr
}
} }
if next_first_line - before_last_line > 1 { if next_first_line - before_last_line > 1 {
f.writeln('') f.writeln('')