From 536652aab578d86d2e2cfc37e4050fce7c1adcde Mon Sep 17 00:00:00 2001 From: "michaelwood@onetrail.com" Date: Wed, 23 Sep 2020 20:31:30 +0200 Subject: [PATCH] added additional colour options for differing git staging statuses --- extensions/git/package.json | 27 +++++++++++++++++++++++++++ extensions/git/package.nls.json | 3 +++ extensions/git/src/repository.ts | 3 +++ 3 files changed, 33 insertions(+) diff --git a/extensions/git/package.json b/extensions/git/package.json index 6570b4a36c5..28e4b30083f 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -1922,6 +1922,33 @@ "highContrast": "#E2C08D" } }, + { + "id": "gitDecoration.stageAddedResourceForeground", + "description": "%colors.stageAdded%", + "defaults": { + "light": "#0a7a62", + "dark": "#02c39a", + "highContrast": "#00cea1" + } + }, + { + "id": "gitDecoration.stageModifiedResourceForeground", + "description": "%colors.stageModified%", + "defaults": { + "light": "#FF661F", + "dark": "#FFAB85", + "highContrast": "#ca541d" + } + }, + { + "id": "gitDecoration.stageDeletedResourceForeground", + "description": "%colors.stageDeleted%", + "defaults": { + "light": "#ad0707", + "dark": "#c74e39", + "highContrast": "#c74e39" + } + }, { "id": "gitDecoration.deletedResourceForeground", "description": "%colors.deleted%", diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json index 28e72ec312b..debe09bae40 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json @@ -168,6 +168,9 @@ "submenu.stash": "Stash", "colors.added": "Color for added resources.", "colors.modified": "Color for modified resources.", + "colors.stageAdded": "Color for resources which have been staged.", + "colors.stageModified": "Color for resources which have been staged, but modified.", + "colors.stageDeleted": "Color for resources which have been staged, but deleted.", "colors.deleted": "Color for deleted resources.", "colors.untracked": "Color for untracked resources.", "colors.ignored": "Color for ignored resources.", diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index f5e8a5ccfb3..91e5d3ec4f6 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -205,12 +205,15 @@ export class Resource implements SourceControlResourceState { get color(): ThemeColor { switch (this.type) { case Status.INDEX_MODIFIED: + return new ThemeColor('gitDecoration.stageModifiedResourceForeground'); case Status.MODIFIED: return new ThemeColor('gitDecoration.modifiedResourceForeground'); case Status.INDEX_DELETED: + return new ThemeColor('gitDecoration.stageDeletedResourceForeground'); case Status.DELETED: return new ThemeColor('gitDecoration.deletedResourceForeground'); case Status.INDEX_ADDED: + return new ThemeColor('gitDecoration.stageAddedResourceForeground'); case Status.INTENT_TO_ADD: return new ThemeColor('gitDecoration.addedResourceForeground'); case Status.INDEX_RENAMED: -- GitLab