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

fmt: use fixed size array for max_len const (#21140)

Browse Source
This commit is contained in:
Turiiya 2024-03-30 12:19:30 +01:00 committed by GitHub
parent a4ff389b32
commit aea14719fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vlib/v/fmt/fmt.v
View File

@ -10,8 +10,8 @@ import v.pref
const bs = '\\' const bs = '\\'
// when to break a line depending on the penalty const break_points = [0, 35, 60, 85, 93, 100]! // when to break a line depending on the penalty
const max_len = [0, 35, 60, 85, 93, 100] const max_len = break_points[break_points.len - 1]
@[minify] @[minify]
pub struct Fmt { pub struct Fmt {
@ -145,7 +145,7 @@ pub fn (mut f Fmt) wrap_long_line(penalty_idx int, add_indent bool) bool {
if f.buffering { if f.buffering {
return false return false
} }
if penalty_idx > 0 && f.line_len <= fmt.max_len[penalty_idx] { if penalty_idx > 0 && f.line_len <= fmt.break_points[penalty_idx] {
return false return false
} }
if f.out.last() == ` ` { if f.out.last() == ` ` {
@ -1678,7 +1678,7 @@ pub fn (mut f Fmt) sum_type_decl(node ast.SumTypeDecl) {
for variant in variants { for variant in variants {
// 3 = length of ' = ' or ' | ' // 3 = length of ' = ' or ' | '
line_length += 3 + variant.name.len line_length += 3 + variant.name.len
if line_length > fmt.max_len.last() || (variant.id != node.variants.len - 1 if line_length > fmt.max_len || (variant.id != node.variants.len - 1
&& node.variants[variant.id].end_comments.len > 0) { && node.variants[variant.id].end_comments.len > 0) {
separator = '\n\t| ' separator = '\n\t| '
is_multiline = true is_multiline = true
@ -1785,7 +1785,7 @@ pub fn (mut f Fmt) array_init(node ast.ArrayInit) {
if i == 0 { if i == 0 {
if f.array_init_depth > f.array_init_break.len { if f.array_init_depth > f.array_init_break.len {
f.array_init_break << pos.line_nr > last_line_nr f.array_init_break << pos.line_nr > last_line_nr
|| f.line_len + expr.pos().len > fmt.max_len[3] || f.line_len + expr.pos().len > fmt.break_points[3]
} }
} }
mut line_break := f.array_init_break[f.array_init_depth - 1] mut line_break := f.array_init_break[f.array_init_depth - 1]
@ -1807,7 +1807,7 @@ pub fn (mut f Fmt) array_init(node ast.ArrayInit) {
single_line_expr := expr_is_single_line(expr) single_line_expr := expr_is_single_line(expr)
if single_line_expr { if single_line_expr {
mut estr := '' mut estr := ''
if !is_new_line && !f.buffering && f.line_len + expr.pos().len > fmt.max_len.last() { if !is_new_line && !f.buffering && f.line_len + expr.pos().len > fmt.max_len {
if inc_indent { if inc_indent {
estr = f.node_str(expr) estr = f.node_str(expr)
} }
@ -2361,7 +2361,7 @@ pub fn (mut f Fmt) if_expr(node ast.IfExpr) {
} }
// When a single line if is really long, write it again as multiline, // When a single line if is really long, write it again as multiline,
// except it is part of an InfixExpr. // except it is part of an InfixExpr.
if is_ternary && f.line_len > fmt.max_len.last() && !f.buffering { if is_ternary && f.line_len > fmt.max_len && !f.buffering {
is_ternary = false is_ternary = false
f.single_line_if = false f.single_line_if = false
f.out.go_back_to(start_pos) f.out.go_back_to(start_pos)
@ -2486,7 +2486,7 @@ pub fn (mut f Fmt) infix_expr(node ast.InfixExpr) {
} }
if !buffering_save && f.buffering { if !buffering_save && f.buffering {
f.buffering = false f.buffering = false
if !f.single_line_if && f.line_len > fmt.max_len.last() { if !f.single_line_if && f.line_len > fmt.max_len {
is_cond := node.op in [.and, .logical_or] is_cond := node.op in [.and, .logical_or]
f.wrap_infix(start_pos, start_len, is_cond) f.wrap_infix(start_pos, start_len, is_cond)
} }
@ -2556,7 +2556,7 @@ fn (mut f Fmt) write_splitted_infix(conditions []string, penalties []int, ignore
} }
for i, cnd in conditions { for i, cnd in conditions {
c := cnd.trim_space() c := cnd.trim_space()
if f.line_len + c.len < fmt.max_len[penalties[i]] { if f.line_len + c.len < fmt.break_points[penalties[i]] {
if (i > 0 && i < conditions.len) || (ignore_paren && i == 0 && c.len > 5 && c[3] == `(`) { if (i > 0 && i < conditions.len) || (ignore_paren && i == 0 && c.len > 5 && c[3] == `(`) {
f.write(' ') f.write(' ')
} }
@ -2569,7 +2569,7 @@ fn (mut f Fmt) write_splitted_infix(conditions []string, penalties []int, ignore
f.write(c) f.write(c)
continue continue
} }
if final_len > fmt.max_len.last() && is_paren_expr { if final_len > fmt.max_len && is_paren_expr {
conds, pens := split_up_infix(c, true, is_cond) conds, pens := split_up_infix(c, true, is_cond)
f.write_splitted_infix(conds, pens, true, is_cond) f.write_splitted_infix(conds, pens, true, is_cond)
continue continue
@ -2710,7 +2710,7 @@ fn (mut f Fmt) match_branch(branch ast.MatchBranch, single_line bool) {
f.is_mbranch_expr = true f.is_mbranch_expr = true
for j, expr in branch.exprs { for j, expr in branch.exprs {
estr := f.node_str(expr).trim_space() estr := f.node_str(expr).trim_space()
if f.line_len + estr.len + 2 > fmt.max_len[5] { if f.line_len + estr.len + 2 > fmt.max_len {
f.remove_new_line() f.remove_new_line()
f.writeln('') f.writeln('')
} }
@ -2809,7 +2809,7 @@ pub fn (mut f Fmt) or_expr(node ast.OrExpr) {
// so, since this'll all be on one line, trim any possible whitespace // so, since this'll all be on one line, trim any possible whitespace
str := f.node_str(node.stmts[0]).trim_space() str := f.node_str(node.stmts[0]).trim_space()
single_line := ' or { ${str} }' single_line := ' or { ${str} }'
if single_line.len + f.line_len <= fmt.max_len.last() { if single_line.len + f.line_len <= fmt.max_len {
f.write(single_line) f.write(single_line)
return return
} }

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

@ -329,8 +329,7 @@ pub fn (mut f Fmt) struct_init(node ast.StructInit) {
f.comments(init_field.next_comments, has_nl: true, level: .keep) f.comments(init_field.next_comments, has_nl: true, level: .keep)
if single_line_fields && (init_field.comments.len > 0 if single_line_fields && (init_field.comments.len > 0
|| init_field.next_comments.len > 0 || init_field.next_comments.len > 0
|| !expr_is_single_line(init_field.expr) || !expr_is_single_line(init_field.expr) || f.line_len > max_len) {
|| f.line_len > max_len.last()) {
single_line_fields = false single_line_fields = false
f.out.go_back_to(fields_start) f.out.go_back_to(fields_start)
f.line_len = fields_start f.line_len = fields_start