Limit the amount of vertical splits you can do #4726
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
… in commands/typed.rs, which now gets called in all the vsplit functions
… the focused view
janhrastnik
changed the title
kirawi
added
C-bug
helix-view/src/tree.rs
Outdated
| content: Content::Container(container), | ||
| .. | ||
| } => container.children.clone(), | ||
| _ => unimplemented!(), |
There was a problem hiding this comment.
Suggested change
| _ => unimplemented!(), | |
| _ => unreachable!(), |
This should be unreachable since we're looking at a parent node in the tree
helix-view/src/tree.rs
Outdated
Comment on lines
221
to
228
| let container_children: Vec<ViewId> = match &self.nodes[parent] { | ||
| Node { | ||
| content: Content::Container(container), | ||
| .. | ||
| } => container.children.clone(), | ||
| _ => unimplemented!(), | ||
| }; | ||
| container_children.contains(child_id) |
There was a problem hiding this comment.
We can avoid the cloning by doing the contains check inside of the match
match &self.nodes[parent] {
Node {
content: Content::Container(container),
..
} => container.children.contains(child_id),
_ => unreachable!(),
}
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.
This would fix #1083.
Right now there's this error happening: #2773 (comment), when you do an appropriate amount of vertical splits.
This is the line that causes the crash:
helix/helix-view/src/tree.rs
Line 408 in fd585c1
I think recalculate() here doesn't take into consideration that inner gaps decrease area width, so I changed that.
I also added a function in typed.rs that checks if a child view of the focused view has a width of 1. If it does, then we can't make any more vertical splits.