Removed no-longer-adding-value MessageBar class

Author: ryu1kn

src/lib/command-factory.ts

@@ -5,7 +5,6 @@ import CompareVisibleEditorsCommand from './commands/compare-visible-editors';
 import TextTitleBuilder from './text-title-builder';
 import Clipboard from './clipboard';
 import DiffPresenter from './diff-presenter';
-import MessageBar from './message-bar';
 import NormalisationRulePicker from './normalisation-rule-picker';
 import ToggleNormalisationRulesCommand from './commands/toggle-normalisation-rules';
 import NormalisationRuleStore from './normalisation-rule-store';
@@ -22,7 +21,6 @@ export default class CommandFactory {
     private readonly getCurrentDate: () => Date;
     private clipboard?: Clipboard;
     private diffPresenter?: DiffPresenter;
-    private messageBar?: MessageBar;
 
     constructor(selectionInfoRegistry: SelectionInfoRegistry,
                 normalisationRuleStore: NormalisationRuleStore,
@@ -59,7 +57,6 @@ export default class CommandFactory {
         return new CompareVisibleEditorsCommand(
             this.getDiffPresenter(),
             this.selectionInfoRegistry,
-            this.getMessageBar(),
             this.windowAdaptor
         );
     }
@@ -68,7 +65,7 @@ export default class CommandFactory {
         return new ToggleNormalisationRulesCommand(
             this.normalisationRuleStore,
             new NormalisationRulePicker(this.windowAdaptor),
-            this.getMessageBar()
+            this.windowAdaptor
         );
     }
 
@@ -82,11 +79,6 @@ export default class CommandFactory {
         return this.diffPresenter;
     }
 
-    private getMessageBar() {
-        this.messageBar = this.messageBar || this.createMessageBar();
-        return this.messageBar;
-    }
-
     private createClipboard() {
         return new Clipboard(clipboardy, process.platform);
     }
@@ -100,8 +92,4 @@ export default class CommandFactory {
             this.getCurrentDate
         );
     }
-
-    private createMessageBar() {
-        return new MessageBar(this.windowAdaptor);
-    }
 }

src/lib/commands/compare-visible-editors.ts

@@ -1,5 +1,4 @@
 import DiffPresenter from '../diff-presenter';
-import MessageBar from '../message-bar';
 import SelectionInfoRegistry from '../selection-info-registry';
 import {TextKey} from '../const';
 import {SelectionInfo} from '../entities/selection-info';
