Fixed hljs langs mapping
This commit is contained in:
parent
c3e2bbe4c0
commit
1c174a3b1c
|
@ -6,6 +6,7 @@
|
||||||
import ComboBox from './ComboBox.svelte'
|
import ComboBox from './ComboBox.svelte'
|
||||||
import Icon from '@iconify/svelte'
|
import Icon from '@iconify/svelte'
|
||||||
import { goto } from '$app/navigation'
|
import { goto } from '$app/navigation'
|
||||||
|
import hljs from 'highlight.js'
|
||||||
|
|
||||||
type Language = {
|
type Language = {
|
||||||
text: string
|
text: string
|
||||||
|
@ -31,7 +32,7 @@
|
||||||
})
|
})
|
||||||
|
|
||||||
selectedLang.subscribe((lang) => {
|
selectedLang.subscribe((lang) => {
|
||||||
textWrap = lang === 'plt' || lang === 'md'
|
textWrap = lang === 'plaintext' || lang === 'markdown'
|
||||||
})
|
})
|
||||||
|
|
||||||
$: {
|
$: {
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
import hljs from 'highlight.js'
|
||||||
|
|
||||||
export const slugify = (str: string) =>
|
export const slugify = (str: string) =>
|
||||||
str
|
str
|
||||||
.trim()
|
.trim()
|
||||||
|
@ -37,3 +39,8 @@ export const byId = (id: string) => document.getElementById(id)
|
||||||
export function isInIframe(): boolean {
|
export function isInIframe(): boolean {
|
||||||
return window !== window.parent
|
return window !== window.parent
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function getHljsLangFromShort(short: string): string {
|
||||||
|
const langs = hljs.listLanguages().map((lang) => ({ lang, short: shorten(lang) }))
|
||||||
|
return langs.find((l) => l.short === short)?.lang ?? 'plaintext'
|
||||||
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
import rehypeStringify from 'rehype-stringify'
|
import rehypeStringify from 'rehype-stringify'
|
||||||
import hljs from 'highlight.js'
|
import hljs from 'highlight.js'
|
||||||
import 'highlight.js/styles/nord.min.css'
|
import 'highlight.js/styles/nord.min.css'
|
||||||
import { getLangFromUrl, isInIframe } from '$lib/utils'
|
import { getHljsLangFromShort, getLangFromUrl, isInIframe } from '$lib/utils'
|
||||||
import TopBar from '../components/TopBar.svelte'
|
import TopBar from '../components/TopBar.svelte'
|
||||||
import Icon from '@iconify/svelte'
|
import Icon from '@iconify/svelte'
|
||||||
import CodeView from '../components/CodeView.svelte'
|
import CodeView from '../components/CodeView.svelte'
|
||||||
|
@ -26,12 +26,16 @@
|
||||||
let lang = getLangFromUrl()
|
let lang = getLangFromUrl()
|
||||||
// Remove github flavored markdown, redundant with markdown
|
// Remove github flavored markdown, redundant with markdown
|
||||||
lang = lang === 'gflm' ? 'md' : lang
|
lang = lang === 'gflm' ? 'md' : lang
|
||||||
|
|
||||||
|
// Get the correct language name for hljs
|
||||||
|
lang = getHljsLangFromShort(lang)
|
||||||
|
|
||||||
// decompress the data
|
// decompress the data
|
||||||
const { decompress } = await import('$lib/brotli')
|
const { decompress } = await import('$lib/brotli')
|
||||||
decompressed = await decompress(hash)
|
decompressed = await decompress(hash)
|
||||||
|
|
||||||
// Markdown
|
// Markdown
|
||||||
if (lang === 'md') {
|
if (lang === 'markdown') {
|
||||||
const html = await unified()
|
const html = await unified()
|
||||||
.use(remarkParse)
|
.use(remarkParse)
|
||||||
.use(remarkGfm)
|
.use(remarkGfm)
|
||||||
|
@ -43,7 +47,7 @@
|
||||||
htmlContent = html.toString()
|
htmlContent = html.toString()
|
||||||
}
|
}
|
||||||
// Plain text
|
// Plain text
|
||||||
else if (lang === 'plt' || !lang) {
|
else if (lang === 'plaintext' || !lang) {
|
||||||
isPlainText = true
|
isPlainText = true
|
||||||
}
|
}
|
||||||
// Code
|
// Code
|
||||||
|
|
Loading…
Reference in New Issue
Block a user