wlxsp
/
test1
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Removes extra spacing from codicon formatting

main
Eric Amodio 2 years ago
parent
8ad81f9464
commit
ab211ed764
2 changed files with 64 additions and 68 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -4
      src/git/models/reference.ts
  2. +60
    -64
      src/quickpicks/items/gitCommands.ts

+ 4
- 4
src/git/models/reference.ts View File

@ -264,12 +264,12 @@ export namespace GitReference {
switch (ref.refType) {
case 'branch':
result = `${options.label ? `${ref.remote ? 'remote ' : ''}branch ` : ''}${
options.icon ? `$(git-branch)${GlyphChars.Space}${refName}${GlyphChars.Space}` : refName
options.icon ? `$(git-branch)${GlyphChars.Space}${refName}` : refName
}`;
break;
case 'tag':
result = `${options.label ? 'tag ' : ''}${
options.icon ? `$(tag)${GlyphChars.Space}${refName}${GlyphChars.Space}` : refName
options.icon ? `$(tag)${GlyphChars.Space}${refName}` : refName
}`;
break;
default: {
@ -285,7 +285,7 @@ export namespace GitReference {
result = `${options.label ? 'stash ' : ''}${
options.icon
? `$(archive)${GlyphChars.Space}${message ?? ref.name}${GlyphChars.Space}`
? `$(archive)${GlyphChars.Space}${message ?? ref.name}`
: `${message ?? ref.number ?? ref.name}`
}`;
} else if (GitRevision.isRange(ref.ref)) {
@ -312,7 +312,7 @@ export namespace GitReference {
result = `${options.label ? `${prefix}commit ` : ''}${
options.icon
? `$(git-commit)${GlyphChars.Space}${refName}${message ?? ''}${GlyphChars.Space}`
? `$(git-commit)${GlyphChars.Space}${refName}${message ?? ''}`
: `${refName}${message ?? ''}`
}`;
}

+ 60
- 64
src/quickpicks/items/gitCommands.ts View File

@ -54,7 +54,7 @@ export namespace BranchQuickPickItem {
): Promise<BranchQuickPickItem> {
let description = '';
if (options?.type === true) {
if (options?.current === true && branch.current) {
if (options.current === true && branch.current) {
description = 'current branch';
} else {
description = 'branch';
@ -108,8 +108,8 @@ export namespace BranchQuickPickItem {
if (options?.ref) {
if (branch.sha) {
description = description
? `${description}${pad('$(git-commit)', 2, 2)}${GitRevision.shorten(branch.sha)}`
: `${pad('$(git-commit)', 0, 2)}${GitRevision.shorten(branch.sha)}`;
? `${description} $(git-commit)${GlyphChars.Space}${GitRevision.shorten(branch.sha)}`
: `$(git-commit)${GlyphChars.Space}${GitRevision.shorten(branch.sha)}`;
}
if (branch.date !== undefined) {
@ -122,9 +122,9 @@ export namespace BranchQuickPickItem {
const checked =
options?.checked || (options?.checked == null && options?.current === 'checkmark' && branch.current);
const item: BranchQuickPickItem = {
label: `${pad('$(git-branch)', 0, 2)}${branch.starred ? '$(star-full) ' : ''}${branch.name}${
checked ? `${GlyphChars.Space.repeat(2)}$(check)${GlyphChars.Space}` : ''
}`,
label: `$(git-branch)${GlyphChars.Space}${branch.starred ? `$(star-full)${GlyphChars.Space}` : ''}${
branch.name
}${checked ? pad('$(check)', 2) : ''}`,
description: description,
alwaysShow: options?.alwaysShow,
buttons: options?.buttons,
@ -150,14 +150,14 @@ export namespace CommitQuickPickItem {
export function create<T extends GitCommit = GitCommit>(
commit: T,
picked?: boolean,
options: { alwaysShow?: boolean; buttons?: QuickInputButton[]; compact?: boolean; icon?: boolean } = {},
options?: { alwaysShow?: boolean; buttons?: QuickInputButton[]; compact?: boolean; icon?: boolean },
) {
if (GitCommit.isStash(commit)) {
const number = commit.number == null ? '' : `${commit.number}: `;
if (options.compact) {
if (options?.compact) {
const item: CommitQuickPickItem<T> = {
label: `${options.icon ? pad('$(archive)', 0, 2) : ''}${number}${commit.summary}`,
label: `${options.icon ? `$(archive)${GlyphChars.Space}` : ''}${number}${commit.summary}`,
description: `${commit.formattedDate}${pad(GlyphChars.Dot, 2, 2)}${commit.formatStats({
compact: true,
})}`,
@ -171,15 +171,15 @@ export namespace CommitQuickPickItem {
}
const item: CommitQuickPickItem<T> = {
label: `${options.icon ? pad('$(archive)', 0, 2) : ''}${number}${commit.summary}`,
label: `${options?.icon ? `$(archive)${GlyphChars.Space}` : ''}${number}${commit.summary}`,
description: '',
detail: `${GlyphChars.Space.repeat(2)}${commit.formattedDate}${pad(
GlyphChars.Dot,
2,
2,
)}${commit.formatStats({ compact: true })}`,
alwaysShow: options.alwaysShow,
buttons: options.buttons,
alwaysShow: options?.alwaysShow,
buttons: options?.buttons,
picked: picked,
item: commit,
};
@ -187,10 +187,10 @@ export namespace CommitQuickPickItem {
return item;
}
if (options.compact) {
if (options?.compact) {
const item: CommitQuickPickItem<T> = {
label: `${options.icon ? pad('$(git-commit)', 0, 2) : ''}${commit.summary}`,
description: `${commit.author.name}, ${commit.formattedDate}${pad('$(git-commit)', 2, 2)}${
label: `${options.icon ? `$(git-commit)${GlyphChars.Space}` : ''}${commit.summary}`,
description: `${commit.author.name}, ${commit.formattedDate}${pad('$(git-commit)', 2, 1)}${
commit.shortSha
}${pad(GlyphChars.Dot, 2, 2)}${commit.formatStats({ compact: true })}`,
alwaysShow: options.alwaysShow,
@ -202,17 +202,17 @@ export namespace CommitQuickPickItem {
}
const item: CommitQuickPickItem<T> = {
label: `${options.icon ? pad('$(git-commit)', 0, 2) : ''}${commit.summary}`,
label: `${options?.icon ? `$(git-commit)${GlyphChars.Space}` : ''}${commit.summary}`,
description: '',
detail: `${GlyphChars.Space.repeat(2)}${commit.author.name}, ${commit.formattedDate}${pad(
'$(git-commit)',
2,
2,
1,
)}${commit.shortSha}${pad(GlyphChars.Dot, 2, 2)}${commit.formatStats({
compact: true,
})}`,
alwaysShow: options.alwaysShow,
buttons: options.buttons,
alwaysShow: options?.alwaysShow,
buttons: options?.buttons,
picked: picked,
item: commit,
};
@ -226,13 +226,13 @@ export namespace ContributorQuickPickItem {
export function create(
contributor: GitContributor,
picked?: boolean,
options: { alwaysShow?: boolean; buttons?: QuickInputButton[] } = {},
options?: { alwaysShow?: boolean; buttons?: QuickInputButton[] },
): ContributorQuickPickItem {
const item: ContributorQuickPickItem = {
label: contributor.label,
description: contributor.email,
alwaysShow: options.alwaysShow,
buttons: options.buttons,
alwaysShow: options?.alwaysShow,
buttons: options?.buttons,
picked: picked,
item: contributor,
};
@ -251,14 +251,14 @@ export namespace RefQuickPickItem {
ref: string | GitReference,
repoPath: string,
picked?: boolean,
options: { alwaysShow?: boolean; buttons?: QuickInputButton[]; icon?: boolean; ref?: boolean } = {},
options?: { alwaysShow?: boolean; buttons?: QuickInputButton[]; icon?: boolean; ref?: boolean },
): RefQuickPickItem {
if (ref === '') {
return {
label: `${options.icon ? pad('$(file-directory)', 0, 2) : ''}Working Tree`,
label: `${options?.icon ? `$(file-directory)${GlyphChars.Space}` : ''}Working Tree`,
description: '',
alwaysShow: options.alwaysShow,
buttons: options.buttons,
alwaysShow: options?.alwaysShow,
buttons: options?.buttons,
picked: picked,
item: GitReference.create(ref, repoPath, { refType: 'revision', name: 'Working Tree' }),
current: false,
@ -269,10 +269,10 @@ export namespace RefQuickPickItem {
if (ref === 'HEAD') {
return {
label: `${options.icon ? pad('$(git-branch)', 0, 2) : ''}HEAD`,
label: `${options?.icon ? `$(git-branch)${GlyphChars.Space}` : ''}HEAD`,
description: '',
alwaysShow: options.alwaysShow,
buttons: options.buttons,
alwaysShow: options?.alwaysShow,
buttons: options?.buttons,
picked: picked,
item: GitReference.create(ref, repoPath, { refType: 'revision', name: 'HEAD' }),
current: false,
@ -293,8 +293,8 @@ export namespace RefQuickPickItem {
return {
label: `Range ${gitRef.name}`,
description: '',
alwaysShow: options.alwaysShow,
buttons: options.buttons,
alwaysShow: options?.alwaysShow,
buttons: options?.buttons,
picked: picked,
item: gitRef,
current: false,
@ -305,9 +305,9 @@ export namespace RefQuickPickItem {
const item: RefQuickPickItem = {
label: `Commit ${gitRef.name}`,
description: options.ref ? `$(git-commit) ${ref}` : '',
alwaysShow: options.alwaysShow,
buttons: options.buttons,
description: options?.ref ? `$(git-commit) class="si">${GlyphChars.Space}${ref}` : '',
alwaysShow: options?.alwaysShow,
buttons: options?.buttons,
picked: picked,
item: gitRef,
current: false,
@ -327,25 +327,25 @@ export namespace RepositoryQuickPickItem {
export async function create(
repository: Repository,
picked?: boolean,
options: {
options?: {
alwaysShow?: boolean;
branch?: boolean;
buttons?: QuickInputButton[];
fetched?: boolean;
status?: boolean;
} = {},
},
) {
let repoStatus;
if (options.branch || options.status) {
if (options?.branch || options?.status) {
repoStatus = await repository.getStatus();
}
let description = '';
if (options.branch && repoStatus != null) {
if (options?.branch && repoStatus != null) {
description = repoStatus.branch;
}
if (options.status && repoStatus != null) {
if (options?.status && repoStatus != null) {
let workingStatus = '';
if (repoStatus.files.length !== 0) {
workingStatus = repoStatus.getFormattedDiffStatus({
@ -364,7 +364,7 @@ export namespace RepositoryQuickPickItem {
}
}
if (options.fetched) {
if (options?.fetched) {
const lastFetched = await repository.getLastFetched();
if (lastFetched !== 0) {
const fetched = `Last fetched ${fromNow(new Date(lastFetched))}`;
@ -375,8 +375,8 @@ export namespace RepositoryQuickPickItem {
const item: RepositoryQuickPickItem = {
label: repository.formattedName,
description: description,
alwaysShow: options.alwaysShow,
buttons: options.buttons,
alwaysShow: options?.alwaysShow,
buttons: options?.buttons,
picked: picked,
item: repository,
repoPath: repository.path,
@ -396,40 +396,38 @@ export namespace TagQuickPickItem {
export function create(
tag: GitTag,
picked?: boolean,
options: {
options?: {
alwaysShow?: boolean;
buttons?: QuickInputButton[];
checked?: boolean;
message?: boolean;
ref?: boolean;
type?: boolean;
} = {},
},
) {
let description = '';
if (options.type) {
if (options?.type) {
description = 'tag';
}
if (options.ref) {
description = `${description}${pad('$(git-commit)', description ? 2 : 0, 2)}${GitRevision.shorten(
if (options?.ref) {
description = `${description}${pad('$(git-commit)', description ? 2 : 0, 1)}${GitRevision.shorten(
tag.sha,
)}`;
description = `${description ? `${description}${pad(GlyphChars.Dot, 2, 2)}` : ''}${tag.formattedDate}`;
}
if (options.message) {
if (options?.message) {
const message = emojify(tag.message);
description = description ? `${description}${pad(GlyphChars.Dot, 2, 2)}${message}` : message;
}
const item: TagQuickPickItem = {
label: `${pad('$(tag)', 0, 2)}${tag.name}${
options.checked ? `${GlyphChars.Space.repeat(2)}$(check)${GlyphChars.Space}` : ''
}`,
label: `$(tag)${GlyphChars.Space}${tag.name}${options?.checked ? pad('$(check)', 2) : ''}`,
description: description,
alwaysShow: options.alwaysShow,
buttons: options.buttons,
alwaysShow: options?.alwaysShow,
buttons: options?.buttons,
picked: picked,
item: tag,
current: false,
@ -450,7 +448,7 @@ export namespace WorktreeQuickPickItem {
export function create(
worktree: GitWorktree,
picked?: boolean,
options: {
options?: {
alwaysShow?: boolean;
buttons?: QuickInputButton[];
checked?: boolean;
@ -458,20 +456,20 @@ export namespace WorktreeQuickPickItem {
ref?: boolean;
type?: boolean;
status?: GitStatus;
} = {},
},
) {
let description = '';
if (options.type) {
if (options?.type) {
description = 'worktree';
}
if (options.status != null) {
if (options?.status != null) {
description += options.status.hasChanges
? pad(`Uncommited Changes (${options.status.getFormattedDiffStatus()})`, description ? 2 : 0, 0)
: pad('No Changes', description ? 2 : 0, 0);
}
if (options.ref) {
if (options?.ref) {
description += `${description ? pad(GlyphChars.Dot, 2, 2) : ''}${worktree.friendlyPath}`;
}
@ -493,16 +491,14 @@ export namespace WorktreeQuickPickItem {
}
const item: WorktreeQuickPickItem = {
label: `${pad(icon, 0, 2)}${label}${
options.checked ? `${GlyphChars.Space.repeat(2)}$(check)${GlyphChars.Space}` : ''
}`,
label: `${icon}${GlyphChars.Space}${label}${options?.checked ? pad('$(check)', 2) : ''}`,
description: description,
alwaysShow: options.alwaysShow,
buttons: options.buttons,
alwaysShow: options?.alwaysShow,
buttons: options?.buttons,
picked: picked,
item: worktree,
opened: worktree.opened,
hasChanges: options.status?.hasChanges,
hasChanges: options?.status?.hasChanges,
};
return item;

Write Preview
Loading…
Cancel
Save