Parcourir la source

Changes the file sort in the custom view

main
Eric Amodio il y a 7 ans
Parent
révision
a114e2de87
4 fichiers modifiés avec 24 ajouts et 10 suppressions
  1. +1
    -0
      CHANGELOG.md
  2. +17
    -8
      src/views/commitFileNode.ts
  3. +3
    -1
      src/views/commitNode.ts
  4. +3
    -1
      src/views/stashNode.ts

+ 1
- 0
CHANGELOG.md Voir le fichier

@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Adds `gitlens.gitExplorer.enabled` setting to specify whether or not to show the `GitLens` custom view - closes [#144](https://github.com/eamodio/vscode-gitlens/issues/144)
### Changed
- Changes the sorting (now alphabetical) of files shown in the `GitLens` custom view
- Changes the default of the `gitlens.gitExplorer.commitFormat` setting to add parentheses around the commit id
- Removes many menu items from `editor/title` & `editor/title/context` by default -- can be re-enabled via the `gitlens.advanced.menus` setting

+ 17
- 8
src/views/commitFileNode.ts Voir le fichier

@ -42,14 +42,7 @@ export class CommitFileNode extends ExplorerNode {
}
}
const label = (this.displayAs & CommitFileNodeDisplayAs.CommitLabel)
? CommitFormatter.fromTemplate(this.getCommitTemplate(), this.commit, {
truncateMessageAtNewLine: true,
dataFormat: this.git.config.defaultDateFormat
} as ICommitFormatOptions)
: StatusFileFormatter.fromTemplate(this.getCommitFileTemplate(), this.status);
const item = new TreeItem(label, TreeItemCollapsibleState.None);
const item = new TreeItem(this.label, TreeItemCollapsibleState.None);
item.contextValue = this.resourceType;
const icon = (this.displayAs & CommitFileNodeDisplayAs.CommitIcon)
@ -63,9 +56,25 @@ export class CommitFileNode extends ExplorerNode {
item.command = this.getCommand();
// Only cache the label for a single refresh
this._label = undefined;
return item;
}
private _label: string | undefined;
get label() {
if (this._label === undefined) {
this._label = (this.displayAs & CommitFileNodeDisplayAs.CommitLabel)
? CommitFormatter.fromTemplate(this.getCommitTemplate(), this.commit, {
truncateMessageAtNewLine: true,
dataFormat: this.git.config.defaultDateFormat
} as ICommitFormatOptions)
: StatusFileFormatter.fromTemplate(this.getCommitFileTemplate(), this.status);
}
return this._label;
}
protected getCommitTemplate() {
return this.git.config.gitExplorer.commitFormat;
}

+ 3
- 1
src/views/commitNode.ts Voir le fichier

@ -26,7 +26,9 @@ export class CommitNode extends ExplorerNode {
const commit = Iterables.first(log.commits.values());
if (commit === undefined) return [];
return [...Iterables.map(commit.fileStatuses, s => new CommitFileNode(s, commit, this.context, this.git, CommitFileNodeDisplayAs.File, this.branch))];
const children = [...Iterables.map(commit.fileStatuses, s => new CommitFileNode(s, commit, this.context, this.git, CommitFileNodeDisplayAs.File, this.branch))];
children.sort((a, b) => a.label!.localeCompare(b.label!));
return children;
}
getTreeItem(): TreeItem {

+ 3
- 1
src/views/stashNode.ts Voir le fichier

@ -31,7 +31,9 @@ export class StashNode extends ExplorerNode {
}
}
return statuses.map(s => new StashFileNode(s, this.commit, this.context, this.git));
const children = statuses.map(s => new StashFileNode(s, this.commit, this.context, this.git));
children.sort((a, b) => a.label!.localeCompare(b.label!));
return children;
}
getTreeItem(): TreeItem {

Chargement…
Annuler
Enregistrer