mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-12-01 22:52:01 +02:00
Bump gocui
This updates gocui to include https://github.com/jesseduffield/gocui/pull/68 and https://github.com/jesseduffield/gocui/pull/69, which changes views to not have an extra blank line at the end when content ending in a newline character is written to them. This makes text views more consistent with list views, which don't have a blank line after the last list entry either.
This commit is contained in:
@@ -110,6 +110,7 @@ func ScanLinesAndTruncateWhenLongerThanBuffer(maxBufferSize int) func(data []byt
|
||||
// If wrap is false, the text is returned as is.
|
||||
// This code needs to behave the same as `gocui.lineWrap` does.
|
||||
func WrapViewLinesToWidth(wrap bool, text string, width int) ([]string, []int, []int) {
|
||||
text = strings.TrimSuffix(text, "\n")
|
||||
lines := strings.Split(text, "\n")
|
||||
if !wrap {
|
||||
indices := make([]int, len(lines))
|
||||
|
||||
@@ -374,10 +374,9 @@ func TestWrapViewLinesToWidth(t *testing.T) {
|
||||
"longer.",
|
||||
"Third",
|
||||
"paragraph",
|
||||
"",
|
||||
},
|
||||
expectedWrappedLinesIndices: []int{0, 2, 6, 8},
|
||||
expectedOriginalLinesIndices: []int{0, 0, 1, 1, 1, 1, 2, 2, 3},
|
||||
expectedWrappedLinesIndices: []int{0, 2, 6},
|
||||
expectedOriginalLinesIndices: []int{0, 0, 1, 1, 1, 1, 2, 2},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
|
||||
Reference in New Issue
Block a user