cleanup

Author: mProjectsCode

src/ObsidianTheme.ts

@@ -2,12 +2,6 @@ import { ThemeRegistration } from 'shiki';
 import * as hast_util_to_html_lib_types from 'hast-util-to-html/lib/types';
 import * as hast_types from 'hast';
 
-interface Theme {
-	theme: ThemeRegistration;
-	mapping: Map<string, string>;
-	reverseMapping: Map<string, string>;
-}
-
 export class ThemeMapper {
 	mapCounter: number;
 	mapping: Map<string, string>;
@@ -17,8 +11,8 @@ export class ThemeMapper {
 		this.mapping = new Map();
 	}
 
-	getTheme(): Theme {
-		const theme: ThemeRegistration = {
+	getTheme(): ThemeRegistration {
+		return {
 			displayName: OBSIDIAN_THEME.displayName,
 			name: OBSIDIAN_THEME.name,
 			semanticHighlighting: OBSIDIAN_THEME.semanticHighlighting,
@@ -37,14 +31,6 @@ export class ThemeMapper {
 				return newToken;
 			}),
 		};
-
-		const reverseMapping = this.getReverseMapping();
-
-		return {
-			theme: theme,
-			mapping: this.mapping,
-			reverseMapping: reverseMapping,
-		};
 	}
 
 	mapColor(color: string): string {
@@ -58,14 +44,6 @@ export class ThemeMapper {
 		}
 	}
 
-	private getReverseMapping(): Map<string, string> {
-		const reverseMapping = new Map<string, string>();
-		this.mapping.forEach((value, key) => {
-			reverseMapping.set(value, key);
-		});
-		return reverseMapping;
-	}
-
 	fixAST(ast: hast_util_to_html_lib_types.Parent): hast_util_to_html_lib_types.Parent {
 		ast.children = ast.children.map(child => {
 			if (child.type === 'element') {

src/main.ts

@@ -12,10 +12,9 @@ const languageNameBlacklist = new Set(['c++', 'c#', 'f#']);
 export default class ShikiPlugin extends Plugin {
 	async onload(): Promise<void> {
 		const themeMapper = new ThemeMapper();
-		const theme = themeMapper.getTheme();
 
 		const ec = new ExpressiveCodeEngine({
-			themes: [new ExpressiveCodeTheme(theme.theme)],
+			themes: [new ExpressiveCodeTheme(themeMapper.getTheme())],
 			plugins: [
 				pluginShiki({
 					langs: Object.values(bundledLanguages),
@@ -56,6 +55,7 @@ export default class ShikiPlugin extends Plugin {
 					const rederResult = await ec.render({
 						code: source,
 						language: shikiLanguage,
+						// TODO: parse from code block
 						meta: '{1-2}',
 					});