Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/core/src/highlight/code-to-tokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export function codeToTokens(
primitive,
code,
options,
codeToTokensBase,
)

grammarState = getLastGrammarStateFromMap(themeTokens)
Expand Down
3 changes: 2 additions & 1 deletion packages/primitive/src/highlight/code-to-tokens-themes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ export function codeToTokensWithThemes(
primitive: ShikiPrimitive,
code: string,
options: CodeToTokensWithThemesOptions,
codeToTokensBaseFn: typeof codeToTokensBase = codeToTokensBase,
): ThemedTokenWithVariants[][] {
const themes = Object
.entries(options.themes)
.filter(i => i[1])
.map(i => ({ color: i[0], theme: i[1]! }))

const themedTokens = themes.map((t) => {
const tokens = codeToTokensBase(primitive, code, {
const tokens = codeToTokensBaseFn(primitive, code, {
...options,
theme: t.theme,
})
Expand Down
10 changes: 10 additions & 0 deletions packages/shiki/test/ansi.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,13 @@ Done in 15.7s`, { theme: 'dark-plus', lang: 'ansi' })

await expect(out).toMatchFileSnapshot('./out/ansi-dark-plus.html')
})

// https://github.com/shikijs/shiki/issues/1257
it('renders ansi with multiple themes', async () => {
const out = await codeToHtml('\x1B[32mhello\x1B[0m', {
lang: 'ansi',
themes: { light: 'github-light', dark: 'github-dark' },
})

await expect(out).toMatchFileSnapshot('./out/ansi-multi-themes.html')
})
1 change: 1 addition & 0 deletions packages/shiki/test/out/ansi-multi-themes.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.