smashimo/oh-my-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use supplied theme for LSP hover highlighting

Browse Source
This commit is contained in:
ben
2026-06-11 22:41:06 +08:00
parent db23b721b5
commit 8a55ce7b85
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/coding-agent/src/lsp/render.ts
+1 -1
View File
@@ -218,7 +218,7 @@ function renderHover(
const beforeCode = fullText.slice(0, codeStart).trimEnd();
const afterCode = fullText.slice(fullText.indexOf("```", 3) + 3).trim();
const codeLines = highlightThemeCode(code, lang);
const codeLines = highlightThemeCode(code, lang, theme);
const icon = theme.styledSymbol("status.info", "accent");
const langLabel = lang ? theme.fg("mdCodeBlockBorder", ` ${lang}`) : "";
packages/coding-agent/src/modes/theme/theme.ts
+7 -7
View File
@@ -2559,10 +2559,10 @@ const HIGHLIGHT_CACHE_MAX = 256;
const highlightCache = new LRUCache<string, string>({ max: HIGHLIGHT_CACHE_MAX });
let highlightCacheTheme: Theme | undefined;
function highlightCached(code: string, validLang: string | undefined): string | null {
if (highlightCacheTheme !== theme) {
function highlightCached(code: string, validLang: string | undefined, highlightTheme: Theme): string | null {
if (highlightCacheTheme !== highlightTheme) {
highlightCache.clear();
highlightCacheTheme = theme;
highlightCacheTheme = highlightTheme;
}
const key = `${validLang ?? ""}\x00${code}`;
const hit = highlightCache.get(key);
@@ -2571,7 +2571,7 @@ function highlightCached(code: string, validLang: string | undefined): string |
}
let highlighted: string;
try {
highlighted = nativeHighlightCode(code, validLang, getHighlightColors(theme));
highlighted = nativeHighlightCode(code, validLang, getHighlightColors(highlightTheme));
} catch {
return null;
}
@@ -2583,9 +2583,9 @@ function highlightCached(code: string, validLang: string | undefined): string |
* Highlight code with syntax coloring based on file extension or language.
* Returns array of highlighted lines.
*/
export function highlightCode(code: string, lang?: string): string[] {
export function highlightCode(code: string, lang?: string, highlightTheme: Theme = theme): string[] {
const validLang = lang && nativeSupportsLanguage(lang) ? lang : undefined;
const highlighted = highlightCached(code, validLang);
const highlighted = highlightCached(code, validLang, highlightTheme);
// Always return a fresh array: callers (e.g. renderCodeCell) push extra lines
// onto the result, which would corrupt the cached string otherwise.
return (highlighted ?? code).split("\n");
@@ -2633,7 +2633,7 @@ export function getMarkdownTheme(): MarkdownTheme {
resolveMermaidAscii,
highlightCode: (code: string, lang?: string): string[] => {
const validLang = lang && nativeSupportsLanguage(lang) ? lang : undefined;
const highlighted = highlightCached(code, validLang);
const highlighted = highlightCached(code, validLang, theme);
if (highlighted !== null) return highlighted.split("\n");
return code.split("\n").map(line => theme.fg("mdCodeBlock", line));
},
packages/coding-agent/test/lsp-render.test.ts
+1 -1
View File
@@ -22,7 +22,7 @@ describe("LSP render", () => {
const rendered = Bun.stripANSI(component.render(120).join("\n"));
expect(highlightSpy).toHaveBeenCalledTimes(1);
expect(highlightSpy).toHaveBeenCalledWith("const value = 1;", "ts");
expect(highlightSpy).toHaveBeenCalledWith("const value = 1;", "ts", themeModule.theme);
expect(rendered).toContain("CACHED_HIGHLIGHT");
});
});