Fix find highlight and Find Next not advancing (plain text box mode)#11579
Merged
niksedk merged 1 commit intoJun 13, 2026
Merged
Conversation
In Avalonia's TextBox (used when color tags are disabled), setting CaretIndex after SelectionStart/SelectionEnd collapses the selection to a zero-length caret, clearing the find highlight. Remove the redundant CaretIndex assignment from TextBoxWrapper.Select(); SelectionEnd already positions the caret. With a real selection now in place, FindNext shortcut was re-finding the same hit because it read CaretIndex (= SelectionStart) as the search start. Switch it to SelectionEnd, matching the Find dialog path.
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.
Problem
When color tags are disabled (the default plain
TextBoxmode), two related bugs affected the Find feature:Both issues were confined to the plain
TextBoxpath. The AvaloniaEdit path (color tags enabled) was unaffected.Root cause
Highlight bug (
TextBoxWrapper.Select): After settingSelectionStart/SelectionEnd, the method also setCaretIndex = start + length. In Avalonia'sTextBox, settingCaretIndexto a new value firesPropertyChangedforCaretIndexProperty, which internally collapses the selection to a zero-length caret — erasing the highlight that was just applied.Advancement bug (
FindNextshortcut): The shortcut readEditTextBox.CaretIndexas the search-start position. With the selection now non-collapsed,CaretIndexreflectedSelectionStart(the beginning of the found text), so the next search re-found the same occurrence. The Find dialog already usedEditTextBox.SelectionEndcorrectly; the shortcut was inconsistent.Changes
TextBoxWrapper.Select()— remove the redundantCaretIndexassignment;SelectionEndpositions the caret automatically.MainViewModel.FindNext()— useEditTextBox.SelectionEndas the search start, matching the Find dialog path.