bufwindow: Fix slice creation with wordwrap active in case of zero size split #3056
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dmaluka
reviewed
Dec 2, 2023
| @@ -601,7 +601,7 @@ func (w *BufWindow) displayBuffer() { | |||
| } | |||
|
|
|||
| var word []glyph | |||
| if wordwrap { | |||
| if wordwrap && w.bufWidth > 0 { | |||
There was a problem hiding this comment.
I'm guilty of this bug, I admit it.
But it seems the more correct fix is:
--- a/internal/display/bufwindow.go
+++ b/internal/display/bufwindow.go
@@ -152,6 +152,9 @@ func (w *BufWindow) updateDisplayInfo() {
if w.Buf.Settings["scrollbar"].(bool) && w.Buf.LinesNum() > w.Height {
w.bufWidth--
}
+ if w.bufWidth < 0 {
+ w.bufWidth = 0
+ }
if w.bufWidth != prevBufWidth && w.Buf.Settings["softwrap"].(bool) {
for _, c := range w.Buf.GetCursors() {
There was a problem hiding this comment.
I mean, the crash actually happens not when bufWidth becomes zero but when it becomes negative. (Slice cap can be zero, but it cannot be negative.)
And BTW, the root cause of it is that gutterOffset is bigger than the window width, which also causes the ruler overwriting the other split pane (as you probably noticed). I'm now working on the fix for that, which probably will also fix this crash.
There was a problem hiding this comment.
[...] as you probably noticed [...]
Yes I did. Any way, we go with yours.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The caption of the slice needs to have a minimum of 1 and thus 0 isn't possible.
Fixes #3052