material-icon-theme 3.7.1 → 4.15.0

package/src/commands/iconPacks.ts

@@ -1,65 +1,68 @@
-import * as vscode from 'vscode';
-import { IconPack } from '../models/index';
-import * as helpers from './../helpers';
-import * as i18n from './../i18n';
-
-/** Command to toggle the icons packs */
-export const toggleIconPacks = async () => {
-    try {
-        const activeIconPack = getActiveIconPack();
-        const response = await showQuickPickItems(activeIconPack);
-        handleQuickPickActions(response);
-    } catch (error) {
-        console.error(error);
-    }
-};
-
-/** Show QuickPick items to select preferred configuration for the icon packs. */
-const showQuickPickItems = (activePack: string) => {
-    const packs = [...getAllIconPacks().sort(), 'none'];
-    const options = packs.map((pack): vscode.QuickPickItem => {
-        const packLabel = helpers.toTitleCase(pack.replace('_', ' + '));
-        const active = isPackActive(activePack, pack);
-        const iconPacksDeactivated = pack === 'none' && activePack === '';
-
-        return {
-            description: packLabel,
-            detail: i18n.translate(`iconPacks.${pack === 'none' ? 'disabled' : 'description'}`, packLabel),
-            label: iconPacksDeactivated ? '\u2714' : active ? '\u2714' : '\u25FB'
-        };
-    });
-
-    return vscode.window.showQuickPick(options, {
-        placeHolder: i18n.translate('iconPacks.selectPack'),
-        ignoreFocusOut: false,
-        matchOnDescription: true,
-        matchOnDetail: true
-    });
-};
-
-/** Handle the actions from the QuickPick. */
-const handleQuickPickActions = (value: vscode.QuickPickItem) => {
-    if (!value || !value.description) return;
-    const decision = value.description.replace(' + ', '_').toLowerCase();
-
-    helpers.setThemeConfig('activeIconPack', decision === 'none' ? '' : decision, true);
-};
-
-const getActiveIconPack = (): string => {
-    return helpers.getMaterialIconsJSON().options.activeIconPack;
-};
-
-/** Get all packs that can be used in this icon theme. */
-export const getAllIconPacks = () => {
-    const packs: string[] = [];
-    for (let item in IconPack) {
-        if (isNaN(Number(item))) {
-            packs.push(IconPack[item].toLowerCase());
-        }
-    }
-    return packs;
-};
-
-const isPackActive = (activePack: string, pack: string) => {
-    return activePack.toLowerCase() === pack.toLowerCase();
-};
+import * as vscode from 'vscode';
+import { IconPack } from '../models/index';
+import * as helpers from './../helpers';
+import * as i18n from './../i18n';
+
+/** Command to toggle the icons packs */
+export const toggleIconPacks = async () => {
+  try {
+    const activeIconPack = getActiveIconPack();
+    const response = await showQuickPickItems(activeIconPack);
+    if (response) {
+      handleQuickPickActions(response);
+    }
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+/** Show QuickPick items to select preferred configuration for the icon packs. */
+const showQuickPickItems = (activePack: string) => {
+  const packs = [...getAllIconPacks().sort(), 'none'];
+  const options = packs.map((pack): vscode.QuickPickItem => {
+    const packLabel = helpers.toTitleCase(pack.replace('_', ' + '));
+    const active = isPackActive(activePack, pack);
+    const iconPacksDeactivated = pack === 'none' && activePack === '';
+
+    return {
+      description: packLabel,
+      detail: i18n.translate(
+        `iconPacks.${pack === 'none' ? 'disabled' : 'description'}`,
+        packLabel
+      ),
+      label: iconPacksDeactivated ? '\u2714' : active ? '\u2714' : '\u25FB',
+    };
+  });
+
+  return vscode.window.showQuickPick(options, {
+    placeHolder: i18n.translate('iconPacks.selectPack'),
+    ignoreFocusOut: false,
+    matchOnDescription: true,
+    matchOnDetail: true,
+  });
+};
+
+/** Handle the actions from the QuickPick. */
+const handleQuickPickActions = (value: vscode.QuickPickItem) => {
+  if (!value || !value.description) return;
+  const decision = value.description.replace(' + ', '_').toLowerCase();
+
+  helpers.setThemeConfig(
+    'activeIconPack',
+    decision === 'none' ? '' : decision,
+    true
+  );
+};
+
+const getActiveIconPack = (): string => {
+  return helpers.getMaterialIconsJSON()?.options?.activeIconPack ?? '';
+};
+
+/** Get all packs that can be used in this icon theme. */
+export const getAllIconPacks = (): string[] => {
+  return Object.values(IconPack).map((p) => p.toLowerCase());
+};
+
+const isPackActive = (activePack: string, pack: string) => {
+  return activePack.toLowerCase() === pack.toLowerCase();
+};

package/src/commands/index.ts

@@ -1,27 +1,30 @@
-import * as vscode from 'vscode';
-import { activateIcons } from './activate';
-import { toggleFolderArrows } from './folderArrows';
-import { changeFolderColor } from './folderColor';
-import { changeFolderTheme } from './folders';
-import { toggleGrayscale } from './grayscale';
-import { toggleIconPacks } from './iconPacks';
-import { changeOpacity } from './opacity';
-import { restoreDefaultConfig } from './restoreConfig';
-import { changeSaturation } from './saturation';
-
-const commands = {
-    activateIcons,
-    toggleIconPacks,
-    changeFolderTheme,
-    changeFolderColor,
-    restoreDefaultConfig,
-    toggleFolderArrows,
-    changeOpacity,
-    toggleGrayscale,
-    changeSaturation
-};
-
-export const registered = Object.keys(commands).map(commandName => {
-    const callCommand = () => commands[commandName]();
-    return vscode.commands.registerCommand(`material-icon-theme.${commandName}`, callCommand);
-});
+import * as vscode from 'vscode';
+import { activateIcons } from './activate';
+import { toggleExplorerArrows } from './explorerArrows';
+import { changeFolderColor } from './folderColor';
+import { changeFolderTheme } from './folders';
+import { toggleGrayscale } from './grayscale';
+import { toggleIconPacks } from './iconPacks';
+import { changeOpacity } from './opacity';
+import { restoreDefaultConfig } from './restoreConfig';
+import { changeSaturation } from './saturation';
+
+const commands: { [commmand: string]: () => Promise<void> } = {
+  activateIcons,
+  toggleIconPacks,
+  changeFolderTheme,
+  changeFolderColor,
+  restoreDefaultConfig,
+  toggleExplorerArrows,
+  changeOpacity,
+  toggleGrayscale,
+  changeSaturation,
+};
+
+export const registered = Object.keys(commands).map((commandName) => {
+  const callCommand = () => commands[commandName]();
+  return vscode.commands.registerCommand(
+    `material-icon-theme.${commandName}`,
+    callCommand
+  );
+});

package/src/commands/opacity.ts

@@ -1,47 +1,46 @@
-import * as vscode from 'vscode';
-import { getDefaultIconOptions, validateOpacityValue } from '../icons';
-import * as helpers from './../helpers';
-import * as i18n from './../i18n';
-
-/** Command to toggle the folder icons. */
-export const changeOpacity = async () => {
-    try {
-        const currentOpacityValue = getCurrentOpacityValue();
-        const response = Number(await showInput(currentOpacityValue));
-        return setOpacityConfig(response);
-    } catch (error) {
-        console.error(error);
-    }
-};
-
-/** Show input to enter the opacity value. */
-const showInput = (opacity: number) => {
-    return vscode.window.showInputBox({
-        placeHolder: i18n.translate('opacity.inputPlaceholder'),
-        ignoreFocusOut: true,
-        value: String(opacity),
-        validateInput: validateOpacityInput
-    });
-};
-
-/** Validate the opacity value which was inserted by the user. */
-const validateOpacityInput = (opacityInput: string) => {
-    if (!validateOpacityValue(+opacityInput)) {
-        return i18n.translate('opacity.wrongValue');
-    }
-    return undefined;
-};
-
-/** Get the current value of the opacity of the icons. */
-export const getCurrentOpacityValue = (): number => {
-    const defaultOptions = getDefaultIconOptions();
-    const config = helpers.getMaterialIconsJSON();
-    return config.options.opacity === undefined ?
-        defaultOptions.opacity : config.options.opacity;
-};
-
-const setOpacityConfig = (opacity: number) => {
-    if (opacity !== undefined) {
-        return helpers.setThemeConfig('opacity', opacity, true);
-    }
-};
+import * as vscode from 'vscode';
+import { getDefaultIconOptions, validateOpacityValue } from '../icons';
+import * as helpers from './../helpers';
+import * as i18n from './../i18n';
+
+/** Command to toggle the folder icons. */
+export const changeOpacity = async () => {
+  try {
+    const currentOpacityValue = getCurrentOpacityValue();
+    const response = await showInput(currentOpacityValue);
+    if (response) {
+      await setOpacityConfig(+response);
+    }
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+/** Show input to enter the opacity value. */
+const showInput = (opacity: number) => {
+  return vscode.window.showInputBox({
+    placeHolder: i18n.translate('opacity.inputPlaceholder'),
+    ignoreFocusOut: true,
+    value: opacity.toString(),
+    validateInput: validateOpacityInput,
+  });
+};
+
+/** Validate the opacity value which was inserted by the user. */
+const validateOpacityInput = (opacityInput: string) => {
+  if (!validateOpacityValue(+opacityInput)) {
+    return i18n.translate('opacity.wrongValue');
+  }
+  return undefined;
+};
+
+/** Get the current value of the opacity of the icons. */
+export const getCurrentOpacityValue = (): number => {
+  const defaultOptions = getDefaultIconOptions();
+  const config = helpers.getMaterialIconsJSON();
+  return config?.options?.opacity ?? defaultOptions.opacity;
+};
+
+const setOpacityConfig = (opacity: number) => {
+  return helpers.setThemeConfig('opacity', opacity, true);
+};

package/src/commands/restoreConfig.ts

@@ -1,14 +1,14 @@
-import * as helpers from './../helpers';
-
-/** Restore all configurations to default. */
-export const restoreDefaultConfig = () => {
-    helpers.setThemeConfig('activeIconPack', undefined, true);
-    helpers.setThemeConfig('folders.theme', undefined, true);
-    helpers.setThemeConfig('folders.color', undefined, true);
-    helpers.setThemeConfig('hidesExplorerArrows', undefined, true);
-    helpers.setThemeConfig('opacity', undefined, true);
-    helpers.setThemeConfig('saturation', undefined, true);
-    helpers.setThemeConfig('files.associations', undefined, true);
-    helpers.setThemeConfig('folders.associations', undefined, true);
-    helpers.setThemeConfig('languages.associations', undefined, true);
-};
+import { setThemeConfig } from './../helpers';
+
+/** Restore all configurations to default. */
+export const restoreDefaultConfig = async () => {
+  await setThemeConfig('activeIconPack', undefined, true);
+  await setThemeConfig('folders.theme', undefined, true);
+  await setThemeConfig('folders.color', undefined, true);
+  await setThemeConfig('hidesExplorerArrows', undefined, true);
+  await setThemeConfig('opacity', undefined, true);
+  await setThemeConfig('saturation', undefined, true);
+  await setThemeConfig('files.associations', undefined, true);
+  await setThemeConfig('folders.associations', undefined, true);
+  await setThemeConfig('languages.associations', undefined, true);
+};

package/src/commands/saturation.ts

@@ -1,47 +1,46 @@
-import * as vscode from 'vscode';
-import { getDefaultIconOptions, validateSaturationValue } from '../icons';
-import * as helpers from './../helpers';
-import * as i18n from './../i18n';
-
-/** Command to toggle the folder icons. */
-export const changeSaturation = async () => {
-    try {
-        const currentSaturationValue = getCurrentSaturationValue();
-        const response = Number(await showInput(currentSaturationValue));
-        setSaturationConfig(response);
-    } catch (error) {
-        console.error(error);
-    }
-};
-
-/** Show input to enter the saturation value. */
-const showInput = (saturation: number) => {
-    return vscode.window.showInputBox({
-        placeHolder: i18n.translate('saturation.inputPlaceholder'),
-        ignoreFocusOut: true,
-        value: String(saturation),
-        validateInput: validateSaturationInput
-    });
-};
-
-/** Validate the saturation value which was inserted by the user. */
-const validateSaturationInput = (saturationInput: string) => {
-    if (!validateSaturationValue(+saturationInput)) {
-        return i18n.translate('saturation.wrongValue');
-    }
-    return undefined;
-};
-
-/** Get the current value of the saturation of the icons. */
-export const getCurrentSaturationValue = (): number => {
-    const defaultOptions = getDefaultIconOptions();
-    const config = helpers.getMaterialIconsJSON();
-    return config.options.saturation === undefined ?
-        defaultOptions.saturation : config.options.saturation;
-};
-
-const setSaturationConfig = (saturation: number) => {
-    if (saturation !== undefined) {
-        return helpers.setThemeConfig('saturation', saturation, true);
-    }
-};
+import * as vscode from 'vscode';
+import { getDefaultIconOptions, validateSaturationValue } from '../icons';
+import * as helpers from './../helpers';
+import * as i18n from './../i18n';
+
+/** Command to toggle the folder icons. */
+export const changeSaturation = async () => {
+  try {
+    const currentSaturationValue = getCurrentSaturationValue();
+    const response = await showInput(currentSaturationValue);
+    if (response) {
+      await setSaturationConfig(+response);
+    }
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+/** Show input to enter the saturation value. */
+const showInput = (saturation: number) => {
+  return vscode.window.showInputBox({
+    placeHolder: i18n.translate('saturation.inputPlaceholder'),
+    ignoreFocusOut: true,
+    value: saturation.toString(),
+    validateInput: validateSaturationInput,
+  });
+};
+
+/** Validate the saturation value which was inserted by the user. */
+const validateSaturationInput = (saturationInput: string) => {
+  if (!validateSaturationValue(+saturationInput)) {
+    return i18n.translate('saturation.wrongValue');
+  }
+  return undefined;
+};
+
+/** Get the current value of the saturation of the icons. */
+export const getCurrentSaturationValue = (): number => {
+  const defaultOptions = getDefaultIconOptions();
+  const config = helpers.getMaterialIconsJSON();
+  return config?.options?.saturation ?? defaultOptions.saturation;
+};
+
+const setSaturationConfig = (saturation: number) => {
+  return helpers.setThemeConfig('saturation', saturation, true);
+};

package/src/extension.ts

@@ -1,35 +1,35 @@
-'use strict';
-
-import * as vscode from 'vscode';
-import * as commands from './commands';
-import { detectConfigChanges } from './helpers/changeDetection';
-import { checkThemeStatus } from './helpers/versioning';
-import * as i18n from './i18n';
-import { showStartMessages } from './messages/start';
-
-/**
- * This method is called when the extension is activated.
- * It initializes the core functionality of the extension.
- */
-export const activate = async (context: vscode.ExtensionContext) => {
-    try {
-        await i18n.initTranslations();
-        const status = await checkThemeStatus(context.globalState);
-        showStartMessages(status);
-
-        // Subscribe to the extension commands
-        context.subscriptions.push(...commands.registered);
-
-        // Initially trigger the config change detection
-        detectConfigChanges();
-
-        // Observe changes in the config
-        vscode.workspace.onDidChangeConfiguration(detectConfigChanges);
-    } catch (error) {
-        console.error(error);
-    }
-};
-
-/** This method is called when the extension is deactivated */
-export const deactivate = () => {
-};
+'use strict';
+
+import * as vscode from 'vscode';
+import * as commands from './commands';
+import { detectConfigChanges } from './helpers/changeDetection';
+import { checkThemeStatus, versionKey } from './helpers/versioning';
+import * as i18n from './i18n';
+import { showStartMessages } from './messages/start';
+
+/**
+ * This method is called when the extension is activated.
+ * It initializes the core functionality of the extension.
+ */
+export const activate = async (context: vscode.ExtensionContext) => {
+  try {
+    await i18n.initTranslations();
+    context.globalState.setKeysForSync([versionKey]);
+    const status = await checkThemeStatus(context.globalState);
+    showStartMessages(status);
+
+    // Subscribe to the extension commands
+    context.subscriptions.push(...commands.registered);
+
+    // Initially trigger the config change detection
+    detectConfigChanges();
+
+    // Observe changes in the config
+    vscode.workspace.onDidChangeConfiguration(detectConfigChanges);
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+/** This method is called when the extension is deactivated */
+export const deactivate = () => {};

package/src/helpers/changeDetection.ts

@@ -1,58 +1,68 @@
-import { getConfigProperties, getMaterialIconsJSON, getThemeConfig, promptToReload } from '.';
-import { createIconFile } from '../icons/index';
-import { IconJsonOptions } from '../models';
-import { getObjectPropertyValue, setObjectPropertyValue } from './objects';
-
-/** Compare the workspace and the user configurations with the current setup of the icons. */
-export const detectConfigChanges = () => {
-    const configs = Object.keys(getConfigProperties())
-        .map(c => c.split('.').slice(1).join('.'));
-
-    const changes = compareConfigs(configs);
-
-    // if there's nothing to update
-    if (Object.keys(changes.updatedConfigs).length === 0) return;
-
-    try {
-        // update icon json file with new options
-        createIconFile(changes.updatedConfigs, changes.updatedJSONConfig);
-
-        // check if a reload of the editor is required
-        const configRequiresReload = ['opacity', 'saturation', 'folders.color', 'hidesExplorerArrows'];
-        const reloadRequired = configRequiresReload.some(r => getObjectPropertyValue(changes.updatedConfigs, r) !== undefined);
-        if (reloadRequired) {
-            promptToReload();
-        }
-    } catch (error) {
-        console.error(error);
-    }
-};
-
-/**
- * Compares a specific configuration in the settings with a current configuration state.
- * The current configuration state is read from the icons json file.
- * @param configs List of configuration names
- * @returns List of configurations that needs to be updated.
- */
-const compareConfigs = (configs: string[]): { updatedConfigs: IconJsonOptions, updatedJSONConfig: IconJsonOptions } => {
-    const json = getMaterialIconsJSON();
-    return configs.reduce((result, configName) => {
-        // no further actions (e.g. reload) required
-        if (/show(Welcome|Update|Reload)Message/g.test(configName)) return result;
-
-        try {
-            const themeConfig = getThemeConfig(configName);
-            const configValue = themeConfig.globalValue !== undefined ? themeConfig.globalValue : themeConfig.defaultValue;
-            const currentState = getObjectPropertyValue(json.options, configName);
-
-            if (JSON.stringify(configValue) !== JSON.stringify(currentState)) {
-                setObjectPropertyValue(json.options, configName, configValue);
-                setObjectPropertyValue(result.updatedConfigs, configName, configValue);
-            }
-        } catch (error) {
-            console.error(error);
-        }
-
-        return result;
-    }, { updatedConfigs: {}, updatedJSONConfig: json.options });
-};
+import { getConfigProperties, getMaterialIconsJSON, getThemeConfig } from '.';
+import { createIconFile } from '../icons/index';
+import { IconJsonOptions } from '../models';
+import { getObjectPropertyValue, setObjectPropertyValue } from './objects';
+
+/** Compare the workspace and the user configurations with the current setup of the icons. */
+export const detectConfigChanges = () => {
+  const changes = compareConfigs();
+
+  // if there's nothing to update
+  if (Object.keys(changes.updatedConfigs).length === 0) return;
+
+  try {
+    // update icon json file with new options
+    createIconFile(changes.updatedConfigs, changes.updatedJSONConfig);
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+/**
+ * Compares a specific configuration in the settings with a current configuration state.
+ * The current configuration state is read from the icons json file.
+ * @returns List of configurations that needs to be updated.
+ */
+const compareConfigs = (): {
+  updatedConfigs: IconJsonOptions;
+  updatedJSONConfig: IconJsonOptions;
+} => {
+  const configs = Object.keys(getConfigProperties())
+    .map((c) => c.split('.').slice(1).join('.'))
+    // remove configurable notification messages
+    .filter((c) => !/show(Welcome|Update|Reload)Message/g.test(c));
+
+  const json = getMaterialIconsJSON();
+  return configs.reduce(
+    (result, configName) => {
+      try {
+        const themeConfig = getThemeConfig(configName) ?? {
+          globalValue: '',
+          defaultValue: '',
+        };
+        const configValue = themeConfig.globalValue ?? themeConfig.defaultValue;
+        const currentState = getObjectPropertyValue(
+          json.options ?? {},
+          configName
+        );
+
+        if (JSON.stringify(configValue) !== JSON.stringify(currentState)) {
+          setObjectPropertyValue(json.options as {}, configName, configValue);
+          setObjectPropertyValue(
+            result.updatedConfigs,
+            configName,
+            configValue
+          );
+        }
+      } catch (error) {
+        console.error(error);
+      }
+
+      return result;
+    },
+    {
+      updatedConfigs: {} as IconJsonOptions,
+      updatedJSONConfig: json.options as IconJsonOptions,
+    }
+  );
+};

package/src/helpers/customIcons.ts

@@ -0,0 +1,8 @@
+import { IconJsonOptions } from '../models';
+import * as path from 'path';
+
+export const getCustomIconPaths = (options: IconJsonOptions) => {
+  return Object.values(options?.files?.associations ?? {})
+    .filter((v) => v.match(/^[.\/]+/)) // <- custom dirs have a relative path to the dist folder
+    .map((v) => path.dirname(path.join(__dirname, v)));
+};