-
-
Notifications
You must be signed in to change notification settings - Fork 355
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: allow nullish color for colorReplacement, fix ansi highlighting with dark-plus, fix #597 #598
Merged
antfu
merged 2 commits into
shikijs:main
from
chwzr:fix/597-ansi-highlighting-not-working-with-theme-dark-plus
Feb 21, 2024
Merged
fix: allow nullish color for colorReplacement, fix ansi highlighting with dark-plus, fix #597 #598
antfu
merged 2 commits into
shikijs:main
from
chwzr:fix/597-ansi-highlighting-not-working-with-theme-dark-plus
Feb 21, 2024
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-next ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
✅ Deploy Preview for shiki-matsu ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
antfu
changed the title
fix #597 - ansi highlighting with dark-plus
fix: allow nullish color for colorReplacement, fix ansi highlighting with dark-plus, fix #597
Feb 21, 2024
diegohaz
pushed a commit
to ariakit/ariakit
that referenced
this pull request
Mar 1, 2024
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](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.1.6` -> `1.1.7`](https://renovatebot.com/diffs/npm/shiki/1.1.6/1.1.7) | [![age](https://developer.mend.io/api/mc/badges/age/npm/shiki/1.1.7?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/shiki/1.1.7?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/shiki/1.1.6/1.1.7?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/shiki/1.1.6/1.1.7?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>shikijs/shiki (shiki)</summary> ### [`v1.1.7`](https://togithub.com/shikijs/shiki/releases/tag/v1.1.7) [Compare Source](https://togithub.com/shikijs/shiki/compare/v1.1.6...v1.1.7) ##### 🐞 Bug Fixes - Allow nullish color for colorReplacement, fix ansi highlighting with dark-plus, fix [#​597](https://togithub.com/shikijs/shiki/issues/597) - by [@​chwzr](https://togithub.com/chwzr) in [shikijs/shiki#598 and [shikijs/shiki#597 [<samp>(ccb58)</samp>](https://togithub.com/shikijs/shiki/commit/ccb58331) ##### [View changes on GitHub](https://togithub.com/shikijs/shiki/compare/v1.1.6...v1.1.7) </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. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/ariakit/ariakit). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMDAuMCIsInVwZGF0ZWRJblZlciI6IjM3LjIwMC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This was referenced May 18, 2024
This was referenced May 25, 2024
This was referenced Jun 2, 2024
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
This PR fixes highlighting ansi with other themes than
monokai
(see #597).Linked Issues
#597
Additional context
I've implemented an test for ansi with dark-plus. Which fails when removing the change to
packages/core/src/utils.ts
Other themes didn't work either, but I didn't test them. Although they should be fine with this fix.