ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-17 02:51:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleans up more duplicate code

Browse Source
This commit is contained in:
Eric Amodio
2017-06-12 12:24:59 -04:00
parent 0160e064be
commit 12debe583c
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/git/models/commit.ts
View File

@@ -1,6 +1,7 @@
'use strict'; 'use strict';
import { Uri } from 'vscode'; import { Uri } from 'vscode';
import { Git } from '../git'; import { Git } from '../git';
import { GitUri } from '../gitUri';
import * as path from 'path'; import * as path from 'path';
export interface GitAuthor { export interface GitAuthor {
@@ -74,9 +75,6 @@ export class GitCommit {
} }
getFormattedPath(separator: string = ' \u00a0\u2022\u00a0 '): string { getFormattedPath(separator: string = ' \u00a0\u2022\u00a0 '): string {
const directory = Git.normalizePath(path.dirname(this.fileName)); return GitUri.getFormattedPath(this.fileName, separator);
return (!directory || directory === '.')
? path.basename(this.fileName)
: `${path.basename(this.fileName)}${separator}${directory}`;
} }
} }

12
src/quickPicks/repoStatus.ts
View File

@@ -3,22 +3,14 @@ import { Iterables } from '../system';
import { commands, QuickPickOptions, TextDocumentShowOptions, Uri, window } from 'vscode'; import { commands, QuickPickOptions, TextDocumentShowOptions, Uri, window } from 'vscode';
import { Commands, DiffWithWorkingCommandArgs, Keyboard, Keys, OpenChangedFilesCommandArgs, ShowQuickBranchHistoryCommandArgs, ShowQuickRepoStatusCommandArgs, ShowQuickStashListCommandArgs } from '../commands'; import { Commands, DiffWithWorkingCommandArgs, Keyboard, Keys, OpenChangedFilesCommandArgs, ShowQuickBranchHistoryCommandArgs, ShowQuickRepoStatusCommandArgs, ShowQuickStashListCommandArgs } from '../commands';
import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, OpenFileCommandQuickPickItem, QuickPickItem } from './common'; import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, OpenFileCommandQuickPickItem, QuickPickItem } from './common';
import { GitService, GitStatus, GitStatusFile, GitUri } from '../gitService'; import { GitStatus, GitStatusFile, GitUri } from '../gitService';
import * as path from 'path'; import * as path from 'path';
export class OpenStatusFileCommandQuickPickItem extends OpenFileCommandQuickPickItem { export class OpenStatusFileCommandQuickPickItem extends OpenFileCommandQuickPickItem {
constructor(status: GitStatusFile, item?: QuickPickItem) { constructor(status: GitStatusFile, item?: QuickPickItem) {
const icon = status.getIcon(); const icon = status.getIcon();
const description = status.getFormattedDirectory(true);
let directory: string | undefined = GitService.normalizePath(path.dirname(status.fileName));
if (!directory || directory === '.') {
directory = '';
}
const description = (status.status === 'R' && status.originalFileName)
? `${directory} \u00a0\u2190\u00a0 ${status.originalFileName}`
: directory;
super(status.Uri, item || { super(status.Uri, item || {
label: `${status.staged ? '$(check)' : '\u00a0\u00a0\u00a0'}\u00a0\u00a0${icon}\u00a0\u00a0\u00a0${path.basename(status.fileName)}`, label: `${status.staged ? '$(check)' : '\u00a0\u00a0\u00a0'}\u00a0\u00a0${icon}\u00a0\u00a0\u00a0${path.basename(status.fileName)}`,