Adding Prettier

Author: Sertion

.prettierrc

@@ -0,0 +1,10 @@
+{
+    "printWidth": 80,
+    "tabWidth": 4,
+    "useTabs": false,
+    "semi": true,
+    "singleQuote": true,
+    "bracketSpacing": true,
+    "arrowParens": "always",
+    "parser": "typescript"
+}

CHANGELOG.md

@@ -7,6 +7,7 @@
 * Fix: Renaming `GitBlameFile*` to `GitFile*`
 * Fix: Rewrote all the tests
 * Fix: Updating dependencies
+* Enhancment: Prettifying with [Prettier](https://prettier.io/)
 
 ## 2.2.0 (September 07, 2017)
 

src/git/blame.ts

@@ -1,28 +1,16 @@
 import { isWebUri } from 'valid-url';
 
-import {
-    Disposable,
-    commands,
-    window,
-    workspace,
-    Uri } from 'vscode';
+import { Disposable, commands, window, workspace, Uri } from 'vscode';
 
 import { ErrorHandler } from '../util/errorhandler';
 import { TextDecorator } from '../util/textdecorator';
 import { isActiveEditorValid } from '../util/editorvalidator';
 import { GitFile } from './file';
 import { GitFileFactory } from './filefactory';
 import { StatusBarView } from '../view';
-import {
-    Property,
-    Properties } from '../util/property';
-import {
-    GitBlameInfo,
-    GitCommitInfo } from '../interfaces';
-import {
-    HASH_NO_COMMIT_GIT,
-    TITLE_VIEW_ONLINE } from '../constants';
-
+import { Property, Properties } from '../util/property';
+import { GitBlameInfo, GitCommitInfo } from '../interfaces';
+import { HASH_NO_COMMIT_GIT, TITLE_VIEW_ONLINE } from '../constants';
 
 export class GitBlame {
     private disposable: Disposable;
@@ -47,15 +35,31 @@ export class GitBlame {
 
         const propertyHolder = Property.getInstance();
 
-        this.disposable = Disposable.from(this.statusBarView, errorHandler, propertyHolder);
+        this.disposable = Disposable.from(
+            this.statusBarView,
+            errorHandler,
+            propertyHolder
+        );
     }
 
     setupListeners(): void {
         const disposables: Disposable[] = [];
 
-        window.onDidChangeActiveTextEditor(this.onTextEditorMove, this, disposables);
-        window.onDidChangeTextEditorSelection(this.onTextEditorMove, this, disposables);
-        workspace.onDidSaveTextDocument(this.onTextEditorMove, this, disposables);
+        window.onDidChangeActiveTextEditor(
+            this.onTextEditorMove,
+            this,
+            disposables
+        );
+        window.onDidChangeTextEditorSelection(
+            this.onTextEditorMove,
+            this,
+            disposables
+        );
+        workspace.onDidSaveTextDocument(
+            this.onTextEditorMove,
+            this,
+            disposables
+        );
 
         this.disposable = Disposable.from(this.disposable, ...disposables);
     }
@@ -70,26 +74,38 @@ export class GitBlame {
         const commitInfo = await this.getCurrentLineInfo();
 
         // Only update if we haven't moved since we started blaming
-        if (beforeBlameOpenFile === this.getCurrentActiveFileName() && beforeBlameLineNumber === this.getCurrentActiveLineNumber()) {
+        if (
+            beforeBlameOpenFile === this.getCurrentActiveFileName() &&
+            beforeBlameLineNumber === this.getCurrentActiveLineNumber()
+        ) {
             this.updateView(commitInfo);
         }
-
     }
 
     private getCurrentActiveFileName(): string {
-        return window.activeTextEditor && window.activeTextEditor.document.fileName;
+        return (
+            window.activeTextEditor && window.activeTextEditor.document.fileName
+        );
     }
 
     private getCurrentActiveLineNumber(): number {
-        return window.activeTextEditor && window.activeTextEditor.selection.active.line;
+        return (
+            window.activeTextEditor &&
+            window.activeTextEditor.selection.active.line
+        );
     }
 
     async showMessage(): Promise<void> {
         const commitInfo = await this.getCommitInfo();
         const commitToolUrl = this.getToolUrl(commitInfo);
         const messageFormat = Property.get(Properties.InfoMessageFormat);
-        const normalizedTokens = TextDecorator.normalizeCommitInfoTokens(commitInfo);
-        const message = TextDecorator.parseTokens(messageFormat, normalizedTokens);
+        const normalizedTokens = TextDecorator.normalizeCommitInfoTokens(
+            commitInfo
+        );
+        const message = TextDecorator.parseTokens(
+            messageFormat,
+            normalizedTokens
+        );
         const extraAction = commitToolUrl ? TITLE_VIEW_ONLINE : '';
 
         this.updateView(commitInfo);
@@ -107,17 +123,20 @@ export class GitBlame {
 
         if (commitToolUrl) {
             commands.executeCommand('vscode.open', commitToolUrl);
-        }
-        else {
-            window.showErrorMessage('Missing gitblame.commitUrl configuration value.');
+        } else {
+            window.showErrorMessage(
+                'Missing gitblame.commitUrl configuration value.'
+            );
         }
     }
 
     private async getCommitInfo(): Promise<GitCommitInfo> {
         let commitInfo = await this.getCurrentLineInfo();
 
         if (GitBlame.isGeneratedCommit(commitInfo)) {
-            window.showErrorMessage('The current file and line can not be blamed.');
+            window.showErrorMessage(
+                'The current file and line can not be blamed.'
+            );
         }
 
         return commitInfo;
@@ -128,61 +147,71 @@ export class GitBlame {
             return;
         }
 
-        const parsedUrl = TextDecorator.parseTokens(Property.get(Properties.CommitUrl), {
-            'hash': commitInfo.hash
-        });
+        const parsedUrl = TextDecorator.parseTokens(
+            Property.get(Properties.CommitUrl),
+            {
+                hash: commitInfo.hash
+            }
+        );
 
         if (isWebUri(parsedUrl)) {
             return Uri.parse(parsedUrl);
-        }
-        else if (parsedUrl) {
-            window.showErrorMessage('Malformed URL in setting gitblame.commitUrl. Must be a valid web url.');
+        } else if (parsedUrl) {
+            window.showErrorMessage(
+                'Malformed URL in setting gitblame.commitUrl. Must be a valid web url.'
+            );
         }
     }
 
     private updateView(commitInfo: GitCommitInfo): void {
         if (GitBlame.isGeneratedCommit(commitInfo)) {
             this.statusBarView.clear();
-        }
-        else {
+        } else {
             this.statusBarView.update(commitInfo);
         }
     }
 
     async getBlameInfo(fileName: string): Promise<GitBlameInfo> {
         if (!this.files[fileName]) {
-            this.files[fileName] = GitFileFactory.create(fileName, this.generateDisposeFunction(fileName));
+            this.files[fileName] = GitFileFactory.create(
+                fileName,
+                this.generateDisposeFunction(fileName)
+            );
         }
 
         return this.files[fileName].blame();
     }
 
     async getCurrentLineInfo(): Promise<GitCommitInfo> {
         if (isActiveEditorValid()) {
-            return this.getLineInfo(window.activeTextEditor.document.fileName, window.activeTextEditor.selection.active.line)
-        }
-        else {
+            return this.getLineInfo(
+                window.activeTextEditor.document.fileName,
+                window.activeTextEditor.selection.active.line
+            );
+        } else {
             return GitBlame.blankCommitInfo();
         }
     }
 
-    async getLineInfo(fileName: string, lineNumber: number): Promise<GitCommitInfo> {
+    async getLineInfo(
+        fileName: string,
+        lineNumber: number
+    ): Promise<GitCommitInfo> {
         const commitLineNumber = lineNumber + 1;
         const blameInfo = await this.getBlameInfo(fileName);
 
         if (blameInfo['lines'][commitLineNumber]) {
             const hash = blameInfo['lines'][commitLineNumber];
             return blameInfo['commits'][hash];
-        }
-        else {
+        } else {
             return GitBlame.blankCommitInfo();
         }
     }
 
     private generateDisposeFunction(fileName) {
         return () => {
             delete this.files[fileName];
-        }
+        };
     }
 
     dispose(): void {
@@ -192,8 +221,8 @@ export class GitBlame {
 
     static blankBlameInfo(): GitBlameInfo {
         return {
-            'commits': {},
-            'lines': {}
+            commits: {},
+            lines: {}
         };
     }
 

src/git/file.ts

@@ -1,14 +1,10 @@
-import {
-    workspace,
-    window,
-    Uri } from 'vscode';
+import { workspace, window, Uri } from 'vscode';
 
 import { GitBlame } from './blame';
 import { ErrorHandler } from '../util/errorhandler';
 import { GitBlameInfo } from '../interfaces';
 import { TIME_CACHE_LIFETIME } from '../constants';
 
-
 export class GitFile {
     private cacheClearInterval: NodeJS.Timer;
 
@@ -24,17 +20,23 @@ export class GitFile {
     startCacheInterval(): void {
         clearInterval(this.cacheClearInterval);
         this.cacheClearInterval = setInterval(() => {
-            const isOpen = window.visibleTextEditors.some(editor => editor.document.uri.fsPath === this.fileName.fsPath);
+            const isOpen = window.visibleTextEditors.some(
+                (editor) => editor.document.uri.fsPath === this.fileName.fsPath
+            );
 
             if (!isOpen) {
-                ErrorHandler.getInstance().logInfo(`Clearing the file "${this.fileName.fsPath}" from the internal cache`);
+                ErrorHandler.getInstance().logInfo(
+                    `Clearing the file "${
+                        this.fileName.fsPath
+                    }" from the internal cache`
+                );
                 this.dispose();
             }
         }, TIME_CACHE_LIFETIME);
     }
 
     async getGitWorkTree(): Promise<string> {
-        return this.workTree
+        return this.workTree;
     }
 
     changed(): void {

src/git/filedummy.ts

@@ -1,11 +1,14 @@
 import { GitFile } from './file';
 import { ErrorHandler } from '../util/errorhandler';
 
-
 export class GitFileDummy extends GitFile {
     constructor(fileName: string, disposeCallback: Function = () => {}) {
         super(fileName, disposeCallback);
         this.startCacheInterval();
-        ErrorHandler.getInstance().logInfo(`Will not try to blame file "${this.fileName.fsPath}" as it is outside of the current workspace`);
+        ErrorHandler.getInstance().logInfo(
+            `Will not try to blame file "${
+                this.fileName.fsPath
+            }" as it is outside of the current workspace`
+        );
     }
 }

src/git/filefactory.ts

@@ -1,18 +1,17 @@
-import {
-    Uri,
-    workspace } from 'vscode';
+import { Uri, workspace } from 'vscode';
 
 import { GitFilePhysical } from './filephysical';
 import { GitFileDummy } from './filedummy';
 import { GitFile } from './file';
 
-
 export class GitFileFactory {
-    static create(fileName: string, disposeCallback: Function = () => {}): GitFile {
+    static create(
+        fileName: string,
+        disposeCallback: Function = () => {}
+    ): GitFile {
         if (GitFileFactory.inWorkspace(fileName)) {
             return new GitFilePhysical(fileName, disposeCallback);
-        }
-        else {
+        } else {
             return new GitFileDummy(fileName, disposeCallback);
         }
     }