mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-14 06:52:36 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

fmt: cleanup align.v (#22295)

Browse source
This commit is contained in:
yuyi 2024-09-25 03:16:38 +08:00 • committed by GitHub
parent 4ee948feaa
commit e974460b45
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
vlib/v/fmt/align.v
View file

@ -12,7 +12,6 @@ mut:
@[params] @[params]
struct AlignConfig { struct AlignConfig {
pub: pub:
ignore_newline bool // ignore newline or comment
use_break_line bool use_break_line bool
use_threshold bool use_threshold bool
threshold int = 25 threshold int = 25
@ -44,17 +43,17 @@ fn (mut fa FieldAlign) add_info(len int, line int, has_break_line bool) {
fa.add_new_info(len, line) fa.add_new_info(len, line)
return return
} }
i := fa.infos.len - 1 last_idx := fa.infos.len - 1
if !fa.cfg.ignore_newline && ((fa.cfg.use_break_line && has_break_line) if (fa.cfg.use_break_line && has_break_line)
|| (!fa.cfg.use_break_line && line - fa.infos[i].line_nr > 1)) { || (!fa.cfg.use_break_line && line - fa.infos[last_idx].line_nr > 1) {
fa.add_new_info(len, line) fa.add_new_info(len, line)
return return
} }
if fa.cfg.use_threshold { if fa.cfg.use_threshold {
len_diff := if fa.infos[i].max_len >= len { len_diff := if fa.infos[last_idx].max_len >= len {
fa.infos[i].max_len - len fa.infos[last_idx].max_len - len
} else { } else {
len - fa.infos[i].max_len len - fa.infos[last_idx].max_len
} }
if len_diff >= fa.cfg.threshold { if len_diff >= fa.cfg.threshold {
@ -62,9 +61,9 @@ fn (mut fa FieldAlign) add_info(len int, line int, has_break_line bool) {
return return
} }
} }
fa.infos[i].line_nr = line fa.infos[last_idx].line_nr = line
if len > fa.infos[i].max_len { if len > fa.infos[last_idx].max_len {
fa.infos[i].max_len = len fa.infos[last_idx].max_len = len
} }
} }