Setting up Prettier and TSLint to use the same settings

Author: Sertion

.prettierrc

@@ -3,7 +3,8 @@
     "tabWidth": 4,
     "useTabs": false,
     "semi": true,
-    "singleQuote": true,
+    "singleQuote": false,
+    "trailingComma": "all",
     "bracketSpacing": true,
     "arrowParens": "always",
     "parser": "typescript"

src/git/blame.ts

@@ -1,6 +1,13 @@
 import { isWebUri } from "valid-url";
 
-import { commands, Disposable, MessageItem, Uri, window, workspace } from "vscode";
+import {
+    commands,
+    Disposable,
+    MessageItem,
+    Uri,
+    window,
+    workspace,
+} from "vscode";
 
 import { HASH_NO_COMMIT_GIT, TITLE_VIEW_ONLINE } from "../constants";
 import { IGitBlameInfo, IGitCommitInfo } from "../interfaces";
@@ -147,7 +154,10 @@ export class GitBlame {
 
         this.updateView(commitInfo);
 
-        const actionedItem = await window.showInformationMessage(message, ...extraActions);
+        const actionedItem = await window.showInformationMessage(
+            message,
+            ...extraActions,
+        );
 
         if (actionedItem) {
             actionedItem.takeAction();
@@ -172,12 +182,16 @@ export class GitBlame {
         );
     }
 
-    private generateMessageActions(commitInfo: IGitCommitInfo): ActionableMessageItem[] {
+    private generateMessageActions(
+        commitInfo: IGitCommitInfo,
+    ): ActionableMessageItem[] {
         const commitToolUrl = this.getToolUrl(commitInfo);
         const extraActions: ActionableMessageItem[] = [];
 
         if (commitToolUrl) {
-            const viewOnlineAction = new ActionableMessageItem(TITLE_VIEW_ONLINE);
+            const viewOnlineAction = new ActionableMessageItem(
+                TITLE_VIEW_ONLINE,
+            );
 
             viewOnlineAction.setAction(() => {
                 commands.executeCommand("vscode.open", commitToolUrl);
@@ -217,7 +231,7 @@ export class GitBlame {
             return Uri.parse(parsedUrl);
         } else if (parsedUrl) {
             window.showErrorMessage(
-                "Malformed URL in setting gitblame.commitUrl. Must be a valid web url.",
+                "Malformed URL in gitblame.commitUrl. Must be a valid web url.",
             );
         }
     }

src/git/stream.ts

@@ -10,6 +10,8 @@ import { Properties, Property } from "../util/property";
 import { GitBlame } from "./blame";
 
 export class GitBlameStream extends EventEmitter {
+    private static readonly HASH_PATTERN: RegExp = /[a-z0-9]{40}/;
+
     private file: Uri;
     private workTree: string;
     private process: ChildProcess;
@@ -78,19 +80,25 @@ export class GitBlameStream extends EventEmitter {
 
     private data(dataChunk: string): void {
         const lines = dataChunk.split("\n");
-        let commitInfo = this.getCommitTemplate();
+        let commitInfo = GitBlame.blankCommitInfo();
+
+        commitInfo.filename = this.file.fsPath.replace(this.workTree, "");
 
         lines.forEach((line, index) => {
             if (line && line !== "boundary") {
                 const [all, key, value] = Array.from(line.match(/(.*?) (.*)/));
                 if (
-                    /[a-z0-9]{40}/.test(key) &&
+                    GitBlameStream.HASH_PATTERN.test(key) &&
                     lines.hasOwnProperty(index + 1) &&
                     /^(author|committer)/.test(lines[index + 1]) &&
                     commitInfo.hash !== ""
                 ) {
                     this.commitInfoToCommitEmit(commitInfo);
-                    commitInfo = this.getCommitTemplate();
+                    commitInfo = GitBlame.blankCommitInfo();
+                    commitInfo.filename = this.file.fsPath.replace(
+                        this.workTree,
+                        "",
+                    );
                 }
                 this.processLine(key, value, commitInfo);
             }
@@ -104,25 +112,32 @@ export class GitBlameStream extends EventEmitter {
         value: string,
         commitInfo: IGitCommitInfo,
     ): void {
+        const [keyPrefix, keySuffix] = key.split(" ");
+        let owner: IGitCommitAuthor = {
+            mail: "",
+            name: "",
+            temporary: true,
+            timestamp: 0,
+            tz: "",
+        };
+
         if (key === "author") {
-            commitInfo.author.name = value;
-        } else if (key === "author-mail") {
-            commitInfo.author.mail = value;
-        } else if (key === "author-time") {
-            commitInfo.author.timestamp = parseInt(value, 10);
-        } else if (key === "author-tz") {
-            commitInfo.author.tz = value;
+            owner = commitInfo.author;
         } else if (key === "committer") {
-            commitInfo.committer.name = value;
-        } else if (key === "committer-mail") {
-            commitInfo.committer.mail = value;
-        } else if (key === "committer-time") {
-            commitInfo.committer.timestamp = parseInt(value, 10);
-        } else if (key === "committer-tz") {
-            commitInfo.committer.tz = value;
+            owner = commitInfo.committer;
+        }
+
+        if (!owner.temporary && !keySuffix) {
+            owner.name = value;
+        } else if (keySuffix === "mail") {
+            owner.mail = value;
+        } else if (keySuffix === "time") {
+            owner.timestamp = parseInt(value, 10);
+        } else if (keySuffix === "tz") {
+            owner.tz = value;
         } else if (key === "summary") {
             commitInfo.summary = value;
-        } else if (key.length === 40) {
+        } else if (GitBlameStream.HASH_PATTERN.test(key)) {
             commitInfo.hash = key;
 
             const hash = key;
@@ -152,24 +167,4 @@ export class GitBlameStream extends EventEmitter {
             this.emit("commit", internalHash, commitInfo);
         }
     }
-
-    private getCommitTemplate(): IGitCommitInfo {
-        return {
-            author: {
-                mail: "",
-                name: "",
-                timestamp: 0,
-                tz: "",
-            },
-            committer: {
-                mail: "",
-                name: "",
-                timestamp: 0,
-                tz: "",
-            },
-            filename: this.file.fsPath.replace(this.workTree, ""),
-            hash: "",
-            summary: "",
-        };
-    }
 }

src/interfaces.ts

@@ -3,6 +3,7 @@ export interface IGitCommitAuthor {
     mail: string;
     timestamp: number;
     tz: string;
+    temporary?: true;
 }
 
 export interface IGitCommitInfo {

src/util/gitcommand.ts

@@ -8,15 +8,13 @@ import { ErrorHandler } from "./errorhandler";
 
 export function getGitCommand(): Promise<string> {
     const gitConfig = workspace.getConfiguration("git");
-    const command =
-        gitConfig.get("path", GIT_COMMAND_IN_PATH) as string ||
-        GIT_COMMAND_IN_PATH;
+    const pathCommand = gitConfig.get("path") as string;
     const promise = new Promise<string>((resolve, reject) => {
-        if (command === GIT_COMMAND_IN_PATH) {
-            resolve(command);
+        if (!pathCommand) {
+            resolve(GIT_COMMAND_IN_PATH);
         }
 
-        const commandPath = normalize(command);
+        const commandPath = normalize(pathCommand);
 
         access(commandPath, FSConstant.X_OK, (err) => {
             if (err) {

src/util/textdecorator.ts

@@ -3,7 +3,11 @@ import * as moment from "moment";
 import { workspace } from "vscode";
 
 import { GitBlame } from "../git/blame";
-import { IGitCommitInfo, IInfoTokenHash, IInfoTokenNormalizedCommitInfo } from "../interfaces";
+import {
+    IGitCommitInfo,
+    IInfoTokenHash,
+    IInfoTokenNormalizedCommitInfo,
+} from "../interfaces";
 import { walkObject } from "./objectpath";
 import { Properties, Property } from "./property";
 
@@ -84,7 +88,9 @@ export class TextDecorator {
         );
     }
 
-    public static normalizeCommitInfoTokens(commitInfo: IGitCommitInfo): IInfoTokenNormalizedCommitInfo {
+    public static normalizeCommitInfoTokens(
+        commitInfo: IGitCommitInfo,
+    ): IInfoTokenNormalizedCommitInfo {
         const now = new Date();
         const authorTime = moment.unix(commitInfo.author.timestamp);
         const committerTime = moment.unix(commitInfo.committer.timestamp);
@@ -100,7 +106,8 @@ export class TextDecorator {
             committer: commitInfo.committer,
             time: {
                 ago: () => TextDecorator.toDateText(now, authorTime.toDate()),
-                c_ago: () => TextDecorator.toDateText(now, committerTime.toDate()),
+                c_ago: () =>
+                    TextDecorator.toDateText(now, committerTime.toDate()),
                 c_custom: (momentFormat) => committerTime.format(momentFormat),
                 c_from: () => committerTime.fromNow(),
                 custom: (momentFormat) => authorTime.format(momentFormat),

test/execcommand.test.ts

@@ -1,4 +1,4 @@
-import assert = require("assert");
+import * as assert from "assert";
 
 import { execute } from "../src/util/execcommand";
 

test/gitplatformdetector.test.ts

@@ -1,6 +1,6 @@
-import assert = require("assert");
+import * as assert from "assert";
 // Nock is a library for mocking network requests
-import nock = require("nock");
+import * as nock from "nock";
 
 import { GitPlatformDetector } from "../src/util/gitplatformdetector";
 

test/index.ts

@@ -1,22 +1,8 @@
-//
-// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING
-//
-// This file is providing the test runner to use when running extension tests.
-// By default the test runner in use is Mocha based.
-//
-// You can provide your own test runner if you want to override it by exporting
-// a function run(testRoot: string, clb: (error:Error) => void) that the extension
-// host can call to run the tests. The test runner is expected to use console.log
-// to report the results back to the caller. When the tests are finished, return
-// a possible error to the callback or null if none.
+import * as testRunner from "vscode/lib/testrunner";
 
-import testRunner = require("vscode/lib/testrunner");
-
-// You can directly control Mocha options by uncommenting the following lines
-// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
 testRunner.configure({
-    ui: "tdd", // the TDD UI is being used in extension.test.ts (suite, test, etc.)
-    useColors: true, // colored output from test results
+    ui: "tdd",
+    useColors: true,
 });
 
 module.exports = testRunner;

test/objectpath.test.ts

@@ -1,4 +1,4 @@
-import assert = require("assert");
+import * as assert from "assert";
 
 import { walkObject } from "../src/util/objectpath";