From cffd1ecb7a95ae3a59306929e373e6a0606096bb Mon Sep 17 00:00:00 2001
From: Michael Kuhn <github@ikkoku.de>
Date: Fri, 11 Feb 2022 22:48:18 +0100
Subject: [PATCH] Unify and fix Solarized token colors

This PR contains a few more fixes for both Solarized themes:
1. The token color definitions have diverged a bit, unify them.
   Specifically, this makes both themes use the same colors for the same
   tokens (only affects diff headers and class names) and harmonizes a
   few scopes.
2. `#D30102` is not a Solarized color, replace with `#DC322F` (red).
3. `#219186` is not a Solarized color, replace with `#859900` (green).
---
 .../themes/solarized-dark-color-theme.json    | 26 +++++++++-------
 .../themes/solarized-light-color-theme.json   | 30 +++++++++----------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
index d6129d26a83..2febfd9bca0 100644
--- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
+++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
@@ -7,7 +7,10 @@
 			}
 		},
 		{
-			"scope": ["meta.embedded", "source.groovy.embedded"],
+			"scope": [
+				"meta.embedded",
+				"source.groovy.embedded"
+			],
 			"settings": {
 				"foreground": "#839496"
 			}
@@ -31,7 +34,7 @@
 			"name": "Regexp",
 			"scope": "string.regexp",
 			"settings": {
-				"foreground": "#D30102"
+				"foreground": "#DC322F"
 			}
 		},
 		{
@@ -100,7 +103,7 @@
 				"punctuation.section.embedded.end"
 			],
 			"settings": {
-				"foreground": "#D30102"
+				"foreground": "#DC322F"
 			}
 		},
 		{
@@ -177,12 +180,15 @@
 			"name": "Continuation",
 			"scope": "punctuation.separator.continuation",
 			"settings": {
-				"foreground": "#D30102"
+				"foreground": "#DC322F"
 			}
 		},
 		{
 			"name": "Library constant",
-			"scope": "support.constant",
+			"scope": [
+				"support.constant",
+				"support.variable"
+			],
 			"settings": {}
 		},
 		{
@@ -211,7 +217,7 @@
 			"name": "Invalid",
 			"scope": "invalid",
 			"settings": {
-				"foreground": "#D30102"
+				"foreground": "#DC322F"
 			}
 		},
 		{
@@ -222,7 +228,7 @@
 			],
 			"settings": {
 				"fontStyle": "italic",
-				"foreground": "#E0EDDD"
+				"foreground": "#268BD2"
 			}
 		},
 		{
@@ -230,7 +236,7 @@
 			"scope": "markup.deleted",
 			"settings": {
 				"fontStyle": "",
-				"foreground": "#dc322f"
+				"foreground": "#DC322F"
 			}
 		},
 		{
@@ -238,14 +244,14 @@
 			"scope": "markup.changed",
 			"settings": {
 				"fontStyle": "",
-				"foreground": "#cb4b16"
+				"foreground": "#CB4B16"
 			}
 		},
 		{
 			"name": "diff: inserted",
 			"scope": "markup.inserted",
 			"settings": {
-				"foreground": "#219186"
+				"foreground": "#859900"
 			}
 		},
 		{
diff --git a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
index a0d5f976984..85cdac449d7 100644
--- a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
+++ b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
@@ -34,7 +34,7 @@
 			"name": "Regexp",
 			"scope": "string.regexp",
 			"settings": {
-				"foreground": "#D30102"
+				"foreground": "#DC322F"
 			}
 		},
 		{
@@ -78,7 +78,8 @@
 				"entity.name.scope-resolution"
 			],
 			"settings": {
-				"foreground": "#268BD2"
+				"fontStyle": "",
+				"foreground": "#CB4B16"
 			}
 		},
 		{
@@ -102,7 +103,7 @@
 				"punctuation.section.embedded.end"
 			],
 			"settings": {
-				"foreground": "#D30102"
+				"foreground": "#DC322F"
 			}
 		},
 		{
@@ -122,7 +123,7 @@
 				"keyword.other.new"
 			],
 			"settings": {
-				"foreground": "#D30102"
+				"foreground": "#CB4B16"
 			}
 		},
 		{
@@ -138,7 +139,9 @@
 		{
 			"name": "Inherited class",
 			"scope": "entity.other.inherited-class",
-			"settings": {}
+			"settings": {
+				"foreground": "#6C71C4"
+			}
 		},
 		{
 			"name": "Function argument",
@@ -154,10 +157,7 @@
 		},
 		{
 			"name": "Tag start/end",
-			"scope": [
-				"punctuation.definition.tag.begin",
-				"punctuation.definition.tag.end"
-			],
+			"scope": "punctuation.definition.tag",
 			"settings": {
 				"foreground": "#93A1A1"
 			}
@@ -180,7 +180,7 @@
 			"name": "Continuation",
 			"scope": "punctuation.separator.continuation",
 			"settings": {
-				"foreground": "#D30102"
+				"foreground": "#DC322F"
 			}
 		},
 		{
@@ -217,7 +217,7 @@
 			"name": "Invalid",
 			"scope": "invalid",
 			"settings": {
-				"foreground": "#cd3131"
+				"foreground": "#DC322F"
 			}
 		},
 		{
@@ -228,7 +228,7 @@
 			],
 			"settings": {
 				"fontStyle": "italic",
-				"foreground": "#268bd2"
+				"foreground": "#268BD2"
 			}
 		},
 		{
@@ -236,7 +236,7 @@
 			"scope": "markup.deleted",
 			"settings": {
 				"fontStyle": "",
-				"foreground": "#dc322f"
+				"foreground": "#DC322F"
 			}
 		},
 		{
@@ -244,14 +244,14 @@
 			"scope": "markup.changed",
 			"settings": {
 				"fontStyle": "",
-				"foreground": "#cb4b16"
+				"foreground": "#CB4B16"
 			}
 		},
 		{
 			"name": "diff: inserted",
 			"scope": "markup.inserted",
 			"settings": {
-				"foreground": "#219186"
+				"foreground": "#859900"
 			}
 		},
 		{