Privatizing as mutch as possible

Sertion · Sertion · commit a8e08dcd135d · 2018-03-20T00:15:00.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,7 @@
 * Fix: Rewrote all the tests
 * Fix: Updating dependencies
 * Fix: Updating preview video/image
-* Enhancment: Prettifying with [Prettier](https://prettier.io/)
+* Enhancement: Prettifying with [Prettier](https://prettier.io/)
 * Enhancement: Tslintifying with [TSLint](https://palantir.github.io/tslint/)
 
 ## 2.2.0 (September 07, 2017)
diff --git a/src/git/blame.ts b/src/git/blame.ts
@@ -50,10 +50,6 @@ export class GitBlame {
         return commit.hash === HASH_NO_COMMIT_GIT;
     }
 
-    public static isGeneratedCommit(commit: IGitCommitInfo): boolean {
-        return commit.generated;
-    }
-
     public static internalHash(hash: string): string {
         return hash.substr(0, Property.get(Properties.InternalHashLength));
     }
@@ -71,7 +67,56 @@ export class GitBlame {
         this.init();
     }
 
-    public setupDisposables(): void {
+    public async blameLink(): Promise<void> {
+        const commitInfo = await this.getCommitInfo();
+        const commitToolUrl = this.getToolUrl(commitInfo);
+
+        if (commitToolUrl) {
+            commands.executeCommand("vscode.open", commitToolUrl);
+        } else {
+            window.showErrorMessage(
+                "Missing gitblame.commitUrl configuration value.",
+            );
+        }
+    }
+
+    public async showMessage(): Promise<void> {
+        const commitInfo = await this.getCommitInfo();
+        const messageFormat = Property.get(Properties.InfoMessageFormat);
+        const normalizedTokens = TextDecorator.normalizeCommitInfoTokens(
+            commitInfo,
+        );
+        const message = TextDecorator.parseTokens(
+            messageFormat,
+            normalizedTokens,
+        );
+        const extraActions = this.generateMessageActions(commitInfo);
+
+        this.updateView(commitInfo);
+
+        const actionedItem = await window.showInformationMessage(
+            message,
+            ...(await extraActions),
+        );
+
+        if (actionedItem) {
+            actionedItem.takeAction();
+        }
+    }
+
+    public defaultWebPath(url: string, hash: string): string {
+        return url.replace(
+            /^(git@|https:\/\/)([^:\/]+)[:\/](.*)\.git$/,
+            `https://$2/$3/commit/${ hash }`,
+        );
+    }
+
+    public dispose(): void {
+        Disposable.from(...Object.values(this.files)).dispose();
+        this.disposable.dispose();
+    }
+
+    private setupDisposables(): void {
         const disposables: Disposable[] = [];
 
         // The blamer does not use the ErrorHandler but
@@ -87,7 +132,7 @@ export class GitBlame {
         );
     }
 
-    public setupListeners(): void {
+    private setupListeners(): void {
         const disposables: Disposable[] = [];
 
         window.onDidChangeActiveTextEditor(
@@ -109,16 +154,16 @@ export class GitBlame {
         this.disposable = Disposable.from(this.disposable, ...disposables);
     }
 
-    public init(): void {
+    private init(): void {
         this.onTextEditorMove();
     }
 
-    public async onTextEditorMove(): Promise<void> {
+    private async onTextEditorMove(): Promise<void> {
         const beforeBlameOpenFile = this.getCurrentActiveFileName();
         const beforeBlameLineNumber = this.getCurrentActiveLineNumber();
         const commitInfo = await this.getCurrentLineInfo();
 
-        // Only update if we haven"t moved since we started blaming
+        // Only update if we haven't moved since we started blaming
         if (
             beforeBlameOpenFile === this.getCurrentActiveFileName() &&
             beforeBlameLineNumber === this.getCurrentActiveLineNumber()
@@ -127,55 +172,6 @@ export class GitBlame {
         }
     }
 
-    public async blameLink(): Promise<void> {
-        const commitInfo = await this.getCommitInfo();
-        const commitToolUrl = this.getToolUrl(commitInfo);
-
-        if (commitToolUrl) {
-            commands.executeCommand("vscode.open", commitToolUrl);
-        } else {
-            window.showErrorMessage(
-                "Missing gitblame.commitUrl configuration value.",
-            );
-        }
-    }
-
-    public async showMessage(): Promise<void> {
-        const commitInfo = await this.getCommitInfo();
-        const messageFormat = Property.get(Properties.InfoMessageFormat);
-        const normalizedTokens = TextDecorator.normalizeCommitInfoTokens(
-            commitInfo,
-        );
-        const message = TextDecorator.parseTokens(
-            messageFormat,
-            normalizedTokens,
-        );
-        const extraActions = this.generateMessageActions(commitInfo);
-
-        this.updateView(commitInfo);
-
-        const actionedItem = await window.showInformationMessage(
-            message,
-            ...(await extraActions),
-        );
-
-        if (actionedItem) {
-            actionedItem.takeAction();
-        }
-    }
-
-    public defaultWebPath(url: string, hash: string): string {
-        return url.replace(
-            /^(git@|https:\/\/)([^:\/]+)[:\/](.*)\.git$/,
-            `https://$2/$3/commit/${ hash }`,
-        );
-    }
-
-    public dispose(): void {
-        Disposable.from(...Object.values(this.files)).dispose();
-        this.disposable.dispose();
-    }
-
     private getCurrentActiveFileName(): string {
         return (
             window.activeTextEditor && window.activeTextEditor.document.fileName
@@ -213,7 +209,7 @@ export class GitBlame {
     private async getCommitInfo(): Promise<IGitCommitInfo> {
         const commitInfo = await this.getCurrentLineInfo();
 
-        if (GitBlame.isGeneratedCommit(commitInfo)) {
+        if (commitInfo.generated) {
             window.showErrorMessage(
                 "The current file and line can not be blamed.",
             );
@@ -244,7 +240,7 @@ export class GitBlame {
     }
 
     private updateView(commitInfo: IGitCommitInfo): void {
-        if (GitBlame.isGeneratedCommit(commitInfo)) {
+        if (commitInfo.generated) {
             this.statusBarView.clear();
         } else {
             this.statusBarView.update(commitInfo);
diff --git a/src/git/file.ts b/src/git/file.ts
@@ -6,8 +6,7 @@ import { GitBlame } from "git/blame";
 import { ErrorHandler } from "util/errorhandler";
 
 export class GitFile {
-    public fileName: Uri;
-    public workTree: string;
+    public readonly fileName: Uri;
     public disposeCallback: () => void;
 
     private cacheClearInterval: NodeJS.Timer;
@@ -35,14 +34,6 @@ export class GitFile {
         }, TIME_CACHE_LIFETIME);
     }
 
-    public async getGitWorkTree(): Promise<string> {
-        return this.workTree;
-    }
-
-    public changed(): void {
-        delete this.workTree;
-    }
-
     public async blame(): Promise<IGitBlameInfo> {
         return GitBlame.blankBlameInfo();
     }
diff --git a/src/git/filephysical.ts b/src/git/filephysical.ts
@@ -15,6 +15,7 @@ import { getGitCommand } from "util/gitcommand";
 export class GitFilePhysical extends GitFile {
     private blameInfoPromise: Promise<IGitBlameInfo>;
     private readonly fileSystemWatcher: FileSystemWatcher;
+    private workTree: string;
     private workTreePromise: Promise<string>;
     private blameProcess: GitBlameStream;
 
@@ -24,25 +25,6 @@ export class GitFilePhysical extends GitFile {
         this.fileSystemWatcher = this.setupWatcher();
     }
 
-    public async getGitWorkTree(): Promise<string> {
-        if (this.workTree) {
-            return this.workTree;
-        }
-
-        if (!this.workTreePromise) {
-            this.workTreePromise = this.findWorkTree();
-        }
-
-        this.workTree = await this.workTreePromise;
-
-        return this.workTree;
-    }
-
-    public changed(): void {
-        super.changed();
-        delete this.blameInfoPromise;
-    }
-
     public async blame(): Promise<IGitBlameInfo> {
         StatusBarView.getInstance().startProgress();
 
@@ -81,6 +63,25 @@ export class GitFilePhysical extends GitFile {
         return fsWatcher;
     }
 
+    private changed(): void {
+        delete this.workTree;
+        delete this.blameInfoPromise;
+    }
+
+    private async getGitWorkTree(): Promise<string> {
+        if (this.workTree) {
+            return this.workTree;
+        }
+
+        if (!this.workTreePromise) {
+            this.workTreePromise = this.findWorkTree();
+        }
+
+        this.workTree = await this.workTreePromise;
+
+        return this.workTree;
+    }
+
     private async findWorkTree(): Promise<string> {
         const workTree = await this.executeGitRevParseCommand(
             "--show-toplevel",
diff --git a/src/view.ts b/src/view.ts
@@ -30,15 +30,6 @@ export class StatusBarView {
         this.spinner = new Spinner();
     }
 
-    public setText(text: string, hasCommand: boolean = true): void {
-        this.statusBarItem.text = text ? `${this.prefix} ${text}` : this.prefix;
-        this.statusBarItem.tooltip = hasCommand
-            ? "git blame"
-            : "git blame - No info about the current line";
-        this.statusBarItem.command = hasCommand ? "gitblame.quickInfo" : "";
-        this.statusBarItem.show();
-    }
-
     public clear(): void {
         this.stopProgress();
         this.setText("", false);
@@ -47,7 +38,7 @@ export class StatusBarView {
     public update(commitInfo: IGitCommitInfo): void {
         this.stopProgress();
 
-        if (commitInfo && !GitBlame.isGeneratedCommit(commitInfo)) {
+        if (commitInfo && !commitInfo.generated) {
             const clickable = !GitBlame.isBlankCommit(commitInfo);
 
             this.setText(TextDecorator.toTextView(commitInfo), clickable);
@@ -84,6 +75,15 @@ export class StatusBarView {
         this.statusBarItem.dispose();
     }
 
+    private setText(text: string, hasCommand: boolean = true): void {
+        this.statusBarItem.text = text ? `${this.prefix} ${text}` : this.prefix;
+        this.statusBarItem.tooltip = hasCommand
+            ? "git blame"
+            : "git blame - No info about the current line";
+        this.statusBarItem.command = hasCommand ? "gitblame.quickInfo" : "";
+        this.statusBarItem.show();
+    }
+
     private setSpinner(): void {
         this.setText(`${this.spinner} Waiting for git blame response`, false);
     }
