refactor: use ctx.subscriptions, optimize types

catppuccin · Sep 8, 2023 · c3697da · c3697da
1 parent aea8f71
commit c3697da
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 76 deletions.
diff --git a/src/browser.ts b/src/browser.ts
@@ -1,14 +1,18 @@
-import { workspace, ConfigurationChangeEvent, window } from "vscode";
+import {
+  workspace,
+  ConfigurationChangeEvent,
+  window,
+  ExtensionContext,
+} from "vscode";
 
-export const activate = () => {
-  // regenerate the theme files when the config changes
-  workspace.onDidChangeConfiguration((event: ConfigurationChangeEvent) => {
-    if (event.affectsConfiguration("catppuccin")) {
-      window.showInformationMessage(
-        "VSCode Web doesn't support advanced Catppuccin options at the moment.",
-      );
-    }
-  });
+export const activate = (ctx: ExtensionContext) => {
+  ctx.subscriptions.push(
+    workspace.onDidChangeConfiguration((event: ConfigurationChangeEvent) => {
+      if (event.affectsConfiguration("catppuccin")) {
+        window.showErrorMessage(
+          "VSCode Web doesn't support advanced Catppuccin options at the moment.",
+        );
+      }
+    }),
+  );
 };
-
-export const deactivate = () => {};
diff --git a/src/main.ts b/src/main.ts
@@ -1,9 +1,9 @@
 import {
-  workspace,
   ConfigurationChangeEvent,
-  extensions,
   ExtensionContext,
   Uri,
+  extensions,
+  workspace,
 } from "vscode";
 import utils, { UpdateTrigger } from "./utils";
 import type { ThemePaths } from "./types";
@@ -26,35 +26,39 @@ export const activate = async (ctx: ExtensionContext) => {
     );
   }
 
-  // regenerate the theme files when the config changes
-  workspace.onDidChangeConfiguration((event: ConfigurationChangeEvent) => {
-    if (
-      event.affectsConfiguration("workbench.colorTheme") &&
-      extensions.getExtension("catppuccin.catppuccin-vsc-icons")
-    ) {
-      const theme = workspace
+  ctx.subscriptions.push(
+    // regenerate the theme files when the config changes
+    workspace.onDidChangeConfiguration((event) => handler(event, paths)),
+  );
+};
+
+const handler = (event: ConfigurationChangeEvent, paths: ThemePaths) => {
+  const id = "catppuccin.catppuccin-vsc-icons";
+  const iconsInstalled = extensions.getExtension(id).isActive;
+  const iconsAffected = event.affectsConfiguration("workbench.colorTheme");
+
+  if (iconsInstalled && iconsAffected) {
+    const theme = workspace
+      .getConfiguration("workbench")
+      .get<string>("colorTheme");
+    const ctp_themes = {
+      "Catppuccin Latte": "catppuccin-latte",
+      "Catppuccin Frappé": "catppuccin-frappe",
+      "Catppuccin Macchiato": "catppuccin-macchiato",
+      "Catppuccin Mocha": "catppuccin-mocha",
+    };
+    if (Object.keys(ctp_themes).includes(theme)) {
+      workspace
         .getConfiguration("workbench")
-        .get<string>("colorTheme");
-      const ctp_themes = {
-        "Catppuccin Latte": "catppuccin-latte",
-        "Catppuccin Frappé": "catppuccin-frappe",
-        "Catppuccin Macchiato": "catppuccin-macchiato",
-        "Catppuccin Mocha": "catppuccin-mocha",
-      };
-      if (Object.keys(ctp_themes).includes(theme)) {
-        workspace
-          .getConfiguration("workbench")
-          .update("iconTheme", ctp_themes[theme], true);
-      }
-    }
-    if (event.affectsConfiguration("catppuccin")) {
-      utils.updateThemes(
-        utils.getConfiguration(),
-        paths,
-        UpdateTrigger.CONFIG_CHANGE,
-      );
+        .update("iconTheme", ctp_themes[theme], true);
     }
-  });
-};
+  }
 
-export const deactivate = () => {};
+  if (event.affectsConfiguration("catppuccin")) {
+    utils.updateThemes(
+      utils.getConfiguration(),
+      paths,
+      UpdateTrigger.CONFIG_CHANGE,
+    );
+  }
+};
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
@@ -1,4 +1,4 @@
-import { variants } from "@catppuccin/palette";
+import { labels, variants } from "@catppuccin/palette";
 
 import type { Uri } from "vscode";
 
@@ -29,35 +29,11 @@ export type CatppuccinBracketMode =
   | "monochromatic"
   | "neovim";
 
-export interface CatppuccinPalette {
+export type CatppuccinPalette = {
   name: CatppuccinFlavour;
-  rosewater: string;
-  flamingo: string;
-  pink: string;
-  mauve: string;
-  red: string;
-  maroon: string;
-  peach: string;
-  yellow: string;
-  green: string;
-  teal: string;
-  sky: string;
-  sapphire: string;
-  blue: string;
-  lavender: string;
-  text: string;
-  subtext1: string;
-  subtext0: string;
-  overlay2: string;
-  overlay1: string;
-  overlay0: string;
-  surface2: string;
-  surface1: string;
-  surface0: string;
-  base: string;
-  mantle: string;
-  crust: string;
-}
+} & {
+  [k in keyof typeof labels]: string;
+};
 
 export type ColorOverrides = {
   all?: Partial<CatppuccinPalette>;

diff --git a/src/utils.ts b/src/utils.ts
@@ -109,10 +109,7 @@ class Utils {
     });
 
     Promise.all(promises)
-      .then((x) => {
-        window.showInformationMessage(
-          "Catppuccin: Themes updated. " + JSON.stringify(x),
-        );
+      .then(() => {
         this.promptToReload(trigger);
       })
       .catch((err) => {