From e3166591111db5254e5ceaa5d5c33f5c44772950 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Fri, 29 Sep 2017 22:33:19 -0400 Subject: [PATCH] Cleans up some nitpick issues --- src/commands/externalDiff.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/commands/externalDiff.ts b/src/commands/externalDiff.ts index d7bb16e..3b9ee73 100644 --- a/src/commands/externalDiff.ts +++ b/src/commands/externalDiff.ts @@ -40,8 +40,8 @@ interface Resource extends SourceControlResourceState { } class ExternalDiffFile { - constructor(public uri: Uri, public staged: boolean) { - } + + constructor(public uri: Uri, public staged: boolean) { } } export interface ExternalDiffCommandArgs { @@ -49,6 +49,7 @@ export interface ExternalDiffCommandArgs { } export class ExternalDiffCommand extends Command { + constructor(private git: GitService) { super(Commands.ExternalDiff); } @@ -56,14 +57,17 @@ export class ExternalDiffCommand extends Command { protected async preExecute(context: CommandContext, args: ExternalDiffCommandArgs = {}): Promise { if (context.type === 'scm-states') { args = { ...args }; - args.files = context.scmResourceStates.map((_: Resource) => new ExternalDiffFile(_.resourceUri, _.resourceGroupType === ResourceGroupType.Index)); + args.files = context.scmResourceStates + .map((r: Resource) => new ExternalDiffFile(r.resourceUri, r.resourceGroupType === ResourceGroupType.Index)); return this.execute(args); } else if (context.type === 'scm-groups') { const isModified = (status: Status): boolean => status === Status.BOTH_MODIFIED || status === Status.INDEX_MODIFIED || status === Status.MODIFIED; args = { ...args }; - args.files = context.scmResourceGroups[0].resourceStates.filter((_: Resource) => isModified(_.type)).map((_: Resource) => new ExternalDiffFile(_.resourceUri, _.resourceGroupType === ResourceGroupType.Index)); + args.files = context.scmResourceGroups[0].resourceStates + .filter((r: Resource) => isModified(r.type)) + .map((r: Resource) => new ExternalDiffFile(r.resourceUri, r.resourceGroupType === ResourceGroupType.Index)); return this.execute(args); } @@ -84,7 +88,7 @@ export class ExternalDiffCommand extends Command { const repoPath = await this.git.getRepoPathFromUri(undefined); if (!repoPath) return Messages.showNoRepositoryWarningMessage(`Unable to open changed files`); - if (!args.files) { + if (args.files === undefined) { const status = await this.git.getStatusForRepo(repoPath); if (status === undefined) return window.showWarningMessage(`Unable to open changed files`);