sloum/bombadillo
sloum
/
bombadillo
5
27
Fork 7
Code Issues 18 Pull Requests 1 Releases 9 Activity

Release to master 2.4.0 #217

Merged
sloum merged 14 commits from develop into master 2022-03-06 21:50:43 +00:00
Conversation 0 Commits 14 Files Changed 8 +28 -9
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1bef2e51a1 - Show all commits

4
page.go
View File

@ -142,6 +142,10 @@ func (p *Page) WrapContent(width, maxWidth int, color bool) {
if counter+(j-i) <= width+1 && !(j == i && counter == width+1) {
content.WriteRune(ch)
counter++
} else if ch == ' ' || ch == '\t' {
// we want to wrap and write this char, but it's a space. eat it to prevent the next line from
// having a leading whitespace because of our wrapping
counter++
} else {
content.WriteRune('\n')
counter = 0

33
page_test.go
View File

@ -52,10 +52,10 @@ func Test_WrapContent_Wrapped_Line_Length(t *testing.T) {
"01 345 789 123456789 123456789 123456789 123456789\n",
[]string{
"01 345 789",
" 123456789",
" 123456789",
" 123456789",
" 123456789",
"123456789 ",
"123456789 ",
"123456789 ",
"123456789",
"",
},
args{
@ -65,14 +65,29 @@ func Test_WrapContent_Wrapped_Line_Length(t *testing.T) {
},
},
{
"Long line wrapped to 10 columns",
"Long line wrapped to 10 columns, leading spaces omitted when wrapping",
"0123456789 123456789 123456789 123456789 123456789\n",
[]string{
"0123456789",
" 123456789",
" 123456789",
" 123456789",
" 123456789",
"123456789 ",
"123456789 ",
"123456789 ",
"123456789",
"",
},
args{
10,
10,
false,
},
},
{
"Intentional leading spaces aren't trimmed",
"01 345\n 789 123456789\n",
[]string{
"01 345",
" 789 ",
"123456789",
"",
},
args{