Cleans up some duplicate code

This commit is contained in:
Eric Amodio
2017-06-12 10:33:58 -04:00
parent 5624567daa
commit 64ae82075e
6 changed files with 74 additions and 21 deletions

View File

@@ -1,5 +1,6 @@
'use strict';
import { Uri } from 'vscode';
import { GitUri } from '../gitUri';
import * as path from 'path';
export interface GitStatus {
@@ -32,6 +33,14 @@ export class GitStatusFile implements IGitStatusFile {
this.originalFileName = originalFileName;
}
getFormattedDirectory(includeOriginal: boolean = false): string {
return GitStatusFile.getFormattedDirectory(this, includeOriginal);
}
getFormattedPath(separator: string = ' \u00a0\u2022\u00a0 '): string {
return GitUri.getFormattedPath(this.fileName, separator);
}
getIcon() {
return getGitStatusIcon(this.status);
}
@@ -39,6 +48,13 @@ export class GitStatusFile implements IGitStatusFile {
get Uri(): Uri {
return Uri.file(path.resolve(this.repoPath, this.fileName));
}
static getFormattedDirectory(status: IGitStatusFile, includeOriginal: boolean = false): string {
const directory = GitUri.getDirectory(status.fileName);
return (includeOriginal && status.status === 'R' && status.originalFileName)
? `${directory} \u00a0\u2190\u00a0 ${status.originalFileName}`
: directory;
}
}
const statusOcticonsMap = {