terminal: Preserve terminal order and fix pinned count on workspace restore#44464
Merged
SomeoneToIgnore merged 4 commits intozed-industries:mainfrom Feb 12, 2026
Merged
Conversation
Replace FuturesUnordered with join_all to maintain terminal tab ordering when restoring a workspace. Also clamp pinned_count to items_len() to prevent panics when fewer terminals are restored than expected. The changes: 1. Order preservation: FuturesUnordered → join_all ensures terminals restore in their original order 2. Bounds fix: .min(pane.items_len()) prevents setting pinned count higher than actual items
Member
|
Nit: could we use FuturesOrdered instead? https://docs.rs/futures/latest/futures/future/fn.join_all.html#see-also |
Replace join_all with FuturesOrdered which only polls futures that have been woken, resulting in more efficient polling when deserializing multiple terminal views.
Contributor
Author
Thank you for your suggestion. Change this to the |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Replace
FuturesUnorderedwithFuturesOrderedto maintain terminal tab ordering when restoring a workspace.Also clamp
pinned_counttoitems_len()to prevent panics when fewer terminals are restored than expected.The changes:
FuturesUnordered→FuturesOrderedensures terminals restore in their original order.min(pane.items_len())prevents setting pinned count higher than actual itemsCloses #44463
Release Notes: