Refactored code

Author: PKief

src/commands/activate.ts

@@ -5,7 +5,7 @@ import * as i18n from './../i18n';
 import * as outdatedMessage from './../messages/outdated';
 
 /** Activate the icon theme by changing the settings for the iconTheme. */
-export const activateIconTheme = () => {
+export const activateIcons = () => {
     if (!versioning.checkVersionSupport('1.10.0')) {
         outdatedMessage.showOutdatedMessage();
         console.error('Outdated version of vscode!');

src/commands/index.ts

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode';
-import { activateIconTheme } from './activate';
+import { activateIcons } from './activate';
 import { toggleFolderArrows } from './folderArrows';
 import { changeFolderColor } from './folderColor';
 import { changeFolderTheme } from './folders';
@@ -9,59 +9,19 @@ import { changeOpacity } from './opacity';
 import { restoreDefaultConfig } from './restoreConfig';
 import { changeSaturation } from './saturation';
 
-// Activate theme
-const activateThemeCommand = vscode.commands.registerCommand('material-icon-theme.activateIcons', () => {
-    activateIconTheme();
+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);
 });
-
-// Icon packs
-const toggleIconPacksCommand = vscode.commands.registerCommand('material-icon-theme.toggleIconPacks', () => {
-    toggleIconPacks();
-});
-
-// Folder themes
-const changeFolderThemeCommand = vscode.commands.registerCommand('material-icon-theme.changeFolderTheme', () => {
-    changeFolderTheme();
-});
-
-// Folder color
-const toggleFolderColorCommand = vscode.commands.registerCommand('material-icon-theme.changeFolderColor', () => {
-    changeFolderColor();
-});
-
-// Reset config
-const restoreDefaultConfigCommand = vscode.commands.registerCommand('material-icon-theme.restoreDefaultConfig', () => {
-    restoreDefaultConfig();
-});
-
-// Toggle the arrows near the folder icons
-const hidesExplorerArrowsCommand = vscode.commands.registerCommand('material-icon-theme.hidesExplorerArrows', () => {
-    toggleFolderArrows();
-});
-
-// Change the opacity of the icons
-const changeOpacityCommand = vscode.commands.registerCommand('material-icon-theme.opacity', () => {
-    changeOpacity();
-});
-
-// Toggle grayscale icons
-const grayscaleCommand = vscode.commands.registerCommand('material-icon-theme.grayscale', () => {
-    toggleGrayscale();
-});
-
-// Change the saturation of the icons
-const changeSaturationCommand = vscode.commands.registerCommand('material-icon-theme.saturation', () => {
-    changeSaturation();
-});
-
-export const commands = [
-    activateThemeCommand,
-    toggleIconPacksCommand,
-    changeFolderThemeCommand,
-    toggleFolderColorCommand,
-    restoreDefaultConfigCommand,
-    hidesExplorerArrowsCommand,
-    changeOpacityCommand,
-    grayscaleCommand,
-    changeSaturationCommand
-];

src/extension.ts

@@ -17,8 +17,8 @@ export const activate = async (context: vscode.ExtensionContext) => {
         const status = await checkThemeStatus(context.globalState);
         showStartMessages(status);
 
-        // Register the extension commands
-        context.subscriptions.push(...commands.commands);
+        // Subscribe to the extension commands
+        context.subscriptions.push(...commands.registered);
 
         // Initially trigger the config change detection
         detectConfigChanges();

src/messages/update.ts

@@ -1,6 +1,6 @@
 import * as opn from 'opn';
 import * as vscode from 'vscode';
-import { activateIconTheme } from '../commands/activate';
+import { activateIcons } from '../commands/activate';
 import * as helpers from './../helpers';
 import * as versioning from './../helpers/versioning';
 import * as i18n from './../i18n';
@@ -26,7 +26,7 @@ export const showUpdateMessage = () => {
 const handleUpdateMessageActions = (value) => {
     switch (value) {
         case i18n.translate('activate'):
-            activateIconTheme();
+            activateIcons();
             break;
 
         case i18n.translate('readChangelog'):

src/messages/welcome.ts

@@ -1,6 +1,6 @@
 import * as opn from 'opn';
 import * as vscode from 'vscode';
-import { activateIconTheme } from '../commands/activate';
+import { activateIcons } from '../commands/activate';
 import * as helpers from './../helpers';
 import * as versioning from './../helpers/versioning';
 import * as i18n from './../i18n';
@@ -25,7 +25,7 @@ export const showWelcomeMessage = () => {
 const handleWelcomeMessageActions = (value) => {
     switch (value) {
         case i18n.translate('activate'):
-            activateIconTheme();
+            activateIcons();
             break;
 
         case i18n.translate('howToActivate'):