vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

fmt: wrap long lines

pull/3805/head
Alexander Medvednikov 2020-02-21 15:32:48 +01:00
parent b309e7d0e5
commit 728aeb8092
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vlib/v/fmt/fmt.v
View File

@ -12,6 +12,7 @@ import (
const ( const (
tabs = ['', '\t', '\t\t', '\t\t\t', '\t\t\t\t', '\t\t\t\t\t', '\t\t\t\t\t\t'] tabs = ['', '\t', '\t\t', '\t\t\t', '\t\t\t\t', '\t\t\t\t\t', '\t\t\t\t\t\t']
// tabs = ['', ' ', ' ', ' ', ' '] // tabs = ['', ' ', ' ', ' ', ' ']
max_len = 80
) )
struct Fmt { struct Fmt {
@ -20,6 +21,7 @@ struct Fmt {
mut: mut:
indent int indent int
empty_line bool empty_line bool
line_len int
} }
pub fn fmt(file ast.File, table &table.Table) string { pub fn fmt(file ast.File, table &table.Table) string {
@ -39,8 +41,10 @@ pub fn fmt(file ast.File, table &table.Table) string {
pub fn (f mut Fmt) write(s string) { pub fn (f mut Fmt) write(s string) {
if f.indent > 0 && f.empty_line { if f.indent > 0 && f.empty_line {
f.out.write(tabs[f.indent]) f.out.write(tabs[f.indent])
f.line_len += f.indent
} }
f.out.write(s) f.out.write(s)
f.line_len += s.len
f.empty_line = false f.empty_line = false
} }
@ -51,6 +55,7 @@ pub fn (f mut Fmt) writeln(s string) {
} }
f.out.writeln(s) f.out.writeln(s)
f.empty_line = true f.empty_line = true
f.line_len = 0
} }
fn (f mut Fmt) mod(mod ast.Module) { fn (f mut Fmt) mod(mod ast.Module) {
@ -250,6 +255,10 @@ fn (f mut Fmt) expr(node ast.Expr) {
ast.InfixExpr { ast.InfixExpr {
f.expr(it.left) f.expr(it.left)
f.write(' $it.op.str() ') f.write(' $it.op.str() ')
if f.line_len > max_len {
f.write('\n' + tabs[f.indent + 1])
f.line_len = 0
}
f.expr(it.right) f.expr(it.right)
} }
ast.IndexExpr { ast.IndexExpr {