daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Git - add support for type changed (#187714) 

* Initial implementation

* Add icons
pull/187726/head
Ladislau Szomoru 2023-07-12 16:18:38 +02:00 committed by GitHub
parent ba8caef810
commit ad395686d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/git/resources/icons/dark/status-type-changed.svg 100644
View File

@ -0,0 +1,6 @@
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
<rect fill="#B21B8F" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
T
</text>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 432 B

6
extensions/git/resources/icons/light/status-type-changed.svg 100644
View File

@ -0,0 +1,6 @@
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
<rect fill="#B21B8F" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, &quot;Droid Sans Mono&quot;, &quot;Inconsolata&quot;, &quot;Courier New&quot;, monospace, &quot;Droid Sans Fallback&quot;;" fill="white">
T
</text>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 432 B

1
extensions/git/src/api/api1.ts
View File

@ -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';

1
extensions/git/src/api/git.d.ts vendored
View File

@ -79,6 +79,7 @@ export const enum Status {
IGNORED,
INTENT_TO_ADD,
INTENT_TO_RENAME,
TYPE_CHANGED,
ADDED_BY_US,
ADDED_BY_THEM,

18
extensions/git/src/repository.ts
View File

@ -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');
@ -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'),
@ -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')
}
};
@ -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;
@ -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:
@ -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');
@ -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;
@ -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:
@ -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);
@ -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 '';
}
@ -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;

1
extensions/github/src/typings/git.d.ts vendored
View File

@ -79,6 +79,7 @@ export const enum Status {
IGNORED,
INTENT_TO_ADD,
INTENT_TO_RENAME,
TYPE_CHANGED,
ADDED_BY_US,
ADDED_BY_THEM,