Parcourir la source

Cleans up more duplicate code

main
Eric Amodio il y a 7 ans
Parent
révision
12debe583c
2 fichiers modifiés avec 4 ajouts et 14 suppressions
  1. +2
    -4
      src/git/models/commit.ts
  2. +2
    -10
      src/quickPicks/repoStatus.ts

+ 2
- 4
src/git/models/commit.ts Voir le fichier

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

+ 2
- 10
src/quickPicks/repoStatus.ts Voir le fichier

@ -3,22 +3,14 @@ import { Iterables } from '../system';
import { commands, QuickPickOptions, TextDocumentShowOptions, Uri, window } from 'vscode';
import { Commands, DiffWithWorkingCommandArgs, Keyboard, Keys, OpenChangedFilesCommandArgs, ShowQuickBranchHistoryCommandArgs, ShowQuickRepoStatusCommandArgs, ShowQuickStashListCommandArgs } from '../commands';
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';
export class OpenStatusFileCommandQuickPickItem extends OpenFileCommandQuickPickItem {
constructor(status: GitStatusFile, item?: QuickPickItem) {
const icon = status.getIcon();
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;
const description = status.getFormattedDirectory(true);
super(status.Uri, item || {
label: `${status.staged ? '$(check)' : '\u00a0\u00a0\u00a0'}\u00a0\u00a0${icon}\u00a0\u00a0\u00a0${path.basename(status.fileName)}`,

||||||
x
 
000:0
Chargement…
Annuler
Enregistrer