From 46f3d79f0f2272fd8f9db218a756ff2aac18d080 Mon Sep 17 00:00:00 2001 From: Farnabaz Date: Tue, 18 Apr 2023 13:32:03 +0200 Subject: [PATCH] fix(shiki): add `\n` to empty lines --- src/runtime/transformers/shiki/highlighter.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/runtime/transformers/shiki/highlighter.ts b/src/runtime/transformers/shiki/highlighter.ts index 4c16c95cf..4dd9d020d 100644 --- a/src/runtime/transformers/shiki/highlighter.ts +++ b/src/runtime/transformers/shiki/highlighter.ts @@ -1,12 +1,12 @@ import { getHighlighter, BUNDLED_LANGUAGES, BUNDLED_THEMES, Lang, Theme as ShikiTheme, Highlighter } from 'shiki-es' -import consola from 'consola' +import { consola } from 'consola' import type { ModuleOptions } from '../../../module' import { createSingleton } from '../utils' import mdcTMLanguage from './languages/mdc.tmLanguage' import type { MarkdownNode, HighlighterOptions, Theme, HighlightThemedToken, HighlightThemedTokenLine, TokenColorMap } from './types' // Re-create logger locally as utils cannot be imported from here -const logger = consola.withScope('@nuxt/content') +const logger = consola.withTag('@nuxt/content') /** * Resolve Shiki compatible lang from string. @@ -147,7 +147,12 @@ export const useShikiHighlighter = createSingleton((opts?: Exclude { + // Add line break to all lines except last if (lineIndex !== lines.length - 1) { + // Add line break to empty lines + if (line.length === 0) { + line.push({ content: '' }) + } line[line.length - 1].content += '\n' }