extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-04-18 08:29:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

client/status: fix wrap for multiline strings with leading space

Browse Source
This commit is contained in:
Christian Schwarz 2019-03-13 18:42:41 +01:00
parent d50e553ebb
commit d5250bbf51
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/status.go
View File

@ -121,7 +121,7 @@ func wrap(s string, width int) string {
if idx := strings.IndexAny(s, "\n\r"); idx != -1 && idx < rem { if idx := strings.IndexAny(s, "\n\r"); idx != -1 && idx < rem {
rem = idx+1 rem = idx+1
} }
untilNewline := strings.TrimSpace(s[:rem]) untilNewline := strings.TrimRight(s[:rem], "\n\r")
s = s[rem:] s = s[rem:]
if len(untilNewline) == 0 { if len(untilNewline) == 0 {
continue continue
@ -129,7 +129,7 @@ func wrap(s string, width int) string {
b.WriteString(untilNewline) b.WriteString(untilNewline)
b.WriteString("\n") b.WriteString("\n")
} }
return strings.TrimSpace(b.String()) return strings.TrimRight(b.String(), "\n\r")
} }
func (t *tui) printfDrawIndentedAndWrappedIfMultiline(format string, a ...interface{}) { func (t *tui) printfDrawIndentedAndWrappedIfMultiline(format string, a ...interface{}) {