Fix wrong theme usage

pomber · pomber · commit 91111f8edc45 · 2023-01-22T11:45:13.000Z
diff --git a/.changeset/tasty-coats-destroy.md b/.changeset/tasty-coats-destroy.md
@@ -0,0 +1,5 @@
+---
+"@code-hike/lighter": patch
+---
+
+Fix wrong theme usage
diff --git a/lib/dist/index.cjs.js b/lib/dist/index.cjs.js
diff --git a/lib/dist/index.esm.mjs b/lib/dist/index.esm.mjs
@@ -2514,10 +2514,10 @@ function highlight(code, alias, themeOrThemeName) {
                     if (!theme) {
                         throw new UnknownThemeError(themeOrThemeName);
                     }
-                    registry.setTheme(theme);
                     return [4 /*yield*/, grammarsPromise];
                 case 2:
                     grammar = (_a.sent());
+                    registry.setTheme(theme);
                     colorMap = registry.getColorMap();
                     return [2 /*return*/, __assign({ lines: tokenize(code, grammar, colorMap), lang: langData.id }, getThemeColors(theme))];
             }
diff --git a/lib/src/index.ts b/lib/src/index.ts
@@ -48,9 +48,9 @@ export async function highlight(
     throw new UnknownThemeError(themeOrThemeName as string);
   }
 
-  registry.setTheme(theme);
-
   const grammar = (await grammarsPromise)!;
+
+  registry.setTheme(theme);
   const colorMap = registry.getColorMap();
 
   return {

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@code-hike/lighter": patch
 +---
++
 +Fix wrong theme usage
Original file line number	Diff line number	Diff line change
`@@ -2514,10 +2514,10 @@ function highlight(code, alias, themeOrThemeName) {`
`2514`	`2514`	`if (!theme) {`
`2515`	`2515`	`throw new UnknownThemeError(themeOrThemeName);`
`2516`	`2516`	`}`
`2517`		`- registry.setTheme(theme);`
`2518`	`2517`	`return [4 /yield/, grammarsPromise];`
`2519`	`2518`	`case 2:`
`2520`	`2519`	`grammar = (_a.sent());`
	`2520`	`+ registry.setTheme(theme);`
`2521`	`2521`	`colorMap = registry.getColorMap();`
`2522`	`2522`	`return [2 /return/, __assign({ lines: tokenize(code, grammar, colorMap), lang: langData.id }, getThemeColors(theme))];`
`2523`	`2523`	`}`