From f502f70345b2828caa33389568ec48086ff9405d Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 30 Oct 2017 12:52:16 +0100
Subject: [PATCH] deco - align git color names

---
 extensions/git/package.json              | 10 +++++-----
 extensions/git/src/decorationProvider.ts |  2 +-
 extensions/git/src/repository.ts         | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index c756e86ac3c..c572274f878 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -834,7 +834,7 @@
     },
     "colors": [
       {
-        "id": "git.color.modified",
+        "id": "git.modifiedForeground",
         "description": "Color for modified resources",
         "defaults": {
           "light": "#a76e12",
@@ -843,7 +843,7 @@
         }
       },
       {
-        "id": "git.color.deleted",
+        "id": "git.deletedForeground",
         "description": "Color for deleted resources",
         "defaults": {
           "light": "#ad0707",
@@ -852,7 +852,7 @@
         }
       },
       {
-        "id": "git.color.untracked",
+        "id": "git.untrackedForeground",
         "description": "Color for untracked resources",
         "defaults": {
           "light": "#019001",
@@ -861,7 +861,7 @@
         }
       },
       {
-        "id": "git.color.ignored",
+        "id": "git.ignoredForeground",
         "description": "Color for ignored resources",
         "defaults": {
           "light": "#8E8E90",
@@ -870,7 +870,7 @@
         }
       },
       {
-        "id": "git.color.conflict",
+        "id": "git.conflictForeground",
         "description": "Color for resources with conflicts",
         "defaults": {
           "light": "#6c6cc4",
diff --git a/extensions/git/src/decorationProvider.ts b/extensions/git/src/decorationProvider.ts
index 813a035b519..de16c4bb723 100644
--- a/extensions/git/src/decorationProvider.ts
+++ b/extensions/git/src/decorationProvider.ts
@@ -40,7 +40,7 @@ class GitIgnoreDecorationProvider implements DecorationProvider {
 			if (ignored) {
 				return <DecorationData>{
 					priority: 3,
-					color: new ThemeColor('git.color.ignored')
+					color: new ThemeColor('git.ignoredForeground')
 				};
 			}
 		});
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 2c80ae10cb4..36e5d44d341 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -217,16 +217,16 @@ export class Resource implements SourceControlResourceState {
 		switch (this.type) {
 			case Status.INDEX_MODIFIED:
 			case Status.MODIFIED:
-				return new ThemeColor('git.color.modified');
+				return new ThemeColor('git.modifiedForeground');
 			case Status.INDEX_DELETED:
 			case Status.DELETED:
-				return new ThemeColor('git.color.deleted');
+				return new ThemeColor('git.deletedForeground');
 			case Status.INDEX_ADDED: // todo@joh - special color?
 			case Status.INDEX_RENAMED: // todo@joh - special color?
 			case Status.UNTRACKED:
-				return new ThemeColor('git.color.untracked');
+				return new ThemeColor('git.untrackedForeground');
 			case Status.IGNORED:
-				return new ThemeColor('git.color.ignored');
+				return new ThemeColor('git.ignoredForeground');
 			case Status.INDEX_COPIED:
 			case Status.BOTH_DELETED:
 			case Status.ADDED_BY_US:
@@ -235,7 +235,7 @@ export class Resource implements SourceControlResourceState {
 			case Status.DELETED_BY_US:
 			case Status.BOTH_ADDED:
 			case Status.BOTH_MODIFIED:
-				return new ThemeColor('git.color.conflict');
+				return new ThemeColor('git.conflictForeground');
 			default:
 				return undefined;
 		}