From f833849fa6944ee504da5aee5b97bb86cc783249 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Wed, 22 Nov 2023 23:26:33 +0100 Subject: [PATCH] chore: cleanup --- src/node/markdown/markdown.ts | 4 ---- src/node/markdown/plugins/highlight.ts | 18 +++++++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/node/markdown/markdown.ts b/src/node/markdown/markdown.ts index d83e2cca..35b7f807 100644 --- a/src/node/markdown/markdown.ts +++ b/src/node/markdown/markdown.ts @@ -67,10 +67,6 @@ export interface MarkdownOptions extends MarkdownIt.Options { component?: ComponentPluginOptions math?: boolean | any container?: ContainerOptions - - /** - * Shikiji transformers - */ transformers?: ShikijiTransformer[] } diff --git a/src/node/markdown/plugins/highlight.ts b/src/node/markdown/plugins/highlight.ts index c0809288..3376996d 100644 --- a/src/node/markdown/plugins/highlight.ts +++ b/src/node/markdown/plugins/highlight.ts @@ -147,14 +147,8 @@ export async function highlight( str = removeMustache(str).trimEnd() - const result = highlighter.codeToHtml(str, { + const highlighted = highlighter.codeToHtml(str, { lang, - ...(typeof theme === 'string' || 'name' in theme - ? { theme } - : { - themes: theme, - defaultColor: false - }), transformers: [ ...transformers, transformerCompactLineOptions(lineOptions), @@ -164,9 +158,15 @@ export async function highlight( } }, ...userTransformers - ] + ], + ...(typeof theme === 'string' || 'name' in theme + ? { theme } + : { + themes: theme, + defaultColor: false + }), }) - return fillEmptyHighlightedLine(cleanup(restoreMustache(result))) + return fillEmptyHighlightedLine(cleanup(restoreMustache(highlighted))) } }