go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-06 23:46:13 +02:00
Code Issues Releases Activity

Fix several bugs in wrapMessageToWidth

Browse Source 
This corresponds to the following fixes in gocui's lineWrap function:
- https://github.com/jesseduffield/gocui/pull/67/commits/86cf561ef493
- https://github.com/jesseduffield/gocui/pull/67/commits/24746d5cd6ee
- https://github.com/jesseduffield/gocui/pull/67/commits/4b97941c4ec6
This commit is contained in:
Stefan Haller 2024-11-27 09:29:12 +01:00
parent 2417b70acd
commit 3610f13418
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/controllers/helpers/confirmation_helper.go
View File

@ -87,16 +87,14 @@ func wrapMessageToWidth(wrap bool, message string, width int) []string {
wrappedLines = append(wrappedLines, line[offset:i]) wrappedLines = append(wrappedLines, line[offset:i])
offset = i offset = i
n = rw n = rw
} else if lastWhitespaceIndex != -1 && lastWhitespaceIndex+1 != i { } else if lastWhitespaceIndex != -1 {
if line[lastWhitespaceIndex] == '-' { if line[lastWhitespaceIndex] == '-' {
wrappedLines = append(wrappedLines, line[offset:lastWhitespaceIndex+1]) wrappedLines = append(wrappedLines, line[offset:lastWhitespaceIndex+1])
offset = lastWhitespaceIndex + 1
n = i - lastWhitespaceIndex
} else { } else {
wrappedLines = append(wrappedLines, line[offset:lastWhitespaceIndex]) wrappedLines = append(wrappedLines, line[offset:lastWhitespaceIndex])
offset = lastWhitespaceIndex + 1
n = i - lastWhitespaceIndex + 1
} }
offset = lastWhitespaceIndex + 1
n = runewidth.StringWidth(line[offset : i+1])
} else { } else {
wrappedLines = append(wrappedLines, line[offset:i]) wrappedLines = append(wrappedLines, line[offset:i])
offset = i offset = i