fix: fix lang

vuepress · Jan 24, 2025 · 2eeec6e · 2eeec6e
1 parent 2cbfbaa
commit 2eeec6e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/plugins/markdown/plugin-shiki/src/node/markdown/highlighter/createShikiHighlighter.ts b/plugins/markdown/plugin-shiki/src/node/markdown/highlighter/createShikiHighlighter.ts
@@ -9,6 +9,7 @@ import { createHighlighter, isSpecialLang } from 'shiki'
 import { createSyncFn } from 'synckit'
 import type { ShikiResolveLang } from '../../resolveLang.js'
 import type { ShikiHighlightOptions } from '../../types.js'
+import { resolveLanguage } from '../../utils.js'
 
 const require = createRequire(import.meta.url)
 
@@ -26,7 +27,7 @@ export const createShikiHighlighter = async ({
   ...options
 }: ShikiHighlightOptions = {}): Promise<{
   highlighter: HighlighterGeneric<BundledLanguage, BundledTheme>
-  loadLang: (lang: LanguageRegistration | string) => boolean
+  loadLang: (lang: string) => boolean
 }> => {
   const highlighter = await createHighlighter({
     langs: [...langs, ...Object.values(langAlias)],
@@ -37,29 +38,29 @@ export const createShikiHighlighter = async ({
         : [options.theme ?? 'nord'],
   })
 
-  const loadLang = (langConfig: LanguageRegistration | string): boolean => {
-    const lang = typeof langConfig === 'string' ? langConfig : langConfig.name
+  const loadLang = (lang: string): boolean => {
+    if (isSpecialLang(lang)) return true
 
-    if (
-      !isSpecialLang(lang) &&
-      !highlighter.getLoadedLanguages().includes(lang)
-    ) {
+    const loadedLangs = highlighter.getLoadedLanguages()
+
+    if (!loadedLangs.includes(lang)) {
       const resolvedLang = resolveLangSync(lang)
 
       if (!resolvedLang.length) return false
 
-      console.log('loading lang', lang)
-
       highlighter.loadLanguageSync(resolvedLang)
     }
+
     return true
   }
 
   // patch for twoslash - https://github.com/vuejs/vitepress/issues/4334
   const rawGetLanguage = highlighter.getLanguage
 
   highlighter.getLanguage = (name) => {
-    loadLang(name)
+    const lang = typeof name === 'string' ? name : name.name
+
+    loadLang(resolveLanguage(lang))
 
     return rawGetLanguage.call(highlighter, name)
   }

diff --git a/plugins/markdown/plugin-shiki/src/node/markdown/highlighter/getLanguage.ts b/plugins/markdown/plugin-shiki/src/node/markdown/highlighter/getLanguage.ts
@@ -14,7 +14,7 @@ export const getLanguage = (
 ): string => {
   let result = resolveLanguage(lang)
 
-  if (result && !loadLang(lang)) {
+  if (result && !loadLang(result)) {
     // warn for unknown languages only once
     if (logLevel !== 'silent' && !WARNED_LANGS.has(result)) {
       logger.warn(