fix(core): fix decoration offset edge cases #728
Merged
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
✅ Deploy Preview for shiki-matsu ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
✅ Deploy Preview for shiki-next ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
timothycohen
changed the title
antfu
approved these changes
Jul 26, 2024
diegohaz
referenced
this pull request
in ariakit/ariakit
Aug 7, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [shiki](https://togithub.com/shikijs/shiki) ([source](https://togithub.com/shikijs/shiki/tree/HEAD/packages/shiki)) | [`1.10.3` -> `1.12.1`](https://renovatebot.com/diffs/npm/shiki/1.10.3/1.12.1) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>shikijs/shiki (shiki)</summary> ### [`v1.12.1`](https://togithub.com/shikijs/shiki/releases/tag/v1.12.1) [Compare Source](https://togithub.com/shikijs/shiki/compare/v1.12.0...v1.12.1) ##### 🚀 Features - New `dotenv` grammar, new `everforest` theme - by [@​antfu](https://togithub.com/antfu) [<samp>(29b1d)</samp>](https://togithub.com/shikijs/shiki/commit/29b1d3aa) ##### [View changes on GitHub](https://togithub.com/shikijs/shiki/compare/v1.12.0...v1.12.1) ### [`v1.12.0`](https://togithub.com/shikijs/shiki/releases/tag/v1.12.0) [Compare Source](https://togithub.com/shikijs/shiki/compare/v1.11.2...v1.12.0) ##### 🚀 Features - Add static `initial` method for `GrammarState`, [#​715](https://togithub.com/shikijs/shiki/issues/715) - by [@​antfu](https://togithub.com/antfu) in [https://github.com/shikijs/shiki/issues/715](https://togithub.com/shikijs/shiki/issues/715) [<samp>(be07d)</samp>](https://togithub.com/shikijs/shiki/commit/be07da89) - New `ts-tags` grammar, lit support, close [#​725](https://togithub.com/shikijs/shiki/issues/725) - by [@​antfu](https://togithub.com/antfu) in [https://github.com/shikijs/shiki/issues/725](https://togithub.com/shikijs/shiki/issues/725) [<samp>(3107a)</samp>](https://togithub.com/shikijs/shiki/commit/3107a2d0) ##### 🐞 Bug Fixes - **core**: Fix decoration offset edge cases - by [@​timothycohen](https://togithub.com/timothycohen) in [https://github.com/shikijs/shiki/issues/728](https://togithub.com/shikijs/shiki/issues/728) [<samp>(1349b)</samp>](https://togithub.com/shikijs/shiki/commit/1349bb4d) ##### [View changes on GitHub](https://togithub.com/shikijs/shiki/compare/v1.11.2...v1.12.0) ### [`v1.11.2`](https://togithub.com/shikijs/shiki/releases/tag/v1.11.2) [Compare Source](https://togithub.com/shikijs/shiki/compare/v1.11.1...v1.11.2) ##### 🐞 Bug Fixes - **core**: Fix the incorrect parameter when using a single theme - by [@​il-1337](https://togithub.com/il-1337) in [https://github.com/shikijs/shiki/issues/723](https://togithub.com/shikijs/shiki/issues/723) [<samp>(5e2a6)</samp>](https://togithub.com/shikijs/shiki/commit/5e2a69e2) - **rehype**: Add the misssing `CodeToHastOptionsCommon` to `RehypeShikiCoreOptions` for `rehype` plugin - by [@​fwqaaq](https://togithub.com/fwqaaq) in [https://github.com/shikijs/shiki/issues/726](https://togithub.com/shikijs/shiki/issues/726) [<samp>(c8c14)</samp>](https://togithub.com/shikijs/shiki/commit/c8c1468d) ##### [View changes on GitHub](https://togithub.com/shikijs/shiki/compare/v1.11.1...v1.11.2) ### [`v1.11.1`](https://togithub.com/shikijs/shiki/releases/tag/v1.11.1) [Compare Source](https://togithub.com/shikijs/shiki/compare/v1.11.0...v1.11.1) ##### 🐞 Bug Fixes - CodeToTokens's includeExplanation option - by [@​uxiew](https://togithub.com/uxiew) in [https://github.com/shikijs/shiki/issues/718](https://togithub.com/shikijs/shiki/issues/718) [<samp>(55e85)</samp>](https://togithub.com/shikijs/shiki/commit/55e857b8) - **vitepress-twoslash**: Correct client types - by [@​sxzz](https://togithub.com/sxzz) in [https://github.com/shikijs/shiki/issues/720](https://togithub.com/shikijs/shiki/issues/720) [<samp>(c8f30)</samp>](https://togithub.com/shikijs/shiki/commit/c8f301c9) ##### [View changes on GitHub](https://togithub.com/shikijs/shiki/compare/v1.11.0...v1.11.1) ### [`v1.11.0`](https://togithub.com/shikijs/shiki/releases/tag/v1.11.0) [Compare Source](https://togithub.com/shikijs/shiki/compare/v1.10.3...v1.11.0) ##### 🚀 Features - Update grammar and themes - by [@​antfu](https://togithub.com/antfu) [<samp>(91c7f)</samp>](https://togithub.com/shikijs/shiki/commit/91c7f016) ##### [View changes on GitHub](https://togithub.com/shikijs/shiki/compare/v1.10.3...v1.11.0) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [x] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/ariakit/ariakit). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4xOC4xNyIsInVwZGF0ZWRJblZlciI6IjM4LjE4LjE3IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
](https://renovatebot.com){kind=link}
1 task
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.
Description
Fixes edge cases in the Decorations API.
Linked Issues
Fix #719 (when
offset === code.length)Fix #727 (when
end.line < start.linebutend.offset > start.offset)Additional context
It's recoverable when
end.line < start.lineif the offsets are okay. But because of the test explicitly checking that the chars don't overflow the line, I followed suit and threw instead of manipulating the line/character.