fix?

Author: LadyBluenotes

src/utils/markdown/plugins/collectHeadings.ts

@@ -10,7 +10,9 @@ export type MarkdownHeading = {
   level: number
 }
 
-export function rehypeCollectHeadings(headings: MarkdownHeading[]) {
+export function rehypeCollectHeadings(initialHeadings?: MarkdownHeading[]) {
+  const headings = initialHeadings ?? []
+
   return function collectHeadings(tree: Root, file: any) {
     visit(tree, 'element', (node) => {
       if (!isHeading(node)) {

src/utils/markdown/plugins/syntaxHighlight.ts

@@ -94,25 +94,16 @@ export const rehypeShikiHighlight = () => {
             }
           }
 
-          const htmlFragments = await Promise.all(
-            DEFAULT_THEMES.map((theme) =>
-              highlighter.codeToHtml(codeText, {
-                lang: effectiveLang,
-                theme,
-                transformers: [transformerNotationDiff()],
-              }),
-            ),
-          )
-
           node.tagName = 'div'
+          const existingClasses = Array.isArray(node.properties?.className)
+            ? (node.properties?.className as string[])
+            : typeof node.properties?.className === 'string'
+              ? String(node.properties.className).split('\n')
+              : []
+
           node.properties = {
             ...node.properties,
-            className: [
-              ...(Array.isArray(node.properties?.className)
-                ? (node.properties?.className as string[])
-                : []),
-              'shiki-wrapper',
-            ],
+            className: [...existingClasses, 'shiki-wrapper'],
             'data-language': normalizedLang,
           }
 
@@ -126,6 +117,16 @@ export const rehypeShikiHighlight = () => {
             return
           }
 
+          const htmlFragments = await Promise.all(
+            DEFAULT_THEMES.map((theme) =>
+              highlighter.codeToHtml(codeText, {
+                lang: effectiveLang,
+                theme,
+                transformers: [transformerNotationDiff()],
+              }),
+            ),
+          )
+
           const fragmentTrees = htmlFragments.map((fragment) =>
             fragmentParser.parse(fragment) as Root,
           )

src/utils/markdown/processor.ts

@@ -71,7 +71,7 @@ export function renderMarkdown(content): MarkdownRenderResult {
         className: ['anchor-heading'],
       },
     })
-    .use((node, file) => rehypeCollectHeadings(node, file, headings))
+    .use(rehypeCollectHeadings(headings))
 
   const file = processor.use(rehypeStringify).processSync(content)