chore: update vscode-icons to v1 (#22)

* chore: update vscode-icons submodule Signed-off-by: Quentin Guidée <[email protected]> * chore: update package.json * chore: update generate.ts with latest upstream changes --------- Signed-off-by: Quentin Guidée <[email protected]>
catppuccin · Jan 27, 2024 · 92ba7a7 · 92ba7a7
1 parent b6bc729
commit 92ba7a7
Show file tree

Hide file tree

Showing 5 changed files with 151 additions and 583 deletions.
diff --git a/generate/scripts/generate.ts b/generate/scripts/generate.ts
@@ -1,25 +1,14 @@
 import {mkdirSync, readdirSync, readFileSync, writeFileSync} from 'fs';
-import {extensions, files, folders} from "@/associations";
-import {catppuccinizeSvg} from "../vscode-icons/scripts/catppuccinize";
-import {optimizeSvg} from "../vscode-icons/scripts/optimize";
-import {CattppucinVariant, cssVarStyleTags, hexToVar, varToHex} from "@/palettes";
+import {fileIcons} from "@/defaults/fileIcons";
+import {folderIcons} from "@/defaults/folderIcons";
 
-const WIDTH_REGEX = new RegExp(/width="(100\.0px|100)"/g);
-const HEIGHT_REGEX = new RegExp(/height="(100\.0px|100)"/g);
-
-function generateIcons(variant: CattppucinVariant) {
+function generateIcons(variant: string) {
   mkdirSync('src/main/resources/icons', {recursive: true});
-  readdirSync('generate/vscode-icons/src/icons').forEach((file) => {
+  readdirSync(`generate/vscode-icons/icons/${variant}`).forEach((file) => {
     if (!file.endsWith('.svg')) {
       return
     }
-
-    let data = readFileSync(`generate/vscode-icons/src/icons/${file}`, {encoding: 'utf-8'})
-    data = data.replace(WIDTH_REGEX, "width=\"16.0px\"")
-    data = data.replace(HEIGHT_REGEX, "height=\"16.0px\"")
-    data = catppuccinizeSvg(data)
-    data = optimizeSvg(data)
-    data = injectPalette(data, variant)
+    let data = readFileSync(`generate/vscode-icons/icons/${variant}/${file}`, {encoding: 'utf-8'})
     writeFileSync(`src/main/resources/icons/${variant}_${file}`, data, {encoding: 'utf-8'})
   });
 }
@@ -31,39 +20,39 @@ import com.intellij.openapi.util.IconLoader
 
 class Icons(private val variant: String) {`
 
-  readdirSync('generate/vscode-icons/src/icons').forEach((file) => {
+  readdirSync('generate/vscode-icons/icons/latte').forEach((file) => {
     if (!file.endsWith('.svg')) {
       return
     }
 
     data += `\n    @JvmField`
-    data += `\n    val ${file.replace('.svg', '')} = IconLoader.getIcon("/icons/" + variant + "_${file}", javaClass)`
+    data += `\n    val ${file.replace('.svg', '').replaceAll('-', '_')} = IconLoader.getIcon("/icons/" + variant + "_${file}", javaClass)`
     data += `\n`
   })
 
   // Folders to Icons
   data += `\n    val FOLDER_TO_ICONS = mapOf(\n`
-  Object.entries(folders).forEach(([key, value]: [string, string[]]) => {
-    value.forEach((folder) => {
-      data += `        "${folder}" to ${key},\n`
+  Object.entries(folderIcons).forEach(([key, value]: [string, object]) => {
+    value["folderNames"].forEach((folder: string) => {
+      data += `        "${folder}" to folder_${key.replaceAll('-', '_')},\n`
     })
   })
   data += `    )\n`
 
   // File name to Icons
   data += `\n    val FILE_TO_ICONS = mapOf(\n`
-  Object.entries(files).forEach(([key, value]: [string, string[]]) => {
-    value.forEach((filename) => {
-      data += `        "${filename}" to ${key},\n`
+  Object.entries(fileIcons).forEach(([key, value]: [string, object]) => {
+    value["fileNames"]?.forEach((filename: string) => {
+      data += `        "${filename}" to ${key.replaceAll('-', '_')},\n`
     })
   })
   data += `    )\n`
 
   // Extensions to Icons
   data += `\n    val EXT_TO_ICONS = mapOf(\n`
-  Object.entries(extensions).forEach(([key, value]: [string, string[]]) => {
-    value.forEach((ext) => {
-      data += `        "${ext}" to ${key},\n`
+  Object.entries(fileIcons).forEach(([key, value]: [string, object]) => {
+    value["fileExtensions"]?.forEach((ext: string) => {
+      data += `        "${ext}" to ${key.replaceAll('-', '_')},\n`
     })
   })
   data += `    )\n`
@@ -73,16 +62,5 @@ class Icons(private val variant: String) {`
   writeFileSync(`src/main/kotlin/com/github/catppuccin/jetbrains_icons/Icons.kt`, data, {encoding: 'utf-8'})
 }
 
-// Modified version of injectPalette from github.com/catppuccin/vscode-icons/scripts/catppuccinize.ts:
-export function injectPalette(svg: string, variant: CattppucinVariant) {
-  const replaced = svg.replaceAll(/#([a-dA-F0-9]{6})/gi, m => {
-    const v = hexToVar.mocha[m]
-    return varToHex[variant][v]
-  })
-  return replaced.replace(/\n/, cssVarStyleTags.mocha)
-}
-
-['latte', 'frappe', 'macchiato', 'mocha'].forEach((variant: CattppucinVariant) => {
-  generateIcons(variant)
-})
+['latte', 'frappe', 'macchiato', 'mocha'].forEach(generateIcons)
 generateIconsKt()
diff --git a/generate/vscode-icons b/generate/vscode-icons
diff --git a/package.json b/package.json
@@ -10,12 +10,8 @@
     "build": "tsx generate/scripts/generate.ts"
   },
   "devDependencies": {
-    "@catppuccin/palette": "^0.2.0",
     "@types/node": "^20.8.7",
-    "colorsea": "^1.2.1",
-    "scale-that-svg": "^1.0.6",
-    "svgo": "^3.0.2",
-    "tsx": "^3.14.0",
+    "tsx": "^4.7.0",
     "typescript": "^5.2.2"
   },
   "packageManager": "[email protected]"

diff --git a/src/main/kotlin/com/github/catppuccin/jetbrains_icons/IconProvider.kt b/src/main/kotlin/com/github/catppuccin/jetbrains_icons/IconProvider.kt
@@ -14,7 +14,7 @@ class IconProvider : IconProvider() {
 
         // Folders
         if (file?.isDirectory == true) {
-            return icons.FOLDER_TO_ICONS[file.name.lowercase()] ?: icons.folder
+            return icons.FOLDER_TO_ICONS[file.name.lowercase()] ?: icons._folder
         }
 
         // Files
@@ -40,6 +40,6 @@ class IconProvider : IconProvider() {
             return icons.binary
         }
 
-        return icons.file
+        return icons._file
     }
 }