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

cli: add pretty print for multiline descriptions

pull/5561/head
Tim Basel 2020-06-29 14:47:20 +02:00 committed by GitHub
parent 025652bb78
commit 4a1ce3e1f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vlib/cli/help.v
View File

@ -82,28 +82,31 @@ fn help_func(help_cmd Command) {
fn pretty_description(s string) string { fn pretty_description(s string) string {
width, _ := term.get_terminal_size() width, _ := term.get_terminal_size()
// Don't prettify if the terminal is that small, it won't be pretty anyway. // Don't prettify if the terminal is that small, it won't be pretty anyway.
if s.len + c_description_indent < width || c_description_indent > width { if c_description_indent > width {
return s return s
} }
indent := ' '.repeat(c_description_indent + 1) indent := ' '.repeat(c_description_indent + 2)
chars_per_line := width - c_description_indent chars_per_line := width - c_description_indent
// Give us enough room, better a little bigger than smaller // Give us enough room, better a little bigger than smaller
mut acc := strings.new_builder(((s.len / chars_per_line) + 1) * (width + 1)) mut acc := strings.new_builder(((s.len / chars_per_line) + 1) * (width + 1))
for k, line in s.split('\n') {
if k != 0 { acc.write('\n${indent}') }
mut i := chars_per_line - 2 mut i := chars_per_line - 2
mut j := 0 mut j := 0
for ; i < s.len ; i += chars_per_line - 2 { for ; i < line.len; i += chars_per_line - 2 {
for s.str[i] != ` ` { i-- } for line.str[i] != ` ` { i-- }
// indent was already done the first iteration // indent was already done the first iteration
if j != 0 { acc.write(indent) } if j != 0 { acc.write(indent) }
acc.writeln(s[j..i]) acc.writeln(line[j..i].trim_space())
j = i j = i
} }
// We need this even though it should never happen // We need this even though it should never happen
if j != 0 { if j != 0 {
acc.write(indent) acc.write(indent)
} }
acc.write(s[j..]) acc.write(line[j..].trim_space())
}
return acc.str() return acc.str()
} }