Skip to content

Commit 59a8f61

Browse files
feat: Add support for unknown languages & style: Update code line for… (#306)
* feat: Add support for unknown languages & style: Update code line formatting * fix: lang tag z-index * fix: case in-sensive * revert: Multiple highlighters
1 parent 1729c67 commit 59a8f61

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

src/components/ui/code-highlighter/shiki/Shiki.module.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
}
1818

1919
.line {
20-
@apply block min-h-[1em] px-4;
20+
@apply block min-h-[1em];
2121
}
2222

2323
.highlighted,

src/components/ui/code-highlighter/shiki/Shiki.tsx

+4-5
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ export const ShikiHighLighter: FC<Props> = (props) => {
6464
() => import('shiki/langs/vue.mjs'),
6565
() => import('shiki/langs/html.mjs'),
6666
() => import('shiki/langs/asm.mjs'),
67-
() => import('shiki/langs/bash.mjs'),
67+
() => import('shiki/langs/shell.mjs'),
6868
() => import('shiki/langs/ps.mjs'),
69-
() => import('shiki/langs/ps1.mjs'),
7069
],
7170
loadWasm: getWasm,
7271
})
@@ -103,7 +102,7 @@ export const ShikiHighLighter: FC<Props> = (props) => {
103102
return codeHighlighter(highlighter, {
104103
attrs: attrs || '',
105104
code: value,
106-
lang: language || '',
105+
lang: language ? language.toLowerCase() : '',
107106
})
108107
}, [attrs, language, value, highlighter])
109108

@@ -132,7 +131,7 @@ export const ShikiHighLighter: FC<Props> = (props) => {
132131
{!filename && !!language && (
133132
<div
134133
aria-hidden
135-
className="pointer-events-none absolute bottom-3 right-3 text-sm opacity-60"
134+
className="pointer-events-none absolute bottom-3 right-3 z-10 text-sm opacity-60"
136135
>
137136
{language.toUpperCase()}
138137
</div>
@@ -152,7 +151,7 @@ export const ShikiHighLighter: FC<Props> = (props) => {
152151
<div
153152
ref={setCodeBlockRef}
154153
className={clsxm(
155-
'relative max-h-[50vh] w-full overflow-auto scrollbar-none',
154+
'relative max-h-[50vh] w-full overflow-auto px-4 scrollbar-none',
156155
!isCollapsed ? '!max-h-[100%]' : isOverflow ? maskClassName : '',
157156
)}
158157
dangerouslySetInnerHTML={

src/components/ui/code-highlighter/shiki/utils.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,5 @@ export const isSupportedShikiLang = (lang: string) => {
8484
'plaintext',
8585
'txt',
8686
'plain',
87-
].includes(lang)
87+
].includes(lang.toLowerCase())
8888
}

0 commit comments

Comments
 (0)