Renamed WindowComponent to WindowAdaptor

ryu1kn · ryu1kn · commit cb1223c1bfc4 · 2018-08-18T19:13:13.000+10:00
diff --git a/src/lib/adaptors/window.ts b/src/lib/adaptors/window.ts
@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import TextEditor from './text-editor';
 import {QuickPickItem} from 'vscode';
 
-export default class WindowComponent {
+export default class WindowAdaptor {
     private window: typeof vscode.window;
 
     constructor(window: typeof vscode.window) {
diff --git a/src/lib/bootstrapper-factory.ts b/src/lib/bootstrapper-factory.ts
@@ -6,20 +6,20 @@ import NormalisationRuleStore from './normalisation-rule-store';
 import SelectionInfoRegistry from './selection-info-registry';
 import * as vscode from 'vscode';
 import CommandAdaptor from './adaptors/command';
-import WindowComponent from './adaptors/window';
+import WindowAdaptor from './adaptors/window';
 
 export default class BootstrapperFactory {
     create() {
         const logger = console;
         const selectionInfoRegistry = new SelectionInfoRegistry();
         const normalisationRuleStore = this.createNormalisationRuleStore();
         const commandAdaptor = new CommandAdaptor(vscode.commands, vscode.Uri.parse);
-        const windowComponent = new WindowComponent(vscode.window);
+        const windowAdaptor = new WindowAdaptor(vscode.window);
         const commandFactory = new CommandFactory(
             selectionInfoRegistry,
             normalisationRuleStore,
             commandAdaptor,
-            windowComponent,
+            windowAdaptor,
             vscode,
             () => new Date()
         );
diff --git a/src/lib/command-factory.ts b/src/lib/command-factory.ts
@@ -12,13 +12,13 @@ import NormalisationRuleStore from './normalisation-rule-store';
 import SelectionInfoRegistry from './selection-info-registry';
 import * as clipboardy from 'clipboardy';
 import CommandAdaptor from './adaptors/command';
-import WindowComponent from './adaptors/window';
+import WindowAdaptor from './adaptors/window';
 
 export default class CommandFactory {
     private readonly normalisationRuleStore: NormalisationRuleStore;
     private readonly selectionInfoRegistry: SelectionInfoRegistry;
     private readonly commandAdaptor: CommandAdaptor;
-    private readonly windowComponent: WindowComponent;
+    private readonly windowAdaptor: WindowAdaptor;
     private readonly vscode: any;
     private readonly getCurrentDate: () => Date;
     private clipboard?: Clipboard;
@@ -28,13 +28,13 @@ export default class CommandFactory {
     constructor(selectionInfoRegistry: SelectionInfoRegistry,
                 normalisationRuleStore: NormalisationRuleStore,
                 commandAdaptor: CommandAdaptor,
-                windowComponent: WindowComponent,
+                windowAdaptor: WindowAdaptor,
                 vscode: any,
                 getCurrentDate: () => Date) {
         this.normalisationRuleStore = normalisationRuleStore;
         this.selectionInfoRegistry = selectionInfoRegistry;
         this.commandAdaptor = commandAdaptor;
-        this.windowComponent = windowComponent;
+        this.windowAdaptor = windowAdaptor;
         this.getCurrentDate = getCurrentDate;
         this.vscode = vscode;
     }
@@ -63,14 +63,14 @@ export default class CommandFactory {
             this.getDiffPresenter(),
             this.selectionInfoRegistry,
             this.getMessageBar(),
-            this.windowComponent
+            this.windowAdaptor
         );
     }
 
     createToggleNormalisationRulesCommand() {
         return new ToggleNormalisationRulesCommand(
             this.normalisationRuleStore,
-            new NormalisationRulePicker(this.windowComponent),
+            new NormalisationRulePicker(this.windowAdaptor),
             this.getMessageBar()
         );
     }
diff --git a/src/lib/commands/compare-visible-editors.ts b/src/lib/commands/compare-visible-editors.ts
@@ -4,26 +4,26 @@ import SelectionInfoRegistry from '../selection-info-registry';
 import {TextKey} from '../const';
 import {SelectionInfo} from '../entities/selection-info';
 import {Command} from './command';
-import WindowComponent from '../adaptors/window';
+import WindowAdaptor from '../adaptors/window';
 
 export default class CompareVisibleEditorsCommand implements Command {
-    private readonly windowComponent: WindowComponent;
+    private readonly windowAdaptor: WindowAdaptor;
     private readonly diffPresenter: DiffPresenter;
     private readonly messageBar: MessageBar;
     private readonly selectionInfoRegistry: SelectionInfoRegistry;
 
     constructor(diffPresenter: DiffPresenter,
                 selectionInfoRegistry: SelectionInfoRegistry,
                 messageBar: MessageBar,
-                windowComponent: WindowComponent) {
-        this.windowComponent = windowComponent;
+                windowAdaptor: WindowAdaptor) {
+        this.windowAdaptor = windowAdaptor;
         this.diffPresenter = diffPresenter;
         this.messageBar = messageBar;
         this.selectionInfoRegistry = selectionInfoRegistry;
     }
 
     async execute() {
-        const editors = this.windowComponent.visibleTextEditors;
+        const editors = this.windowAdaptor.visibleTextEditors;
         if (editors.length !== 2) {
             this.messageBar.showInfo('Please first open 2 documents to compare.');
             return;
diff --git a/src/lib/normalisation-rule-picker.ts b/src/lib/normalisation-rule-picker.ts
@@ -1,22 +1,22 @@
 import {QuickPickItem} from 'vscode';
 import {LoadedNormalisationRule} from './entities/normalisation-rule';
-import WindowComponent from './adaptors/window';
+import WindowAdaptor from './adaptors/window';
 
 interface NormalisationRuleQuickPickItem extends QuickPickItem {
     picked: boolean;
     ruleIndex: number;
 }
 
 export default class NormalisationRulePicker {
-    private windowComponent: WindowComponent;
+    private windowAdaptor: WindowAdaptor;
 
-    constructor(windowComponent: WindowComponent) {
-        this.windowComponent = windowComponent;
+    constructor(windowAdaptor: WindowAdaptor) {
+        this.windowAdaptor = windowAdaptor;
     }
 
     async show(rules: LoadedNormalisationRule[]) {
         const items = this.convertToQuickPickItems(rules);
-        const userSelection = await this.windowComponent.showQuickPick(items);
+        const userSelection = await this.windowAdaptor.showQuickPick(items);
         const activeItems = userSelection || items.filter(item => item.picked);
         return this.convertToRules(activeItems);
     }
diff --git a/src/test/lib/commands/compare-selection-with-text1.test.ts b/src/test/lib/commands/compare-selection-with-text1.test.ts
@@ -5,7 +5,7 @@ import CommandFactory from '../../../lib/command-factory';
 import NormalisationRuleStore from '../../../lib/normalisation-rule-store';
 import CommandAdaptor from '../../../lib/adaptors/command';
 import TextEditor from '../../../lib/adaptors/text-editor';
-import WindowComponent from '../../../lib/adaptors/window';
+import WindowAdaptor from '../../../lib/adaptors/window';
 
 suite('CompareSelectionWithText1', () => {
 
@@ -23,13 +23,13 @@ suite('CompareSelectionWithText1', () => {
     });
 
     const fakeVscode = {window: mockType<typeof vscode.window>()};
-    const windowComponent = mock(WindowComponent);
+    const windowAdaptor = mock(WindowAdaptor);
     const normalisationRuleStore = mock(NormalisationRuleStore);
 
     test('it saves selected text and takes a diff of 2 texts', async () => {
 
         const commandAdaptor = mock(CommandAdaptor);
-        const commandFactory = new CommandFactory(selectionInfoRegistry, normalisationRuleStore, commandAdaptor, windowComponent, fakeVscode, () => new Date('2016-06-15T11:43:00Z'));
+        const commandFactory = new CommandFactory(selectionInfoRegistry, normalisationRuleStore, commandAdaptor, windowAdaptor, fakeVscode, () => new Date('2016-06-15T11:43:00Z'));
         const command = commandFactory.createCompareSelectionWithText1Command();
 
         await command.execute(editor);
diff --git a/src/test/lib/commands/compare-visible-editors.test.ts b/src/test/lib/commands/compare-visible-editors.test.ts
@@ -4,7 +4,7 @@ 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 WindowComponent from '../../../lib/adaptors/window';
+import WindowAdaptor from '../../../lib/adaptors/window';
 
 suite('CompareVisibleEditorsCommand', () => {
     const editor1 = mockType<TextEditor>({
@@ -64,7 +64,7 @@ suite('CompareVisibleEditorsCommand', () => {
 
     function createCommand(visibleTextEditors: TextEditor[]) {
         const dependencies = {
-            windowComponent: mockType<WindowComponent>({visibleTextEditors}),
+            windowAdaptor: mockType<WindowAdaptor>({visibleTextEditors}),
             diffPresenter: mockMethods<DiffPresenter>(['takeDiff']),
             messageBar: mockMethods<MessageBar>(['showInfo']),
             selectionInfoRegistry: mockMethods<SelectionInfoRegistry>(['set'])
@@ -73,7 +73,7 @@ suite('CompareVisibleEditorsCommand', () => {
             dependencies.diffPresenter,
             dependencies.selectionInfoRegistry,
             dependencies.messageBar,
-            dependencies.windowComponent
+            dependencies.windowAdaptor
         );
         return {command, deps: dependencies} as any;
     }
diff --git a/src/test/lib/normalisation-rule-picker.test.ts b/src/test/lib/normalisation-rule-picker.test.ts
@@ -1,12 +1,12 @@
 import NormalisationRulePicker from '../../lib/normalisation-rule-picker';
 import * as assert from 'assert';
 import {mock, when} from '../helpers';
-import WindowComponent from '../../lib/adaptors/window';
+import WindowAdaptor from '../../lib/adaptors/window';
 
 suite('NormalisationRulePicker', () => {
-    const windowComponent = mock(WindowComponent);
+    const windowAdaptor = mock(WindowAdaptor);
     when(
-        windowComponent.showQuickPick(
+        windowAdaptor.showQuickPick(
             [
                 {label: 'RULE_NAME_1', picked: true, ruleIndex: 0, description: ''},
                 {label: 'RULE_NAME_2', picked: false, ruleIndex: 1, description: ''}
@@ -15,7 +15,7 @@ suite('NormalisationRulePicker', () => {
     )
         .thenResolve([{label: 'RULE_NAME_2', picked: true, ruleIndex: 1}]);
     when(
-        windowComponent.showQuickPick(
+        windowAdaptor.showQuickPick(
             [
                 {label: 'RULE_NAME_3', picked: false, ruleIndex: 0, description: ''},
                 {label: 'RULE_NAME_4', picked: true, ruleIndex: 1, description: ''}
@@ -24,15 +24,15 @@ suite('NormalisationRulePicker', () => {
     )
         .thenResolve();
     when(
-        windowComponent.showQuickPick(
+        windowAdaptor.showQuickPick(
             [
                 {label: '(no "name" set for this rule)', picked: true, ruleIndex: 0, description: ''}
             ]
         )
     )
         .thenResolve([]);
 
-    const rulePicker = new NormalisationRulePicker(windowComponent);
+    const rulePicker = new NormalisationRulePicker(windowAdaptor);
 
     test('it returns the index of active rules that user chose', async () => {
         const activeRuleIndices = await rulePicker.show([

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`import NormalisationRulePicker from '../../lib/normalisation-rule-picker';`
`2`	`2`	`import * as assert from 'assert';`
`3`	`3`	`import {mock, when} from '../helpers';`
`4`		`-import WindowComponent from '../../lib/adaptors/window';`
	`4`	`+import WindowAdaptor from '../../lib/adaptors/window';`
`5`	`5`
`6`	`6`	`suite('NormalisationRulePicker', () => {`
`7`		`- const windowComponent = mock(WindowComponent);`
	`7`	`+ const windowAdaptor = mock(WindowAdaptor);`
`8`	`8`	`when(`
`9`		`- windowComponent.showQuickPick(`
	`9`	`+ windowAdaptor.showQuickPick(`
`10`	`10`	`[`
`11`	`11`	`{label: 'RULE_NAME_1', picked: true, ruleIndex: 0, description: ''},`
`12`	`12`	`{label: 'RULE_NAME_2', picked: false, ruleIndex: 1, description: ''}`
`@@ -15,7 +15,7 @@ suite('NormalisationRulePicker', () => {`
`15`	`15`	`)`
`16`	`16`	`.thenResolve([{label: 'RULE_NAME_2', picked: true, ruleIndex: 1}]);`
`17`	`17`	`when(`
`18`		`- windowComponent.showQuickPick(`
	`18`	`+ windowAdaptor.showQuickPick(`
`19`	`19`	`[`
`20`	`20`	`{label: 'RULE_NAME_3', picked: false, ruleIndex: 0, description: ''},`
`21`	`21`	`{label: 'RULE_NAME_4', picked: true, ruleIndex: 1, description: ''}`
`@@ -24,15 +24,15 @@ suite('NormalisationRulePicker', () => {`
`24`	`24`	`)`
`25`	`25`	`.thenResolve();`
`26`	`26`	`when(`
`27`		`- windowComponent.showQuickPick(`
	`27`	`+ windowAdaptor.showQuickPick(`
`28`	`28`	`[`
`29`	`29`	`{label: '(no "name" set for this rule)', picked: true, ruleIndex: 0, description: ''}`
`30`	`30`	`]`
`31`	`31`	`)`
`32`	`32`	`)`
`33`	`33`	`.thenResolve([]);`
`34`	`34`
`35`		`- const rulePicker = new NormalisationRulePicker(windowComponent);`
	`35`	`+ const rulePicker = new NormalisationRulePicker(windowAdaptor);`
`36`	`36`
`37`	`37`	`test('it returns the index of active rules that user chose', async () => {`
`38`	`38`	`const activeRuleIndices = await rulePicker.show([`