Updates dependencies & runs prettier formatting

eamodio · eamodio · commit 39af55655b3a · 2019-06-10T22:45:18.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5192,7 +5192,7 @@
         "@types/node": "10.1.4",
         "@typescript-eslint/eslint-plugin": "1.9.0",
         "@typescript-eslint/parser": "1.9.0",
-        "clean-webpack-plugin": "2.0.2",
+        "clean-webpack-plugin": "3.0.0",
         "circular-dependency-plugin": "5.0.2",
         "css-loader": "2.1.1",
         "eslint": "5.16.0",
@@ -5201,22 +5201,22 @@
         "eslint-loader": "2.1.2",
         "eslint-plugin-import": "2.17.3",
         "eslint-plugin-prettiest": "0.0.1",
-        "fork-ts-checker-webpack-plugin": "1.3.4",
+        "fork-ts-checker-webpack-plugin": "1.3.5",
         "html-webpack-exclude-assets-plugin": "0.0.7",
         "html-webpack-inline-source-plugin": "0.0.10",
         "html-webpack-plugin": "3.2.0",
         "imagemin-webpack-plugin": "2.4.2",
-        "mini-css-extract-plugin": "0.6.0",
+        "mini-css-extract-plugin": "0.7.0",
         "node-sass": "4.12.0",
-        "prettier": "1.17.1",
+        "prettier": "1.18.0",
         "prettier-eslint": "8.8.2",
         "sass-loader": "7.1.0",
         "terser-webpack-plugin": "1.3.0",
-        "ts-loader": "6.0.1",
-        "typescript": "3.5.0-rc",
+        "ts-loader": "6.0.2",
+        "typescript": "3.5.1",
         "vsce": "1.62.0",
         "vscode": "1.1.34",
-        "webpack": "4.32.2",
+        "webpack": "4.33.0",
         "webpack-cli": "3.3.2",
         "webpack-bundle-analyzer": "3.3.2"
     }
