Skip to content

Commit

Permalink
fmt: cleanup alignment using string.repeat() instead of strings.repeat()
Browse files Browse the repository at this point in the history
  • Loading branch information
@yuyi98
yuyi98 committed Aug 21, 2024
1 parent a98a029 commit e4542c6
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 28 deletions.
4 changes: 1 addition & 3 deletions vlib/builtin/string.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2326,9 +2326,7 @@ pub fn (s string) bytes() []u8 {
// repeat returns a new string with `count` number of copies of the string it was called on.
@[direct_array_access]
pub fn (s string) repeat(count int) string {
if count < 0 {
panic('string.repeat: count is negative: ${count}')
} else if count == 0 {
if count <= 0 {
return ''
} else if count == 1 {
return s.clone()
Expand Down
26 changes: 11 additions & 15 deletions vlib/v/fmt/fmt.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1074,30 +1074,28 @@ pub fn (mut f Fmt) enum_decl(node ast.EnumDecl) {
}
f.write('\t${field.name}')
if field.has_expr {
f.write(strings.repeat(` `, value_align.max_len(field.pos.line_nr) - field.name.len))
f.write(' '.repeat(value_align.max_len(field.pos.line_nr) - field.name.len))
f.write(' = ')
f.expr(field.expr)
}
attrs_len := inline_attrs_len(field.attrs)
if field.attrs.len > 0 {
if field.has_expr {
f.write(strings.repeat(` `, attr_align.max_len(field.pos.line_nr) - field.expr.str().len - 2))
f.write(' '.repeat(attr_align.max_len(field.pos.line_nr) - field.expr.str().len - 1))
} else {
f.write(strings.repeat(` `, attr_align.max_len(field.pos.line_nr) - field.name.len))
f.write(' '.repeat(attr_align.max_len(field.pos.line_nr) - field.name.len + 1))
}
f.write(' ')
f.single_line_attrs(field.attrs, same_line: true)
}
// f.comments(field.comments, same_line: true, has_nl: false, level: .indent)
if field.comments.len > 0 {
if field.attrs.len > 0 {
f.write(strings.repeat(` `, comment_align.max_len(field.pos.line_nr) - attrs_len))
f.write(' '.repeat(comment_align.max_len(field.pos.line_nr) - attrs_len + 1))
} else if field.has_expr {
f.write(strings.repeat(` `, comment_align.max_len(field.pos.line_nr) - field.expr.str().len - 2))
f.write(' '.repeat(comment_align.max_len(field.pos.line_nr) - field.expr.str().len - 1))
} else {
f.write(strings.repeat(` `, comment_align.max_len(field.pos.line_nr) - field.name.len))
f.write(' '.repeat(comment_align.max_len(field.pos.line_nr) - field.name.len + 1))
}
f.write(' ')
f.comments(field.comments, same_line: true, has_nl: false)
}
f.writeln('')
Expand Down Expand Up @@ -1323,7 +1321,7 @@ pub fn (mut f Fmt) global_decl(node ast.GlobalDecl) {
f.write('volatile ')
}
f.write('${field.name} ')
f.write(strings.repeat(` `, max - field.name.len))
f.write(' '.repeat(max - field.name.len))
if field.has_expr {
f.write('= ')
f.expr(field.expr)
Expand Down Expand Up @@ -1532,12 +1530,11 @@ pub fn (mut f Fmt) interface_field(field ast.StructField, mut type_align FieldAl
f.write('\t${field.name} ')
}
if !(sym.info is ast.Struct && sym.info.is_anon) {
f.write(strings.repeat(` `, type_align.max_len(field.pos.line_nr) - field.name.len))
f.write(' '.repeat(type_align.max_len(field.pos.line_nr) - field.name.len))
f.write(ft)
}
if end_cmts.len > 0 {
f.write(strings.repeat(` `, comment_align.max_len(field.pos.line_nr) - ft.len))
f.write(' ')
f.write(' '.repeat(comment_align.max_len(field.pos.line_nr) - ft.len + 1))
f.comments(end_cmts, level: .indent)
} else {
f.writeln('')
Expand All @@ -1558,8 +1555,7 @@ pub fn (mut f Fmt) interface_method(method ast.FnDecl, mut comment_align FieldAl
method_str := f.table.stringify_fn_decl(&method, f.cur_mod, f.mod2alias, false).all_after_first('fn ')
f.write(method_str)
if end_comments.len > 0 {
f.write(strings.repeat(` `, comment_align.max_len(method.pos.line_nr) - method_str.len))
f.write(' ')
f.write(' '.repeat(comment_align.max_len(method.pos.line_nr) - method_str.len + 1))
f.comments(end_comments, level: .indent)
} else {
f.writeln('')
Expand Down Expand Up @@ -2807,7 +2803,7 @@ pub fn (mut f Fmt) map_init(node ast.MapInit) {
f.write(skey)
f.write(': ')
skey_len := utf8_str_visible_length(skey)
f.write(strings.repeat(` `, max_field_len - skey_len))
f.write(' '.repeat(max_field_len - skey_len))
f.expr(node.vals[i])
f.comments(node.comments[i], prev_line: node.vals[i].pos().last_line, has_nl: false)
f.writeln('')
Expand Down
20 changes: 10 additions & 10 deletions vlib/v/fmt/struct.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// that can be found in the LICENSE file.
module fmt

import strings
import v.ast

pub fn (mut f Fmt) struct_decl(node ast.StructDecl, is_anon bool) {
Expand Down Expand Up @@ -84,15 +83,15 @@ pub fn (mut f Fmt) struct_decl(node ast.StructDecl, is_anon bool) {
}
volatile_prefix := if field.is_volatile { 'volatile ' } else { '' }
f.write('\t${volatile_prefix}${field.name} ')
f.write(strings.repeat(` `, type_align.max_len(field.pos.line_nr) - field.name.len))
f.write(' '.repeat(type_align.max_len(field.pos.line_nr) - field.name.len))
// Handle anon structs recursively
if !f.write_anon_struct_field_decl(field.typ, field.anon_struct_decl) {
f.write(field_types[i])
}
f.mark_types_import_as_used(field.typ)
attrs_len := inline_attrs_len(field.attrs)
if field.has_default_expr {
f.write(strings.repeat(` `, default_expr_align.max_len(field.pos.line_nr) - field_types[i].len))
f.write(' '.repeat(default_expr_align.max_len(field.pos.line_nr) - field_types[i].len))
f.write(' = ')
if !expr_is_single_line(field.default_expr) {
f.indent++
Expand All @@ -105,17 +104,17 @@ pub fn (mut f Fmt) struct_decl(node ast.StructDecl, is_anon bool) {
}
}
if field.attrs.len > 0 {
f.write(strings.repeat(` `, attr_align.max_len(field.pos.line_nr) - field_types[i].len))
f.write(' '.repeat(attr_align.max_len(field.pos.line_nr) - field_types[i].len))
f.single_line_attrs(field.attrs, same_line: true)
}
// Handle comments at the end of the line
if field.comments.len > 0 {
if field.has_default_expr {
f.write(strings.repeat(` `, comment_align.max_len(field.pos.line_nr) - field.default_expr.str().len - 2))
f.write(' '.repeat(comment_align.max_len(field.pos.line_nr) - field.default_expr.str().len - 2))
} else if field.attrs.len > 0 {
f.write(strings.repeat(` `, comment_align.max_len(field.pos.line_nr) - attrs_len))
f.write(' '.repeat(comment_align.max_len(field.pos.line_nr) - attrs_len))
} else {
f.write(strings.repeat(` `, comment_align.max_len(field.pos.line_nr) - field_types[i].len))
f.write(' '.repeat(comment_align.max_len(field.pos.line_nr) - field_types[i].len))
}
f.write(' ')
f.comments(field.comments, level: .indent)
Expand Down Expand Up @@ -286,12 +285,13 @@ pub fn (mut f Fmt) struct_init(node ast.StructInit) {
}
f.write('${init_field.name}: ')
if !single_line_fields {
f.write(strings.repeat(` `, value_align.max_len(init_field.pos.line_nr) - init_field.name.len))
f.write(' '.repeat(value_align.max_len(init_field.pos.line_nr) - init_field.name.len))
}
f.expr(init_field.expr)
if init_field.end_comments.len > 0 {
f.write(strings.repeat(` `, comment_align.max_len(init_field.pos.line_nr) - init_field.expr.str().len))
f.write(' ')
f.write(' '.repeat(
comment_align.max_len(init_field.pos.line_nr) - init_field.expr.str().len +
1))
f.comments(init_field.end_comments, has_nl: false, level: .indent)
}
if single_line_fields {
Expand Down

0 comments on commit e4542c6

Please sign in to comment.