Removed unnecessary dependencies

Only a half of TextResourceUtil requires `getCurrentDate` function.
It's been forcing dependants to setup the module with unnecessary dependencies.

Author: ryu1kn

src/lib/bootstrapper-factory.ts

@@ -23,11 +23,7 @@ export default class BootstrapperFactory {
             new Clipboard(clipboardy, process.platform),
             () => new Date()
         );
-        const contentProvider = new ContentProvider(
-            selectionInfoRegistry,
-            normalisationRuleStore,
-            () => new Date()
-        );
+        const contentProvider = new ContentProvider(selectionInfoRegistry, normalisationRuleStore);
         return new Bootstrapper(commandFactory, contentProvider, vscode, logger);
     }
 

src/lib/content-provider.ts

@@ -11,10 +11,9 @@ export default class ContentProvider implements TextDocumentContentProvider {
     private readonly textProcessRuleApplier: TextProcessRuleApplier;
 
     constructor(selectionInfoRegistry: SelectionInfoRegistry,
-                normalisationRuleStore: NormalisationRuleStore,
-                getCurrentDate: () => Date) {
+                normalisationRuleStore: NormalisationRuleStore) {
         this.selectionInfoRegistry = selectionInfoRegistry;
-        this.textResourceUtil = new TextResourceUtil(getCurrentDate);
+        this.textResourceUtil = new TextResourceUtil();
         this.textProcessRuleApplier = new TextProcessRuleApplier(normalisationRuleStore);
     }
 

src/lib/diff-presenter.ts

@@ -1,25 +1,25 @@
 import NormalisationRuleStore from './normalisation-rule-store';
 import SelectionInfoRegistry from './selection-info-registry';
-import TextResourceUtil from './text-resource-util';
+import {makeUriString} from './text-resource-util';
 import CommandAdaptor from './adaptors/command';
 import DiffTitleBuilder from './diff-title-builder';
 
 export default class DiffPresenter {
-    private readonly textResourceUtil: TextResourceUtil;
+    private readonly getCurrentDate: () => Date;
     private readonly diffTitleBuilder: DiffTitleBuilder;
     private readonly commandAdaptor: CommandAdaptor;
 
     constructor(selectionInfoRegistry: SelectionInfoRegistry,
                 normalisationRuleStore: NormalisationRuleStore,
                 commandAdaptor: CommandAdaptor,
                 getCurrentDate: () => Date) {
-        this.textResourceUtil = new TextResourceUtil(getCurrentDate);
+        this.getCurrentDate = getCurrentDate;
         this.diffTitleBuilder = new DiffTitleBuilder(normalisationRuleStore, selectionInfoRegistry);
         this.commandAdaptor = commandAdaptor;
     }
 
     takeDiff(textKey1: string, textKey2: string) {
-        const getUri = (textKey: string) => this.textResourceUtil.getUri(textKey);
+        const getUri = (textKey: string) => makeUriString(textKey, this.getCurrentDate());
         const title = this.diffTitleBuilder.build(textKey1, textKey2);
         return this.commandAdaptor.executeCommand('vscode.diff', getUri(textKey1), getUri(textKey2), title);
     }

src/lib/text-resource-util.ts

@@ -1,17 +1,10 @@
 import * as vscode from 'vscode';
 import {EXTENSION_SCHEME} from './const';
 
-export default class TextResourceUtil {
-    private readonly getCurrentDate: () => Date;
-
-    constructor(getCurrentDate: () => Date) {
-        this.getCurrentDate = getCurrentDate;
-    }
+export const makeUriString = (textKey: string, timestamp: Date) =>
+    `${EXTENSION_SCHEME}:text/${textKey}?_ts=${timestamp.getTime()}`; // `_ts` to avoid cache
 
-    getUri(textKey: string) {
-        const timestamp = this.getCurrentDate().getTime();
-        return `${EXTENSION_SCHEME}:text/${textKey}?_ts=${timestamp}`; // `_ts` to avoid cache
-    }
+export default class TextResourceUtil {
 
     getTextKey(uri: vscode.Uri): string {
         const match = uri.path.match(/^text\/([a-z\d]+)/)!;

src/test/lib/content-provider.test.ts

@@ -18,11 +18,7 @@ suite('ContentProvider', () => {
         const normalisationRuleStore = mockType<NormalisationRuleStore>({
             activeRules: [{match: '_', replaceWith: ':'}]
         });
-        const contentProvider = new ContentProvider(
-            selectionInfoRegistry,
-            normalisationRuleStore,
-            () => new Date()
-        );
+        const contentProvider = new ContentProvider(selectionInfoRegistry, normalisationRuleStore);
 
         test('it extracts text key from the given uri and uses it to retrieve text', () => {
             const uri = mockType<vscode.Uri>({path: 'text/key1'});
@@ -37,11 +33,7 @@ suite('ContentProvider', () => {
 
     suite('When normalisation rules are NOT given', () => {
         const normalisationRuleStore = mockType<NormalisationRuleStore>({activeRules: []});
-        const contentProvider = new ContentProvider(
-            selectionInfoRegistry,
-            normalisationRuleStore,
-            () => new Date()
-        );
+        const contentProvider = new ContentProvider(selectionInfoRegistry, normalisationRuleStore);
 
         test('it returns the registered text as is', () => {
             const uri = mockType<vscode.Uri>({path: 'text/key1'});

src/test/lib/text-resource-util.test.ts

@@ -1,13 +1,13 @@
-import TextResourceUtil from '../../lib/text-resource-util';
+import TextResourceUtil, {makeUriString} from '../../lib/text-resource-util';
 import * as assert from 'assert';
 
 suite('TextResourceUtil', () => {
-    const getCurrentDateFn = () => new Date('2016-06-15T11:43:00Z');
-    const textResourceUtil = new TextResourceUtil(getCurrentDateFn);
+    const date = new Date('2016-06-15T11:43:00Z');
+    const textResourceUtil = new TextResourceUtil();
 
-    suite('#getUri', () => {
+    suite('#makeUriString', () => {
         test('it converts a given text key into an uri', () => {
-            assert.deepEqual(textResourceUtil.getUri('reg1'), 'partialdiff:text/reg1?_ts=1465990980000');
+            assert.deepEqual(makeUriString('reg1', date), 'partialdiff:text/reg1?_ts=1465990980000');
         });
     });