Skip to content

Commit

Permalink
Reverse sub-command titles for easier readability
Browse files Browse the repository at this point in the history
  • Loading branch information
@eamodio
eamodio committed Sep 28, 2019
1 parent 9ff0407 commit 48638ec
Showing 1 changed file with 26 additions and 29 deletions.
55 changes: 26 additions & 29 deletions src/commands/git/stash.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ interface PushState {
type State = ApplyState | DropState | ListState | PopState | PushState;
type StashStepState<T> = StepState<T> & { repo: Repository };

const subcommandToSubtitleMap = new Map<State['subcommand'], string>([
const subcommandToTitleMap = new Map<State['subcommand'], string>([
['apply', 'Apply'],
['drop', 'Drop'],
['list', 'List'],
['pop', 'Pop'],
['push', 'Push']
]);
function getSubtitle(subcommand: State['subcommand'] | undefined) {
return subcommand === undefined ? '' : subcommandToSubtitleMap.get(subcommand);
function getTitle(title: string, subcommand: State['subcommand'] | undefined) {
return subcommand === undefined ? title : `${subcommandToTitleMap.get(subcommand)} ${title}`;
}

export interface StashGitCommandArgs {
Expand Down Expand Up @@ -216,7 +216,7 @@ export class StashGitCommand extends QuickCommandBase<State> {
const active = state.repo ? state.repo : await Container.git.getActiveRepository();

const step = this.createPickStep<RepositoryQuickPickItem>({
title: `${this.title} ${getSubtitle(state.subcommand)}`,
title: getTitle(this.title, state.subcommand),
placeholder: 'Choose a repository',
items: await Promise.all(
repos.map(r =>
Expand Down Expand Up @@ -320,7 +320,7 @@ export class StashGitCommand extends QuickCommandBase<State> {
const stash = await Container.git.getStashList(state.repo.path);

const step = this.createPickStep<CommitQuickPickItem<GitStashCommit>>({
title: `${this.title} ${getSubtitle(state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
title: `${getTitle(this.title, state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
state.repo.formattedName
}`,
placeholder:
Expand Down Expand Up @@ -367,8 +367,7 @@ export class StashGitCommand extends QuickCommandBase<State> {
onDidPressKey: async (quickpick, key) => {
if (quickpick.activeItems.length === 0) return;

const stash = quickpick.activeItems[0].item;
await Container.repositoriesView.revealStash(stash, {
await Container.repositoriesView.revealStash(quickpick.activeItems[0].item, {
select: true,
focus: false,
expand: true
Expand All @@ -391,12 +390,12 @@ export class StashGitCommand extends QuickCommandBase<State> {
: state.stash.message;

const step = this.createConfirmStep<QuickPickItem & { command: 'apply' | 'pop' }>(
`Confirm ${this.title} ${getSubtitle(state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
`Confirm ${getTitle(this.title, state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
state.repo.formattedName
}`,
[
{
label: `${this.title} ${getSubtitle(state.subcommand)}`,
label: getTitle(this.title, state.subcommand),
description: `${state.stash.stashName}${Strings.pad(GlyphChars.Dash, 2, 2)}${message}`,
detail:
state.subcommand === 'pop'
Expand All @@ -410,7 +409,7 @@ export class StashGitCommand extends QuickCommandBase<State> {
},
// Alternate confirmation (if pop then apply, and vice versa)
{
label: `${this.title} ${state.subcommand === 'pop' ? 'Apply' : 'Pop'}`,
label: getTitle(this.title, state.subcommand === 'pop' ? 'apply' : 'pop'),
description: `${state.stash!.stashName}${Strings.pad(GlyphChars.Dash, 2, 2)}${message}`,
detail:
state.subcommand === 'pop'
Expand All @@ -425,7 +424,7 @@ export class StashGitCommand extends QuickCommandBase<State> {
],
undefined,
{
placeholder: `Confirm ${this.title} ${getSubtitle(state.subcommand)}`,
placeholder: `Confirm ${getTitle(this.title, state.subcommand)}`,
additionalButtons: [this.Buttons.RevealInView],
onDidClickButton: (quickpick, button) => {
if (button === this.Buttons.RevealInView) {
Expand Down Expand Up @@ -460,7 +459,7 @@ export class StashGitCommand extends QuickCommandBase<State> {
const stash = await Container.git.getStashList(state.repo.path);

const step = this.createPickStep<CommitQuickPickItem<GitStashCommit>>({
title: `${this.title} ${getSubtitle(state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
title: `${getTitle(this.title, state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
state.repo.formattedName
}`,
placeholder:
Expand Down Expand Up @@ -505,8 +504,7 @@ export class StashGitCommand extends QuickCommandBase<State> {
onDidPressKey: async (quickpick, key) => {
if (quickpick.activeItems.length === 0) return;

const stash = quickpick.activeItems[0].item;
await Container.repositoriesView.revealStash(stash, {
await Container.repositoriesView.revealStash(quickpick.activeItems[0].item, {
select: true,
focus: false,
expand: true
Expand All @@ -528,19 +526,19 @@ export class StashGitCommand extends QuickCommandBase<State> {
: state.stash.message;

const step = this.createConfirmStep(
`Confirm ${this.title} ${getSubtitle(state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
`Confirm ${getTitle(this.title, state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
state.repo.formattedName
}`,
[
{
label: `${this.title} ${getSubtitle(state.subcommand)}`,
label: getTitle(this.title, state.subcommand),
description: `${state.stash.stashName}${Strings.pad(GlyphChars.Dash, 2, 2)}${message}`,
detail: `Will delete ${state.stash.stashName}`
}
],
undefined,
{
placeholder: `Confirm ${this.title} ${getSubtitle(state.subcommand)}`,
placeholder: `Confirm ${getTitle(this.title, state.subcommand)}`,
additionalButtons: [this.Buttons.RevealInView],
onDidClickButton: (quickpick, button) => {
if (button === this.Buttons.RevealInView) {
Expand Down Expand Up @@ -573,7 +571,7 @@ export class StashGitCommand extends QuickCommandBase<State> {
const stash = await Container.git.getStashList(state.repo.path);

const step = this.createPickStep<CommitQuickPickItem<GitStashCommit>>({
title: `${this.title} ${getSubtitle(state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
title: `${getTitle(this.title, state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
state.repo.formattedName
}`,
placeholder: stash === undefined ? `${state.repo.formattedName} has no stashes` : 'Choose a stash',
Expand Down Expand Up @@ -613,8 +611,7 @@ export class StashGitCommand extends QuickCommandBase<State> {
onDidPressKey: async (quickpick, key) => {
if (quickpick.activeItems.length === 0) return;

const stash = quickpick.activeItems[0].item;
await Container.repositoriesView.revealStash(stash, {
await Container.repositoriesView.revealStash(quickpick.activeItems[0].item, {
select: true,
focus: false,
expand: true
Expand All @@ -631,7 +628,7 @@ export class StashGitCommand extends QuickCommandBase<State> {

if (pickedStash !== undefined) {
const step = this.createPickStep<CommandQuickPickItem>({
title: `${this.title} ${getSubtitle(state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
title: `${getTitle(this.title, state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
state.repo.formattedName
}${Strings.pad(GlyphChars.Dot, 2, 2)}${pickedStash.shortSha}`,
placeholder: `${
Expand Down Expand Up @@ -675,7 +672,7 @@ export class StashGitCommand extends QuickCommandBase<State> {
while (true) {
if (state.message === undefined || state.counter < 3) {
const step = this.createInputStep({
title: `${this.title} ${getSubtitle(state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
title: `${getTitle(this.title, state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
state.repo.formattedName
}`,
placeholder: 'Please provide a stash message',
Expand All @@ -693,30 +690,30 @@ export class StashGitCommand extends QuickCommandBase<State> {

if (this.confirm(state.confirm)) {
const step: QuickPickStep<FlagsQuickPickItem<PushFlags>> = this.createConfirmStep(
`Confirm ${this.title} ${getSubtitle(state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
`Confirm ${getTitle(this.title, state.subcommand)}${Strings.pad(GlyphChars.Dot, 2, 2)}${
state.repo.formattedName
}`,
state.uris === undefined || state.uris.length === 0
? [
FlagsQuickPickItem.create<PushFlags>(state.flags, [], {
label: `${this.title} ${getSubtitle(state.subcommand)}`,
label: getTitle(this.title, state.subcommand),
description: state.message,
detail: 'Will stash uncommitted changes'
}),
FlagsQuickPickItem.create<PushFlags>(state.flags, ['--include-untracked'], {
label: `${this.title} ${getSubtitle(state.subcommand)} & Include Untracked`,
label: `${getTitle(this.title, state.subcommand)} & Include Untracked`,
description: `--include-untracked ${state.message}`,
detail: 'Will stash uncommitted changes, including untracked files'
}),
FlagsQuickPickItem.create<PushFlags>(state.flags, ['--keep-index'], {
label: `${this.title} ${getSubtitle(state.subcommand)} & Keep Staged`,
label: `${getTitle(this.title, state.subcommand)} & Keep Staged`,
description: `--keep-index ${state.message}`,
detail: 'Will stash uncommitted changes, but will keep staged files intact'
})
]
: [
FlagsQuickPickItem.create<PushFlags>(state.flags, [], {
label: `${this.title} ${getSubtitle(state.subcommand)}`,
label: getTitle(this.title, state.subcommand),
description: state.message,
detail: `Will stash changes in ${
state.uris.length === 1
Expand All @@ -725,7 +722,7 @@ export class StashGitCommand extends QuickCommandBase<State> {
}`
}),
FlagsQuickPickItem.create<PushFlags>(state.flags, ['--keep-index'], {
label: `${this.title} ${getSubtitle(state.subcommand)} & Keep Staged`,
label: `${getTitle(this.title, state.subcommand)} & Keep Staged`,
description: `--keep-index ${state.message}`,
detail: `Will stash changes in ${
state.uris.length === 1
Expand All @@ -735,7 +732,7 @@ export class StashGitCommand extends QuickCommandBase<State> {
})
],
undefined,
{ placeholder: `Confirm ${this.title} ${getSubtitle(state.subcommand)}` }
{ placeholder: `Confirm ${getTitle(this.title, state.subcommand)}` }
);
const selection: StepSelection<typeof step> = yield step;

Expand Down

0 comments on commit 48638ec

Please sign in to comment.