Merge branch 'pr/107318'

extensions/git/package.json

@@ -1949,6 +1949,24 @@
           "highContrast": "#A7A8A9"
         }
       },
+      {
+        "id": "gitDecoration.stageModifiedResourceForeground",
+        "description": "%colors.stageModified%",
+        "defaults": {
+          "light": "#895503",
+          "dark": "#E2C08D",
+          "highContrast": "#E2C08D"
+        }
+      },
+      {
+        "id": "gitDecoration.stageDeletedResourceForeground",
+        "description": "%colors.stageDeleted%",
+        "defaults": {
+          "light": "#ad0707",
+          "dark": "#c74e39",
+          "highContrast": "#c74e39"
+        }
+      },
       {
         "id": "gitDecoration.conflictingResourceForeground",
         "description": "%colors.conflict%",

extensions/git/package.nls.json

@@ -168,6 +168,8 @@
 	"submenu.stash": "Stash",
 	"colors.added": "Color for added resources.",
 	"colors.modified": "Color for modified resources.",
+	"colors.stageModified": "Color for modified resources which have been staged.",
+	"colors.stageDeleted": "Color for deleted resources which have been staged.",
 	"colors.deleted": "Color for deleted resources.",
 	"colors.untracked": "Color for untracked resources.",
 	"colors.ignored": "Color for ignored resources.",

extensions/git/src/repository.ts

@@ -205,9 +205,11 @@ 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: