fix(web): add unit tests for DeadkeyTracker and fix a few bugs#15113
Merged
ermshiperete merged 5 commits intomasterfrom Nov 10, 2025
Merged
fix(web): add unit tests for DeadkeyTracker and fix a few bugs#15113ermshiperete merged 5 commits intomasterfrom
ermshiperete merged 5 commits intomasterfrom
Conversation
- initialize `Deadkey.matched` in c'tor - fix `Deadkey.equal` method - verify deadkey exists before removing it in `DeadkeyTracker.remove` - add unit tests for DeadkeyTracker Test-bot: skip
User Test ResultsTest specification and instructions User tests are not required Test Artifacts
|
mcdurdin
requested changes
Nov 7, 2025
Comment on lines
+232
to
+233
| // REVIEW: this behavior seems odd | ||
| assert.isFalse(tracker.isMatch(0, 3, 1)); |
Contributor
Author
There was a problem hiding this comment.
The first parameter of isMatch is the current cursor position, the second parameter the expected offset of the deadkey from the cursor. So if I have a deadkey at position 3 and the current caret at position 0, I'd expect isMatch(0, 3,...) to return true.
Contributor
Author
There was a problem hiding this comment.
...unless the second parameter is the offset we have to add to the deadkey position to get to the cursor position!?
| const otherDks = other.dks; | ||
| const matchedDks: Deadkey[] = []; | ||
|
|
||
| for(const dk of this.dks) { |
Member
There was a problem hiding this comment.
With this, will it fail if we have something two trackers looking like this?
this == [ (0,0,0), (0,0,0), (1,2,3) ]
other == [ (0,0,0), (1,2,3), (4,5,6) ]
Contributor
Author
There was a problem hiding this comment.
yep. Added additional tests.
Comment on lines
+246
to
+247
| // REVIEW: this behavior seems odd | ||
| assert.isTrue(tracker.isMatch(0, -3, 1)); |
jahorton
approved these changes
Nov 7, 2025
mcdurdin
approved these changes
Nov 10, 2025
Co-authored-by: Marc Durdin <marc@durdin.net>
Collaborator
|
Changes in this pull request will be available for download in Keyman version 19.0.158-alpha |
ermshiperete
added a commit
that referenced
this pull request
Nov 13, 2025
fix(web): add unit tests for DeadkeyTracker and fix a few bugs - initialize `Deadkey.matched` in c'tor - fix `Deadkey.equal` method - verify deadkey exists before removing it in `DeadkeyTracker.remove` - add unit tests for DeadkeyTracker Cherry-pick-of: #15113
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.
While working on the connection between web's TextStore (OutputTarget) and core's context I tried to understand what the
DeadkeyandDeadkeyTrackerclasses are doing. This lead me to add some unit tests and that showed that there were a few bugs in those classes. This PR fixes these:Deadkey.matchedin c'torDeadkey.equalmethodDeadkeyTracker.removeTest-bot: skip