Fuzzy location mapping #161
Merged
Conversation
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
When re-parsing the HTML, we previously created a location range using points because the unknown input may have removed Trix's block comment nodes. This worked well most of the time, but occasionally it failed in conditions that are difficult to reproduce.
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.
When re-parsing the editor's HTML, we create a location range using points because the unknown input may have removed Trix's block comment nodes. Calculating a location range from HTML with missing comment nodes would often result in the wrong cursor position after rendering. Usually off by 1, at the end of the preceding block. See #116 and #131.
Using points works well most of the time, but occasionally fails in conditions that are difficult to reproduce. This change removes the use of points, and goes back to using
LocationMapper, but with a newstrict: falsemode that uses the containing elements to make an assumption about where a block starts.getLocationRange(strict: false)is only used byComposition#replaceHTMLso all othergetLocationRangecalls continue to work as normal (looking for<!--block-->nodes to mark a block's start).