Fix Cursor::previous_logical_word
#215
Open
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
Currently, in `foo b|ar` where `|` indicates the cursor position,
`Cursor::previous_logical_word` will return `foo| bar`. This doesn't
match the behavior of `Cursor::{next_logical_word,
previous_visual_word}` which place the cursor at the boundary of the
current word. This happens because `Cluster::previous_logical_word` is
called from the upstream cluster (the "b") and the cursor then lands
between the "o" and the space.
This also renames "left", "right" -> "upstream", "downstream" (naming
copied from `Cursor::logical_clusters`) to make it clear we're operating
in logical order and not visual, and sets `moving_right` based on the
text direction we're jumping to, to affine the cursor towards the word
whose boundary it lands on.
(Note the behavior between `{previous, next}_logical_word` and
{previous, next}_visual_word` aren't quite the same yet: the `visual`
methods jump over whitespace, the `logical` ones don't.)
tomcur
commented
Dec 9, 2024
Comment on lines
-262
to
+264
| let [left, right] = self.logical_clusters(layout); | ||
| if let Some(cluster) = left.or(right) { | ||
| let [upstream, downstream] = self.logical_clusters(layout); | ||
| if let Some(cluster) = downstream.or(upstream) { |
There was a problem hiding this comment.
This is interesting as we're checking the same clusters (in logical order) as for the method in the other direction. I believe the asymmetry comes from the word boundary clusters being the logically first cluster of a word and (e.g.) the whitespace logically following the word, e.g., in "foo bar" the boundary clusters of the first word are "f" and " ".
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.
Currently, in
foo b|arwhere|indicates the cursor position,Cursor::previous_logical_wordwill returnfoo| bar. This doesn't match the behavior ofCursor::{next_logical_word, previous_visual_word}which place the cursor at the boundary of the current word. This happens becauseCluster::previous_logical_wordis called from the upstream cluster (the "b") and the cursor then lands between the "o" and the space.This also renames "left", "right" -> "upstream", "downstream" (naming copied from
Cursor::logical_clusters) to make it clear we're operating in logical order and not visual, and setsmoving_rightbased on the text direction we're jumping to, to set the affinity of the cursor towards the word whose boundary it lands on.(Note the behavior between
{previous, next}_logical_wordand{previous, next}_visual_wordaren't quite the same yet: thevisualmethods jump over whitespace, thelogicalones don't.)