Refactor extension

svipas · Feb 13, 2020 · 2999f75 · 2999f75
1 parent 3af792e
commit 2999f75
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 42 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -1,20 +1,20 @@
 import * as vscode from 'vscode';
 import { ExtensionCommand } from './extension-command';
-import { message } from './message';
-import { progressBadge } from './progress-badge';
+import { Message } from './message';
+import { ProgressBadge } from './progress-badge';
 
 export function activate(context: vscode.ExtensionContext) {
-  const messageKeys = Object.keys(message);
-
   context.subscriptions.push(
-    vscode.commands.registerCommand(ExtensionCommand.SHOW_INFORMATION_MESSAGE, () => message.showInfo()),
-    vscode.commands.registerCommand(ExtensionCommand.SHOW_WARNING_MESSAGE, () => message.showWarn()),
-    vscode.commands.registerCommand(ExtensionCommand.SHOW_ERROR_MESSAGE, () => message.showError()),
+    vscode.commands.registerCommand(ExtensionCommand.SHOW_INFORMATION_MESSAGE, () => Message.info()),
+    vscode.commands.registerCommand(ExtensionCommand.SHOW_WARNING_MESSAGE, () => Message.warn()),
+    vscode.commands.registerCommand(ExtensionCommand.SHOW_ERROR_MESSAGE, () => Message.error()),
     vscode.commands.registerCommand(ExtensionCommand.SHOW_ALL_MESSAGES, () => {
-      messageKeys.forEach(key => message[key]());
+      Message.info();
+      Message.warn();
+      Message.error();
     }),
-    vscode.commands.registerCommand(ExtensionCommand.START_PROGRESS_BADGE, () => progressBadge.start()),
-    vscode.commands.registerCommand(ExtensionCommand.STOP_PROGRESS_BADGE, () => progressBadge.stop())
+    vscode.commands.registerCommand(ExtensionCommand.START_PROGRESS_BADGE, () => ProgressBadge.start()),
+    vscode.commands.registerCommand(ExtensionCommand.STOP_PROGRESS_BADGE, () => ProgressBadge.stop())
   );
 }
 

diff --git a/src/message.ts b/src/message.ts
@@ -1,15 +1,15 @@
 import * as vscode from 'vscode';
 
-function showInfo() {
-  vscode.window.showInformationMessage('Information message.', { title: 'Yes' }, { title: 'No' });
+export class Message {
+  static info() {
+    vscode.window.showInformationMessage('Information message.', { title: 'Yes' }, { title: 'No' });
+  }
+
+  static warn() {
+    vscode.window.showWarningMessage('Warning message.', { title: 'Yes' }, { title: 'No' });
+  }
+
+  static error() {
+    vscode.window.showErrorMessage('Error message.', { title: 'Yes' }, { title: 'No' });
+  }
 }
-
-function showWarn() {
-  vscode.window.showWarningMessage('Warning message.', { title: 'Yes' }, { title: 'No' });
-}
-
-function showError() {
-  vscode.window.showErrorMessage('Error message.', { title: 'Yes' }, { title: 'No' });
-}
-
-export const message = { showInfo, showWarn, showError };
diff --git a/src/progress-badge.ts b/src/progress-badge.ts
@@ -1,28 +1,28 @@
 import * as vscode from 'vscode';
 
-let resolveFn: () => void;
+export class ProgressBadge {
+  private static resolveFn?: () => void;
 
-function start() {
-  if (resolveFn) {
-    vscode.window.showWarningMessage('Progress Badge is already visible in Source Control!');
-    return;
+  static start() {
+    if (this.resolveFn) {
+      vscode.window.showWarningMessage('Progress Badge is already visible in Source Control!');
+      return;
+    }
+
+    vscode.window.withProgress({ location: vscode.ProgressLocation.SourceControl }, () => {
+      vscode.window.showInformationMessage('Progress Badge is visible in Source Control.');
+      return new Promise(resolve => (this.resolveFn = resolve));
+    });
   }
 
-  vscode.window.withProgress({ location: vscode.ProgressLocation.SourceControl }, () => {
-    vscode.window.showInformationMessage('Progress Badge is visible in Source Control.');
-    return new Promise(resolve => (resolveFn = resolve));
-  });
-}
+  static stop() {
+    if (!this.resolveFn) {
+      vscode.window.showWarningMessage('Progress Badge is already stopped!');
+      return;
+    }
 
-function stop() {
-  if (!resolveFn) {
-    vscode.window.showWarningMessage('Progress Badge is already stopped!');
-    return;
+    this.resolveFn();
+    this.resolveFn = undefined;
+    vscode.window.showInformationMessage('Progress Badge is stopped.');
   }
-
-  resolveFn();
-  resolveFn = undefined;
-  vscode.window.showInformationMessage('Progress Badge is stopped.');
 }
-
-export const progressBadge = { start, stop };