Clean up themes

shikijs · Jan 2, 2019 · 47a9e54 · 47a9e54
1 parent aa9e354
commit 47a9e54
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 23 deletions.
diff --git a/packages/themes/data/material.js b/packages/themes/data/material.js
@@ -6,7 +6,7 @@ const files = fs.readdirSync(path.resolve(__dirname, './material'))
 files.map(f => {
   const absp = path.resolve(__dirname, './material', f)
 
-  const newf = f.replace(/^Material-Theme-/, '')
+  const newf = f.replace(/^Material-Theme/, 'Material-Theme-')
   const newp = path.resolve(__dirname, './material', newf)
   fs.renameSync(absp, newp)
 })
diff --git a/...s/data/material/Darker-High-Contrast.json → .../Material-Theme-Darker-High-Contrast.json b/...s/data/material/Darker-High-Contrast.json → .../Material-Theme-Darker-High-Contrast.json
diff --git a/packages/themes/data/material/Darker.json → .../data/material/Material-Theme-Darker.json b/packages/themes/data/material/Darker.json → .../data/material/Material-Theme-Darker.json
diff --git a/.../data/material/Default-High-Contrast.json → ...Material-Theme-Default-High-Contrast.json b/.../data/material/Default-High-Contrast.json → ...Material-Theme-Default-High-Contrast.json
diff --git a/packages/themes/data/material/Default.json → ...data/material/Material-Theme-Default.json b/packages/themes/data/material/Default.json → ...data/material/Material-Theme-Default.json
diff --git a/.../data/material/Lighter-High-Contrast.json → ...Material-Theme-Lighter-High-Contrast.json b/.../data/material/Lighter-High-Contrast.json → ...Material-Theme-Lighter-High-Contrast.json
diff --git a/packages/themes/data/material/Lighter.json → ...data/material/Material-Theme-Lighter.json b/packages/themes/data/material/Lighter.json → ...data/material/Material-Theme-Lighter.json
diff --git a/...es/data/material/Ocean-High-Contrast.json → ...l/Material-Theme-Ocean-High-Contrast.json b/...es/data/material/Ocean-High-Contrast.json → ...l/Material-Theme-Ocean-High-Contrast.json
diff --git a/packages/themes/data/material/Ocean.json → ...s/data/material/Material-Theme-Ocean.json b/packages/themes/data/material/Ocean.json → ...s/data/material/Material-Theme-Ocean.json
diff --git a/...ata/material/Palenight-High-Contrast.json → ...terial-Theme-Palenight-High-Contrast.json b/...ata/material/Palenight-High-Contrast.json → ...terial-Theme-Palenight-High-Contrast.json
diff --git a/packages/themes/data/material/Palenight.json → ...ta/material/Material-Theme-Palenight.json b/packages/themes/data/material/Palenight.json → ...ta/material/Material-Theme-Palenight.json
diff --git a/packages/themes/src/index.ts b/packages/themes/src/index.ts
@@ -21,16 +21,16 @@ const vscThemes = [
 ]
 
 export const materialThemes = [
-  'Darker-High-Contrast',
-  'Darker',
-  'Default-High-Contrast',
-  'Default',
-  'Lighter-High-Contrast',
-  'Lighter',
-  'Ocean-High-Contrast',
-  'Ocean',
-  'Palenight-High-Contrast',
-  'Palenight',
+  'Material-Theme-Darker-High-Contrast',
+  'Material-Theme-Darker',
+  'Material-Theme-Default-High-Contrast',
+  'Material-Theme-Default',
+  'Material-Theme-Lighter-High-Contrast',
+  'Material-Theme-Lighter',
+  'Material-Theme-Ocean-High-Contrast',
+  'Material-Theme-Ocean',
+  'Material-Theme-Palenight-High-Contrast',
+  'Material-Theme-Palenight',
 ]
 
 export const niceThemes = [

diff --git a/packages/themes/src/loadTheme.ts b/packages/themes/src/loadTheme.ts
@@ -47,9 +47,10 @@ export function loadTheme(themePath: string): IShikiTheme {
   const shikiTheme = toShikiTheme(theme)
 
   if (shikiTheme.include) {
-    const includedThemePath = path.resolve(themePath, shikiTheme.include)
+    const includedThemePath = path.resolve(themePath, '..', shikiTheme.include)
     const includedTheme = loadTheme(includedThemePath)
-    ;(<any>shikiTheme).settings = theme.settings.concat(includedTheme.settings)
+    shikiTheme.settings = theme.settings.concat(includedTheme.settings)
+    shikiTheme.bg = getThemeBg(shikiTheme)
   }
 
   return shikiTheme

diff --git a/packages/themes/src/types.ts b/packages/themes/src/types.ts
@@ -14,16 +14,16 @@ export type TVSCode =
   | 'solarized_light'
 
 export type TMaterial =
-  | 'Darker-High-Contrast'
-  | 'Darker'
-  | 'Default-High-Contrast'
-  | 'Default'
-  | 'Lighter-High-Contrast'
-  | 'Lighter'
-  | 'Ocean-High-Contrast'
-  | 'Ocean'
-  | 'Palenight-High-Contrast'
-  | 'Palenight'
+  | 'Material-Theme-Darker-High-Contrast'
+  | 'Material-Theme-Darker'
+  | 'Material-Theme-Default-High-Contrast'
+  | 'Material-Theme-Default'
+  | 'Material-Theme-Lighter-High-Contrast'
+  | 'Material-Theme-Lighter'
+  | 'Material-Theme-Ocean-High-Contrast'
+  | 'Material-Theme-Ocean'
+  | 'Material-Theme-Palenight-High-Contrast'
+  | 'Material-Theme-Palenight'
 
 export type TNice =
   | 'nord'