diff --git a/src/annotations/annotations.ts b/src/annotations/annotations.ts
@@ -174,9 +174,7 @@ export class Annotations {
             )} "Show Commit Details")`;
         }
 
-        message += ` &nbsp; ${GlyphChars.Dash} &nbsp; ${previous} &nbsp;${
-            GlyphChars.ArrowLeftRightLong
-        }&nbsp; ${current}\n${diff}`;
+        message += ` &nbsp; ${GlyphChars.Dash} &nbsp; ${previous} &nbsp;${GlyphChars.ArrowLeftRightLong}&nbsp; ${current}\n${diff}`;
 
         const markdown = new MarkdownString(message);
         markdown.isTrusted = true;
diff --git a/src/git/formatters/statusFormatter.ts b/src/git/formatters/statusFormatter.ts
@@ -67,9 +67,7 @@ export class StatusFileFormatter extends Formatter<GitFile, StatusFormatOptions>
             icon = `${GlyphChars.Pencil}${GlyphChars.Space}${GlyphChars.SpaceThinnest}${GlyphChars.Check}`;
         }
         else if (statusFile.workingTreeStatus !== undefined) {
-            icon = `${GlyphChars.Pencil}${GlyphChars.SpaceThin}${GlyphChars.SpaceThinnest}${GlyphChars.EnDash}${
-                GlyphChars.Space
-            }`;
+            icon = `${GlyphChars.Pencil}${GlyphChars.SpaceThin}${GlyphChars.SpaceThinnest}${GlyphChars.EnDash}${GlyphChars.Space}`;
         }
         else if (statusFile.indexStatus !== undefined) {
             icon = `${GlyphChars.Space}${GlyphChars.EnDash}${GlyphChars.Space.repeat(2)}${GlyphChars.Check}`;
diff --git a/src/git/models/status.ts b/src/git/models/status.ts
@@ -135,9 +135,7 @@ export class GitStatus {
             return `${prefix}${status}${suffix}`;
         }
 
-        return `${prefix}${state.behind}${GlyphChars.ArrowDown}${separator}${state.ahead}${
-            GlyphChars.ArrowUp
-        }${suffix}`;
+        return `${prefix}${state.behind}${GlyphChars.ArrowDown}${separator}${state.ahead}${GlyphChars.ArrowUp}${suffix}`;
     }
 }
 
diff --git a/src/git/parsers/logParser.ts b/src/git/parsers/logParser.ts
@@ -272,12 +272,8 @@ export class GitLogParser {
                                                 renamedFileName
                                             );
                                             if (renamedMatch != null) {
-                                                entry.fileName = `${renamedMatch[1]}${renamedMatch[3]}${
-                                                    renamedMatch[4]
-                                                }`;
-                                                entry.originalFileName = `${renamedMatch[1]}${renamedMatch[2]}${
-                                                    renamedMatch[4]
-                                                }`;
+                                                entry.fileName = `${renamedMatch[1]}${renamedMatch[3]}${renamedMatch[4]}`;
+                                                entry.originalFileName = `${renamedMatch[1]}${renamedMatch[2]}${renamedMatch[4]}`;
                                             }
                                             else {
                                                 renamedMatch = fileStatusAndSummaryRenamedFileRegex.exec(
diff --git a/src/git/shell.ts b/src/git/shell.ts
@@ -154,9 +154,7 @@ export function run<TOut extends string | Buffer>(
             (error: (Error & { stdout?: TOut | undefined }) | null, stdout, stderr) => {
                 if (error != null) {
                     if (bufferExceededRegex.test(error.message)) {
-                        error.message = `Command output exceeded the allocated stdout buffer. Set 'options.maxBuffer' to a larger value than ${
-                            opts.maxBuffer
-                        } bytes`;
+                        error.message = `Command output exceeded the allocated stdout buffer. Set 'options.maxBuffer' to a larger value than ${opts.maxBuffer} bytes`;
                     }
 
                     error.stdout =
diff --git a/src/quickpicks/repoStatusQuickPick.ts b/src/quickpicks/repoStatusQuickPick.ts
@@ -414,9 +414,7 @@ export class RepoStatusQuickPick {
                 0,
                 new CommandQuickPickItem(
                     {
-                        label: `$(git-branch) ${status.branch} is up-to-date with ${GlyphChars.Space}$(git-branch) ${
-                            status.upstream
-                        }`,
+                        label: `$(git-branch) ${status.branch} is up-to-date with ${GlyphChars.Space}$(git-branch) ${status.upstream}`,
                         description: ''
                     },
                     Commands.ShowQuickRepoStatus,
diff --git a/src/views/nodes/commitNode.ts b/src/views/nodes/commitNode.ts
@@ -63,9 +63,7 @@ export class CommitNode extends ViewRefNode<ViewWithFiles> {
 
         const branchAndTagTips = this.getBranchAndTagTips && this.getBranchAndTagTips(this.commit.sha);
         if (branchAndTagTips !== undefined) {
-            label = `${GlyphChars.AngleBracketLeftHeavy}${GlyphChars.SpaceThin}${branchAndTagTips}${
-                GlyphChars.SpaceThin
-            }${GlyphChars.AngleBracketRightHeavy}${GlyphChars.ArrowHeadRight}${GlyphChars.Space} ${label}`;
+            label = `${GlyphChars.AngleBracketLeftHeavy}${GlyphChars.SpaceThin}${branchAndTagTips}${GlyphChars.SpaceThin}${GlyphChars.AngleBracketRightHeavy}${GlyphChars.ArrowHeadRight}${GlyphChars.Space} ${label}`;
         }
 
         const item = new TreeItem(label, TreeItemCollapsibleState.Collapsed);
diff --git a/src/views/nodes/compareBranchNode.ts b/src/views/nodes/compareBranchNode.ts
@@ -22,9 +22,7 @@ export class CompareBranchNode extends ViewNode<RepositoriesView> {
     }
 
     get id(): string {
-        return `${this._instanceId}:gitlens:repository(${this.branch.repoPath}):branch(${
-            this.branch.name
-        }):compareWith`;
+        return `${this._instanceId}:gitlens:repository(${this.branch.repoPath}):branch(${this.branch.name}):compareWith`;
     }
 
     getChildren(): ViewNode[] {
diff --git a/src/views/nodes/contributorNode.ts b/src/views/nodes/contributorNode.ts
@@ -19,9 +19,7 @@ export class ContributorNode extends ViewNode<RepositoriesView> implements Pagea
     }
 
     get id(): string {
-        return `${this._instanceId}:gitlens:repository(${this.contributor.repoPath}):contributor(${
-            this.contributor.name
-        }|${this.contributor.email}}`;
+        return `${this._instanceId}:gitlens:repository(${this.contributor.repoPath}):contributor(${this.contributor.name}|${this.contributor.email}}`;
     }
 
     async getChildren(): Promise<ViewNode[]> {
diff --git a/src/views/nodes/remoteNode.ts b/src/views/nodes/remoteNode.ts
@@ -22,9 +22,7 @@ export class RemoteNode extends ViewNode<RepositoriesView> {
     }
 
     get id(): string {
-        return `${this._instanceId}:gitlens:repository(${this.remote.repoPath}):remote(${this.remote.name}:${
-            this.remote.id
-        })`;
+        return `${this._instanceId}:gitlens:repository(${this.remote.repoPath}):remote(${this.remote.name}:${this.remote.id})`;
     }
 
     async getChildren(): Promise<ViewNode[]> {
diff --git a/webpack.config.js b/webpack.config.js

Original file line number	Diff line number	Diff line change
`@@ -174,9 +174,7 @@ export class Annotations {`
`174`	`174`	)} "Show Commit Details")`;
`175`	`175`	`}`
`176`	`176`
`177`		- message += `   ${GlyphChars.Dash}   ${previous}  ${
`178`		`- GlyphChars.ArrowLeftRightLong`
`179`		- }  ${current}\n${diff}`;
	`177`	+ message += `   ${GlyphChars.Dash}   ${previous}  ${GlyphChars.ArrowLeftRightLong}  ${current}\n${diff}`;
`180`	`178`
`181`	`179`	`const markdown = new MarkdownString(message);`
`182`	`180`	`markdown.isTrusted = true;`
Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,7 @@ export class StatusFileFormatter extends Formatter<GitFile, StatusFormatOptions>`
`67`	`67`	icon = `${GlyphChars.Pencil}${GlyphChars.Space}${GlyphChars.SpaceThinnest}${GlyphChars.Check}`;
`68`	`68`	`}`
`69`	`69`	`else if (statusFile.workingTreeStatus !== undefined) {`
`70`		- icon = `${GlyphChars.Pencil}${GlyphChars.SpaceThin}${GlyphChars.SpaceThinnest}${GlyphChars.EnDash}${
`71`		`- GlyphChars.Space`
`72`		- }`;
	`70`	+ icon = `${GlyphChars.Pencil}${GlyphChars.SpaceThin}${GlyphChars.SpaceThinnest}${GlyphChars.EnDash}${GlyphChars.Space}`;
`73`	`71`	`}`
`74`	`72`	`else if (statusFile.indexStatus !== undefined) {`
`75`	`73`	icon = `${GlyphChars.Space}${GlyphChars.EnDash}${GlyphChars.Space.repeat(2)}${GlyphChars.Check}`;
Original file line number	Diff line number	Diff line change
`@@ -135,9 +135,7 @@ export class GitStatus {`
`135`	`135`	return `${prefix}${status}${suffix}`;
`136`	`136`	`}`
`137`	`137`
`138`		- return `${prefix}${state.behind}${GlyphChars.ArrowDown}${separator}${state.ahead}${
`139`		`- GlyphChars.ArrowUp`
`140`		- }${suffix}`;
	`138`	+ return `${prefix}${state.behind}${GlyphChars.ArrowDown}${separator}${state.ahead}${GlyphChars.ArrowUp}${suffix}`;
`141`	`139`	`}`
`142`	`140`	`}`
`143`	`141`
Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,7 @@ export class CommitNode extends ViewRefNode<ViewWithFiles> {`
`63`	`63`
`64`	`64`	`const branchAndTagTips = this.getBranchAndTagTips && this.getBranchAndTagTips(this.commit.sha);`
`65`	`65`	`if (branchAndTagTips !== undefined) {`
`66`		- label = `${GlyphChars.AngleBracketLeftHeavy}${GlyphChars.SpaceThin}${branchAndTagTips}${
`67`		`- GlyphChars.SpaceThin`
`68`		- }${GlyphChars.AngleBracketRightHeavy}${GlyphChars.ArrowHeadRight}${GlyphChars.Space} ${label}`;
	`66`	+ label = `${GlyphChars.AngleBracketLeftHeavy}${GlyphChars.SpaceThin}${branchAndTagTips}${GlyphChars.SpaceThin}${GlyphChars.AngleBracketRightHeavy}${GlyphChars.ArrowHeadRight}${GlyphChars.Space} ${label}`;
`69`	`67`	`}`
`70`	`68`
`71`	`69`	`const item = new TreeItem(label, TreeItemCollapsibleState.Collapsed);`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,7 @@ export class CompareBranchNode extends ViewNode<RepositoriesView> {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`get id(): string {`
`25`		- return `${this._instanceId}:gitlens:repository(${this.branch.repoPath}):branch(${
`26`		`- this.branch.name`
`27`		- }):compareWith`;
	`25`	+ return `${this._instanceId}:gitlens:repository(${this.branch.repoPath}):branch(${this.branch.name}):compareWith`;
`28`	`26`	`}`
`29`	`27`
`30`	`28`	`getChildren(): ViewNode[] {`