Fix the location that selecting a mark uses #17138
Merged
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
I think this subtly regressed in `Terminal::SelectNewRegion` is the only thing that uses the return value from `Terminal::_ScrollToPoints`. Before that PR, `_ScrollToPoints` was just a part of `SelectNewRegion`, and it moved the start & end coords by the `_VisibleStartIndex`, not the `_scrollOffset`. Kinda weird there weren't any _other_ tests for `SelectNewRegion`? I also caught a second bug while I was here - If you had a line with an exact wrap, and tried to select that like with selectOutput, we'd explode. Closes #17131
lhecker
reviewed
Apr 26, 2024
tusharsnx
reviewed
Apr 26, 2024
| @@ -199,7 +199,7 @@ til::CoordType Terminal::_ScrollToPoints(const til::point coordStart, const til: | |||
| _NotifyScrollEvent(); | |||
| } | |||
|
|
|||
| return _scrollOffset; | |||
| return _VisibleStartIndex(); | |||
There was a problem hiding this comment.
Should we also update the comment? It currently reads:
// Return Value:
// - The updated scroll offsetBTW, as someone new to this repo I have a doubt: what's the mutable viewport? And how does it differ from the viewport that _scrollOffset represents?
Not the best place to ask questions, so I'm sorry 😅
There was a problem hiding this comment.
No worries! I probably didn't do the best job with that particular abstraction, and it bites even me to this day.
(I should commit that somehere)
DHowett
approved these changes
Apr 30, 2024
lhecker
approved these changes
May 1, 2024
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.
I think this subtly regressed in #16611. Jump to 90b8bb7#diff-f9112caf8cb75e7a48a7b84987724d754181227385fbfcc2cc09a879b1f97c12L171-L223
Terminal::SelectNewRegionis the only thing that uses the return value fromTerminal::_ScrollToPoints. Before that PR,_ScrollToPointswas just a part ofSelectNewRegion, and it moved the start & end coords by the_VisibleStartIndex, not the_scrollOffset.Kinda weird there weren't any other tests for
SelectNewRegion?I also caught a second bug while I was here - If you had a line with an exact wrap, and tried to select that like with selectOutput, we'd explode.
Closes #17131