fmt: split infix wrapping into smaller functions and fix a trailing space bug (#9806)
* change recursive fn calls to reduce write operations * format files and test * Update vtest-cleancode.v * fix testpull/9810/head
parent
c174bfa52f
commit
4a1f75c964
|
@ -5,9 +5,7 @@ import testing
|
|||
import v.util
|
||||
|
||||
const (
|
||||
vet_known_failing_exceptions = [
|
||||
'vlib/v/gen/js/js.v' /* trailing space */,
|
||||
]
|
||||
vet_known_failing_exceptions = []string{}
|
||||
vet_folders = [
|
||||
'vlib/sqlite',
|
||||
'vlib/v',
|
||||
|
|
|
@ -1888,81 +1888,89 @@ pub fn (mut f Fmt) infix_expr(node ast.InfixExpr) {
|
|||
if !buffering_save && f.buffering {
|
||||
f.buffering = false
|
||||
if !f.single_line_if && f.line_len > fmt.max_len.last() {
|
||||
f.wrap_infix(start_pos, start_len, false)
|
||||
f.wrap_infix(start_pos, start_len)
|
||||
}
|
||||
}
|
||||
f.is_assign = is_assign_save
|
||||
f.or_expr(node.or_block)
|
||||
}
|
||||
|
||||
pub fn (mut f Fmt) wrap_infix(start_pos int, start_len int, ignore_paren bool) {
|
||||
pub fn (mut f Fmt) wrap_infix(start_pos int, start_len int) {
|
||||
cut_span := f.out.len - start_pos
|
||||
condstr := f.out.cut_last(cut_span)
|
||||
is_cond_infix := condstr.contains_any_substr(['&&', '||'])
|
||||
if !is_cond_infix && !condstr.contains('+') {
|
||||
f.write(condstr)
|
||||
infix_str := f.out.cut_last(cut_span)
|
||||
if !infix_str.contains_any_substr(['&&', '||', '+']) {
|
||||
f.write(infix_str)
|
||||
return
|
||||
}
|
||||
f.line_len = start_len
|
||||
if start_len == 0 {
|
||||
f.empty_line = true
|
||||
}
|
||||
or_pen := if condstr.contains('&&') { 3 } else { 5 }
|
||||
cond_parts := condstr.split(' ')
|
||||
mut grouped_cond := false
|
||||
conditions, penalties := split_up_infix(infix_str, false)
|
||||
f.write_splitted_infix(conditions, penalties, false)
|
||||
}
|
||||
|
||||
fn split_up_infix(infix_str string, ignore_paren bool) ([]string, []int) {
|
||||
mut conditions := ['']
|
||||
mut penalties := [5]
|
||||
mut index := 0
|
||||
for cp in cond_parts {
|
||||
if is_cond_infix && cp in ['&&', '||'] {
|
||||
if grouped_cond {
|
||||
conditions[index] += '$cp '
|
||||
is_cond_infix := infix_str.contains_any_substr(['&&', '||'])
|
||||
or_pen := if infix_str.contains('&&') { 3 } else { 5 }
|
||||
parts := infix_str.split(' ')
|
||||
mut inside_paren := false
|
||||
mut ind := 0
|
||||
for p in parts {
|
||||
if is_cond_infix && p in ['&&', '||'] {
|
||||
if inside_paren {
|
||||
conditions[ind] += '$p '
|
||||
} else {
|
||||
p := if cp == '||' { or_pen } else { 5 }
|
||||
penalties << p
|
||||
conditions << '$cp '
|
||||
index++
|
||||
pen := if p == '||' { or_pen } else { 5 }
|
||||
penalties << pen
|
||||
conditions << '$p '
|
||||
ind++
|
||||
}
|
||||
} else if !is_cond_infix && cp == '+' {
|
||||
} else if !is_cond_infix && p == '+' {
|
||||
penalties << 5
|
||||
conditions[index] += '$cp '
|
||||
conditions[ind] += '$p '
|
||||
conditions << ''
|
||||
index++
|
||||
ind++
|
||||
} else {
|
||||
conditions[index] += '$cp '
|
||||
conditions[ind] += '$p '
|
||||
if ignore_paren {
|
||||
continue
|
||||
}
|
||||
if cp.starts_with('(') {
|
||||
grouped_cond = true
|
||||
} else if cp.ends_with(')') {
|
||||
grouped_cond = false
|
||||
if p.starts_with('(') {
|
||||
inside_paren = true
|
||||
} else if p.ends_with(')') {
|
||||
inside_paren = false
|
||||
}
|
||||
}
|
||||
}
|
||||
for i, c in conditions {
|
||||
cnd := c.trim_space()
|
||||
if f.line_len + cnd.len < fmt.max_len[penalties[i]] {
|
||||
if (i > 0 && i < conditions.len)
|
||||
|| (ignore_paren && i == 0 && cnd.len > 5 && cnd[3] == `(`) {
|
||||
return conditions, penalties
|
||||
}
|
||||
|
||||
fn (mut f Fmt) write_splitted_infix(conditions []string, penalties []int, ignore_paren bool) {
|
||||
for i, cnd in conditions {
|
||||
c := cnd.trim_space()
|
||||
if f.line_len + c.len < fmt.max_len[penalties[i]] {
|
||||
if (i > 0 && i < conditions.len) || (ignore_paren && i == 0 && c.len > 5 && c[3] == `(`) {
|
||||
f.write(' ')
|
||||
}
|
||||
f.write(cnd)
|
||||
f.write(c)
|
||||
} else {
|
||||
is_paren_expr := (cnd[0] == `(` || (cnd.len > 5 && cnd[3] == `(`)) && cnd.ends_with(')')
|
||||
final_len := ((f.indent + 1) * 4) + cnd.len
|
||||
prev_len := f.line_len
|
||||
prev_pos := f.out.len
|
||||
if i == 0 && !is_paren_expr {
|
||||
is_paren_expr := (c[0] == `(` || (c.len > 5 && c[3] == `(`)) && c.ends_with(')')
|
||||
final_len := ((f.indent + 1) * 4) + c.len
|
||||
if final_len > fmt.max_len.last() && is_paren_expr {
|
||||
conds, pens := split_up_infix(c, true)
|
||||
f.write_splitted_infix(conds, pens, true)
|
||||
continue
|
||||
}
|
||||
if i == 0 {
|
||||
f.remove_new_line({})
|
||||
}
|
||||
f.writeln('')
|
||||
f.indent++
|
||||
f.write(cnd)
|
||||
f.write(c)
|
||||
f.indent--
|
||||
if final_len > fmt.max_len.last() && is_paren_expr {
|
||||
f.wrap_infix(prev_pos, prev_len, true)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,4 +19,15 @@ fn main() {
|
|||
clean_struct_v_type_name =
|
||||
clean_struct_v_type_name.replace('_Array', '_array').replace('_T_', '<').replace('_', ', ') +
|
||||
'>'
|
||||
{
|
||||
{
|
||||
{
|
||||
// Indent this much to force a break after the assign (`:=`).
|
||||
// Check that the trailing space is removed
|
||||
should_cast :=
|
||||
(g.table.type_kind(stmt.left_types.first()) in js.shallow_equatables)
|
||||
&& (g.cast_stack.len <= 0 || stmt.left_types.first() != g.cast_stack.last())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,4 +12,13 @@ fn unwrap_grouped_conds() {
|
|||
|
||||
fn main() {
|
||||
clean_struct_v_type_name = clean_struct_v_type_name.replace('_Array', '_array').replace('_T_', '<').replace('_', ', ') + '>'
|
||||
{
|
||||
{
|
||||
{
|
||||
// Indent this much to force a break after the assign (`:=`).
|
||||
// Check that the trailing space is removed
|
||||
should_cast := (g.table.type_kind(stmt.left_types.first()) in js.shallow_equatables) && (g.cast_stack.len <= 0 || stmt.left_types.first() != g.cast_stack.last())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -695,7 +695,7 @@ fn (mut g JsGen) gen_assign_stmt(stmt ast.AssignStmt) {
|
|||
} else {
|
||||
g.write(' $op ')
|
||||
// TODO: Multiple types??
|
||||
should_cast :=
|
||||
should_cast :=
|
||||
(g.table.type_kind(stmt.left_types.first()) in js.shallow_equatables)
|
||||
&& (g.cast_stack.len <= 0 || stmt.left_types.first() != g.cast_stack.last())
|
||||
|
||||
|
|
Loading…
Reference in New Issue