From b08362f6d2973336764c52ebc7cc5e9f34f0d80a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Tue, 21 May 2019 16:28:10 +0300
Subject: Address feedback

---
 editors/code/package.json        | 47 ++++++++++++++++------------------------
 editors/code/src/highlighting.ts |  5 ++---
 2 files changed, 21 insertions(+), 31 deletions(-)

(limited to 'editors')

diff --git a/editors/code/package.json b/editors/code/package.json
index c72037da9..750c97bb1 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -270,20 +270,11 @@
             }
         ],
         "colors": [
-            {
-                "id": "ralsp.background",
-                "description": "Background color",
-                "defaults": {
-                    "dark": "#3F3F3F",
-                    "light": "#001080",
-                    "highContrast": "#000000"
-                }
-            },
             {
                 "id": "ralsp.comment",
                 "description": "Color for comments",
                 "defaults": {
-                    "dark": "#7F9F7F",
+                    "dark": "#6A9955",
                     "light": "#008000",
                     "highContrast": "#7CA668"
                 }
@@ -292,43 +283,43 @@
                 "id": "ralsp.string",
                 "description": "Color for strings",
                 "defaults": {
-                    "dark": "#CC9393",
+                    "dark": "#CE9178",
                     "light": "#A31515",
                     "highContrast": "#CE9178"
                 }
             },
-            {
-                "id": "ralsp.unsafe",
-                "description": "Color for unsafe",
-                "defaults": {
-                    "dark": "#FF3030",
-                    "light": "#FF1010",
-                    "highContrast": "#FF1010"
-                }
-            },
             {
                 "id": "ralsp.keyword",
                 "description": "Color for keywords",
                 "defaults": {
-                    "dark": "#F0DFAF",
+                    "dark": "#569cd6",
                     "light": "#0000FF",
                     "highContrast": "#569CD6"
                 }
             },
             {
-                "id": "ralsp.control",
+                "id": "ralsp.keyword.control",
                 "description": "Color for control keywords",
                 "defaults": {
-                    "dark": "#CF20FB",
+                    "dark": "#C586C0",
                     "light": "#AF00DB",
                     "highContrast": "#C586C0"
                 }
             },
+            {
+                "id": "ralsp.keyword.unsafe",
+                "description": "Color for unsafe",
+                "defaults": {
+                    "dark": "#FF3030",
+                    "light": "#FF1010",
+                    "highContrast": "#FF1010"
+                }
+            },
             {
                 "id": "ralsp.function",
                 "description": "Color for functions",
                 "defaults": {
-                    "dark": "#93E0E3",
+                    "dark": "#DCDCAA",
                     "light": "#795E26",
                     "highContrast": "#DCDCAA"
                 }
@@ -337,7 +328,7 @@
                 "id": "ralsp.parameter",
                 "description": "Color for parameters",
                 "defaults": {
-                    "dark": "#94BFF3",
+                    "dark": "#9CDCFE",
                     "light": "#001080",
                     "highContrast": "#9CDCFE"
                 }
@@ -355,7 +346,7 @@
                 "id": "ralsp.text",
                 "description": "Color for text",
                 "defaults": {
-                    "dark": "#DCDCCC",
+                    "dark": "#D4D4D4",
                     "light": "#000000",
                     "highContrast": "#FFFFFF"
                 }
@@ -364,7 +355,7 @@
                 "id": "ralsp.attribute",
                 "description": "Color for attributes",
                 "defaults": {
-                    "dark": "#BFEBBF",
+                    "dark": "#9FE9BF",
                     "light": "#1F4B1F",
                     "highContrast": "#108010"
                 }
@@ -373,7 +364,7 @@
                 "id": "ralsp.literal",
                 "description": "Color for literals",
                 "defaults": {
-                    "dark": "#DFAF8F",
+                    "dark": "#BECEA8",
                     "light": "#09885A",
                     "highContrast": "#B5CEA8"
                 }
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index 432f40ff4..e1a68544a 100644
--- a/editors/code/src/highlighting.ts
+++ b/editors/code/src/highlighting.ts
@@ -26,12 +26,11 @@ export class Highlighter {
         const decorations: Iterable<
             [string, vscode.TextEditorDecorationType]
         > = [
-            colorContrib('background'),
             colorContrib('comment'),
             colorContrib('string'),
-            colorContrib('unsafe'),
             colorContrib('keyword'),
-            colorContrib('control'),
+            colorContrib('keyword.control'),
+            colorContrib('keyword.unsafe'),
             colorContrib('function'),
             colorContrib('parameter'),
             colorContrib('builtin'),
-- 
cgit v1.2.3