@@ -9,23 +8,20 @@ import WindowAdaptor from '../adaptors/window';
 export default class CompareVisibleEditorsCommand implements Command {
     private readonly windowAdaptor: WindowAdaptor;
     private readonly diffPresenter: DiffPresenter;
-    private readonly messageBar: MessageBar;
     private readonly selectionInfoRegistry: SelectionInfoRegistry;
 
     constructor(diffPresenter: DiffPresenter,
                 selectionInfoRegistry: SelectionInfoRegistry,
-                messageBar: MessageBar,
                 windowAdaptor: WindowAdaptor) {
         this.windowAdaptor = windowAdaptor;
         this.diffPresenter = diffPresenter;
-        this.messageBar = messageBar;
         this.selectionInfoRegistry = selectionInfoRegistry;
     }
 
     async execute() {
         const editors = this.windowAdaptor.visibleTextEditors;
         if (editors.length !== 2) {
-            this.messageBar.showInfo('Please first open 2 documents to compare.');
+            this.windowAdaptor.showInformationMessage('Please first open 2 documents to compare.');
             return;
         }
 

src/lib/commands/toggle-normalisation-rules.ts

@@ -1,17 +1,17 @@
-import MessageBar from '../message-bar';
 import NormalisationRulePicker from '../normalisation-rule-picker';
 import NormalisationRuleStore from '../normalisation-rule-store';
 import {Command} from './command';
+import WindowAdaptor from '../adaptors/window';
 
 export default class ToggleNormalisationRulesCommand implements Command {
-    private readonly messageBar: MessageBar;
+    private readonly windowAdaptor: WindowAdaptor;
     private readonly normalisationRulePicker: NormalisationRulePicker;
     private readonly normalisationRuleStore: NormalisationRuleStore;
 
     constructor(normalisationRuleStore: NormalisationRuleStore,
                 normalisationRulePicker: NormalisationRulePicker,
-                messageBar: MessageBar) {
-        this.messageBar = messageBar;
+                windowAdaptor: WindowAdaptor) {
+        this.windowAdaptor = windowAdaptor;
         this.normalisationRulePicker = normalisationRulePicker;
         this.normalisationRuleStore = normalisationRuleStore;
     }
@@ -22,7 +22,7 @@ export default class ToggleNormalisationRulesCommand implements Command {
             const newRules = await this.normalisationRulePicker.show(rules);
             this.normalisationRuleStore.specifyActiveRules(newRules);
         } else {
-            await this.messageBar.showInfo(
+            await this.windowAdaptor.showInformationMessage(
                 'Please set `partialDiff.preComparisonTextNormalizationRules` first'
             );
         }

src/lib/message-bar.ts

@@ -2,7 +2,6 @@ import CompareVisibleEditorsCommand from '../../../lib/commands/compare-visible-
 import {mockMethods, mockType, verify} from '../../helpers';
 import DiffPresenter from '../../../lib/diff-presenter';
 import SelectionInfoRegistry from '../../../lib/selection-info-registry';
-import MessageBar from '../../../lib/message-bar';
 import TextEditor from '../../../lib/adaptors/text-editor';
 import WindowAdaptor from '../../../lib/adaptors/window';
 
@@ -58,21 +57,19 @@ suite('CompareVisibleEditorsCommand', () => {
         await command.execute();
 
         verify(
-            deps.messageBar.showInfo('Please first open 2 documents to compare.')
+            deps.windowAdaptor.showInformationMessage('Please first open 2 documents to compare.')
         );
     });
 
     function createCommand(visibleTextEditors: TextEditor[]) {
         const dependencies = {
-            windowAdaptor: mockType<WindowAdaptor>({visibleTextEditors}),
+            windowAdaptor: mockMethods<WindowAdaptor>(['showInformationMessage'], {visibleTextEditors}),
             diffPresenter: mockMethods<DiffPresenter>(['takeDiff']),
-            messageBar: mockMethods<MessageBar>(['showInfo']),
             selectionInfoRegistry: mockMethods<SelectionInfoRegistry>(['set'])
         };
         const command = new CompareVisibleEditorsCommand(
             dependencies.diffPresenter,
             dependencies.selectionInfoRegistry,
-            dependencies.messageBar,
             dependencies.windowAdaptor
         );
         return {command, deps: dependencies} as any;

src/test/lib/commands/compare-visible-editors.test.ts

@@ -1,9 +1,9 @@
 import ToggleNormalisationRulesCommand from '../../../lib/commands/toggle-normalisation-rules';
-import {mockMethods, mockType, verify, when} from '../../helpers';
-import MessageBar from '../../../lib/message-bar';
+import {mock, mockMethods, mockType, verify, when} from '../../helpers';
 import NormalisationRuleStore from '../../../lib/normalisation-rule-store';
 import NormalisationRulePicker from '../../../lib/normalisation-rule-picker';
 import {LoadedNormalisationRule} from '../../../lib/entities/normalisation-rule';
+import WindowAdaptor from '../../../lib/adaptors/window';
 
 suite('ToggleNormalisationRulesCommand', () => {
 
@@ -23,7 +23,7 @@ suite('ToggleNormalisationRulesCommand', () => {
         await command.execute();
 
         verify(
-            deps.messageBar.showInfo(
+            deps.windowAdaptor.showInformationMessage(
                 'Please set `partialDiff.preComparisonTextNormalizationRules` first'
             )
         );
@@ -37,14 +37,14 @@ suite('ToggleNormalisationRulesCommand', () => {
         when(normalisationRulePicker.show(rules)).thenResolve('ACTIVE_RULE_INDICES');
 
         const deps = {
-            messageBar: mockMethods<MessageBar>(['showInfo']),
+            windowAdaptor: mock(WindowAdaptor),
             normalisationRulePicker,
             normalisationRuleStore
         };
         const command = new ToggleNormalisationRulesCommand(
             deps.normalisationRuleStore,
             deps.normalisationRulePicker,
-            deps.messageBar
+            deps.windowAdaptor
         );
         return {command, deps} as any;
     }