fix(diffs): keep the caret line highlighted during selection#858
Merged
Conversation
Repro: 1. Place a cursor on a line; the whole line is highlighted. 2. Select across multiple lines. 3. The line the cursor is on is no longer highlighted. #updateSelections only applied the active-line highlight for a collapsed cursor. A ranged selection set a data-active attribute on the gutter line number instead, but that attribute has no CSS rule and is read nowhere, so the line lost its highlight as soon as the selection gained any width. Highlight the line holding the caret (the selection head) for both collapsed and ranged selections, and remove the dead data-active path. getCaretPosition resolves the selection head, so backward selections highlight the start line. This also removes a per-update querySelectorAll, and the gutter number now highlights through data-selected-line. Cover the collapsed and multi-line cases with a regression test.
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: eaba52a2fa
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
The editor renders its active-line highlight by calling the component setSelectedLines, which commits a line-selection range and fires the host onLineSelected callback. A caret or text selection in the editor is not a gutter line selection, so an editable File/FileDiff with a line-selection handler received a bogus notification on every selection update. Pass notify: false from the editor so the highlight renders without committing a line selection, and widen the component setSelectedLines type to accept the option. Add a regression test asserting onLineSelected stays silent for a multi-line editor selection.
Contributor
Author
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
2 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.
Repro:
#updateSelections only applied the active-line highlight for a collapsed cursor. A ranged selection set a data-active attribute on the gutter line number instead, but that attribute has no CSS rule and is read nowhere, so the line lost its highlight as soon as the selection gained any width.
Highlight the line holding the caret (the selection head) for both collapsed and ranged selections, and remove the dead data-active path. getCaretPosition resolves the selection head, so backward selections highlight the start line. This also removes a per-update querySelectorAll, and the gutter number now highlights through data-selected-line.
Cover the collapsed and multi-line cases with a regression test.