Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Git - add support for type changed #187714

Merged
merged 2 commits into from
Jul 12, 2023
Merged

Git - add support for type changed #187714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
781e639
Initial implementation
lszomoru Jul 11, 2023
f9c6f9a
Add icons
lszomoru Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions extensions/git/resources/icons/dark/status-type-changed.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions extensions/git/resources/icons/light/status-type-changed.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions extensions/git/src/api/api1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ function getStatus(status: Status): string {
case Status.IGNORED: return 'IGNORED';
case Status.INTENT_TO_ADD: return 'INTENT_TO_ADD';
case Status.INTENT_TO_RENAME: return 'INTENT_TO_RENAME';
case Status.TYPE_CHANGED: return 'TYPE_CHANGED';
case Status.ADDED_BY_US: return 'ADDED_BY_US';
case Status.ADDED_BY_THEM: return 'ADDED_BY_THEM';
case Status.DELETED_BY_US: return 'DELETED_BY_US';
Expand Down
1 change: 1 addition & 0 deletions extensions/git/src/api/git.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ export const enum Status {
IGNORED,
INTENT_TO_ADD,
INTENT_TO_RENAME,
TYPE_CHANGED,

ADDED_BY_US,
ADDED_BY_THEM,
Expand Down
18 changes: 16 additions & 2 deletions extensions/git/src/repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export class Resource implements SourceControlResourceState {
case Status.IGNORED: return l10n.t('Ignored');
case Status.INTENT_TO_ADD: return l10n.t('Intent to Add');
case Status.INTENT_TO_RENAME: return l10n.t('Intent to Rename');
case Status.TYPE_CHANGED: return l10n.t('Type Changed');
case Status.BOTH_DELETED: return l10n.t('Conflict: Both Deleted');
case Status.ADDED_BY_US: return l10n.t('Conflict: Added By Us');
case Status.DELETED_BY_THEM: return l10n.t('Conflict: Deleted By Them');
Expand Down Expand Up @@ -112,6 +113,7 @@ export class Resource implements SourceControlResourceState {
Untracked: getIconUri('status-untracked', 'light'),
Ignored: getIconUri('status-ignored', 'light'),
Conflict: getIconUri('status-conflict', 'light'),
TypeChanged: getIconUri('status-type-changed', 'light')
},
dark: {
Modified: getIconUri('status-modified', 'dark'),
Expand All @@ -121,7 +123,8 @@ export class Resource implements SourceControlResourceState {
Copied: getIconUri('status-copied', 'dark'),
Untracked: getIconUri('status-untracked', 'dark'),
Ignored: getIconUri('status-ignored', 'dark'),
Conflict: getIconUri('status-conflict', 'dark')
Conflict: getIconUri('status-conflict', 'dark'),
TypeChanged: getIconUri('status-type-changed', 'dark')
}
};

Expand All @@ -138,6 +141,7 @@ export class Resource implements SourceControlResourceState {
case Status.IGNORED: return Resource.Icons[theme].Ignored;
case Status.INTENT_TO_ADD: return Resource.Icons[theme].Added;
case Status.INTENT_TO_RENAME: return Resource.Icons[theme].Renamed;
case Status.TYPE_CHANGED: return Resource.Icons[theme].TypeChanged;
case Status.BOTH_DELETED: return Resource.Icons[theme].Conflict;
case Status.ADDED_BY_US: return Resource.Icons[theme].Conflict;
case Status.DELETED_BY_THEM: return Resource.Icons[theme].Conflict;
Expand Down Expand Up @@ -197,6 +201,8 @@ export class Resource implements SourceControlResourceState {
case Status.INDEX_RENAMED:
case Status.INTENT_TO_RENAME:
return 'R';
case Status.TYPE_CHANGED:
return 'T';
case Status.UNTRACKED:
return 'U';
case Status.IGNORED:
Expand All @@ -223,6 +229,7 @@ export class Resource implements SourceControlResourceState {
case Status.INDEX_MODIFIED:
return new ThemeColor('gitDecoration.stageModifiedResourceForeground');
case Status.MODIFIED:
case Status.TYPE_CHANGED:
return new ThemeColor('gitDecoration.modifiedResourceForeground');
case Status.INDEX_DELETED:
return new ThemeColor('gitDecoration.stageDeletedResourceForeground');
Expand Down Expand Up @@ -257,6 +264,7 @@ export class Resource implements SourceControlResourceState {
case Status.INDEX_MODIFIED:
case Status.MODIFIED:
case Status.INDEX_COPIED:
case Status.TYPE_CHANGED:
return 2;
case Status.IGNORED:
return 3;
Expand Down Expand Up @@ -525,6 +533,7 @@ class ResourceCommandResolver {
case Status.INDEX_RENAMED:
case Status.INDEX_ADDED:
case Status.INTENT_TO_RENAME:
case Status.TYPE_CHANGED:
return toGitUri(resource.original, 'HEAD');

case Status.MODIFIED:
Expand Down Expand Up @@ -560,7 +569,8 @@ class ResourceCommandResolver {
case Status.UNTRACKED:
case Status.IGNORED:
case Status.INTENT_TO_ADD:
case Status.INTENT_TO_RENAME: {
case Status.INTENT_TO_RENAME:
case Status.TYPE_CHANGED: {
const uriString = resource.resourceUri.toString();
const [indexStatus] = this.repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);

Expand Down Expand Up @@ -609,6 +619,9 @@ class ResourceCommandResolver {
case Status.INTENT_TO_RENAME:
return l10n.t('{0} (Intent to add)', basename);

case Status.TYPE_CHANGED:
return l10n.t('{0} (Type changed)', basename);

default:
return '';
}
Expand Down Expand Up @@ -2188,6 +2201,7 @@ export class Repository implements Disposable {
case 'D': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.DELETED, useIcons, renameUri)); break;
case 'A': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.INTENT_TO_ADD, useIcons, renameUri)); break;
case 'R': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.INTENT_TO_RENAME, useIcons, renameUri)); break;
case 'T': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.TYPE_CHANGED, useIcons, renameUri)); break;
}

return undefined;
Expand Down
1 change: 1 addition & 0 deletions extensions/github/src/typings/git.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ export const enum Status {
IGNORED,
INTENT_TO_ADD,
INTENT_TO_RENAME,
TYPE_CHANGED,

ADDED_BY_US,
ADDED_BY_THEM,
Expand Down