feat(options): add option to disable icon pack sync

catppuccin · Mar 15, 2024 · 2926c52 · 2926c52
1 parent 91851ec
commit 2926c52
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 10 deletions.
diff --git a/packages/catppuccin-vsc/package.json b/packages/catppuccin-vsc/package.json
@@ -74,13 +74,13 @@
           "type": "object",
           "default": {},
           "markdownDescription": "Custom color overrides. Assign your own hex codes to palette colors. See [the docs](https://github.com/catppuccin/vscode#override-palette-colors) for reference.",
-          "$ref": "https://cdn.jsdelivr.net/gh/catppuccin/vscode@catppuccin-vsc-v3.11.2/packages/catppuccin-vsc/schemas/colorOverrides.schema.json"
+          "$ref": "https://cdn.jsdelivr.net/gh/catppuccin/vscode@catppuccin-vsc-v3.12.0/packages/catppuccin-vsc/schemas/colorOverrides.schema.json"
         },
         "catppuccin.customUIColors": {
           "type": "object",
           "default": {},
           "markdownDescription": "Customize UI colors. Map `workbench.colorCustomizations` to palette colors. See [the docs](https://github.com/catppuccin/vscode#use-palette-colors-on-workbench-elements-ui) for reference.",
-          "$ref": "https://cdn.jsdelivr.net/gh/catppuccin/vscode@catppuccin-vsc-v3.11.2/packages/catppuccin-vsc/schemas/customUIColors.schema.json"
+          "$ref": "https://cdn.jsdelivr.net/gh/catppuccin/vscode@catppuccin-vsc-v3.12.0/packages/catppuccin-vsc/schemas/customUIColors.schema.json"
         },
         "catppuccin.accentColor": {
           "type": "string",
@@ -139,6 +139,11 @@
           "type": "boolean",
           "default": false,
           "description": "Controls whether borders should be enabled on some additional UI elements."
+        },
+        "catppuccin.syncWithIconPack": {
+          "type": "boolean",
+          "default": true,
+          "markdownDescription": "Controls whether to sync the currently active Catppuccin flavor with the [Catppuccin Icon Pack](https://github.com/catppuccin/vscode-icons)"
         }
       }
     }

diff --git a/packages/catppuccin-vsc/src/hooks/updatePackageJson.ts b/packages/catppuccin-vsc/src/hooks/updatePackageJson.ts
@@ -88,6 +88,12 @@ const configuration = (version: string) => {
         description:
           "Controls whether borders should be enabled on some additional UI elements.",
       },
+      "catppuccin.syncWithIconPack": {
+        type: "boolean",
+        default: true,
+        markdownDescription:
+          "Controls whether to sync the currently active Catppuccin flavor with the [Catppuccin Icon Pack](https://github.com/catppuccin/vscode-icons)",
+      },
     },
   };
 };

diff --git a/packages/catppuccin-vsc/src/main.ts b/packages/catppuccin-vsc/src/main.ts
@@ -11,13 +11,11 @@ export const activate = async (context: ExtensionContext) => {
     mocha: Uri.joinPath(base, "themes", "mocha.json"),
   };
 
+  const config = utils.getConfiguration();
+
   // regenerate on a fresh install if non-default config is set
   if ((await utils.isFreshInstall(context)) && !utils.isDefaultConfig()) {
-    utils.updateThemes(
-      utils.getConfiguration(),
-      paths,
-      utils.UpdateTrigger.FRESH_INSTALL,
-    );
+    utils.updateThemes(config, paths, utils.UpdateTrigger.FRESH_INSTALL);
   }
 
   context.subscriptions.push(
@@ -31,12 +29,17 @@ export const activate = async (context: ExtensionContext) => {
         );
       }
       // call the icon pack sync when the theme changes
-      if (event.affectsConfiguration("workbench.colorTheme")) {
+      if (
+        event.affectsConfiguration("workbench.colorTheme") &&
+        config.syncWithIconPack
+      ) {
         utils.syncToIconPack();
       }
     }),
   );
 
   // call the icon pack sync on activation
-  utils.syncToIconPack();
+  if (config.syncWithIconPack) {
+    utils.syncToIconPack();
+  }
 };
diff --git a/packages/catppuccin-vsc/src/theme/index.ts b/packages/catppuccin-vsc/src/theme/index.ts
@@ -20,6 +20,7 @@ export const defaultOptions: ThemeOptions = {
   bracketMode: "rainbow",
   extraBordersEnabled: false,
   customUIColors: {},
+  syncWithIconPack: true,
 };
 
 export const compileTheme = (

diff --git a/packages/catppuccin-vsc/src/types/index.d.ts b/packages/catppuccin-vsc/src/types/index.d.ts
@@ -61,6 +61,11 @@ export type ThemeOptions = {
    * See [the docs](https://github.com/catppuccin/vscode/tree/main/packages/catppuccin-vsc#use-palette-colors-on-workbench-elements-ui) for reference.
    */
   customUIColors: CustomUIColors;
+
+  /**
+   * Controls whether to sync the currently active Catppuccin flavor with the [Catppuccin Icon Pack](https://github.com/catppuccin/vscode-icons)
+   */
+  syncWithIconPack: boolean;
 };
 
 export type ThemePaths = {

diff --git a/packages/catppuccin-vsc/src/utils.ts b/packages/catppuccin-vsc/src/utils.ts
@@ -113,7 +113,8 @@ export const getConfiguration = (): ThemeOptions => {
     bracketMode: config.get<CatppuccinBracketMode>("bracketMode"),
     extraBordersEnabled: config.get<boolean>("extraBordersEnabled"),
     customUIColors: config.get<CustomUIColors>("customUIColors"),
-  };
+    syncWithIconPack: config.get<boolean>("syncWithIconPack"),
+  } satisfies Partial<ThemeOptions>;
   return {
     ...defaultOptions,
     ...filterObject(options, ([, value]) => value !== undefined),