From 63917b3d9acc43352147f0093cd9c3f07d973a6a Mon Sep 17 00:00:00 2001
From: Michael Kuhn <github@ikkoku.de>
Date: Wed, 9 Feb 2022 21:30:37 +0100
Subject: [PATCH] Fix some Solarized colors

This PR contains a few fixes for both Solarized themes:
1. According to #105418, the empty scope's foreground color is supposed to
   be used for normal text. For some reason, this does not seem to work,
   therefore set `editor.foreground` explicitly.
2. Some of the ANSI colors have been set to values differing from the
   official theme at https://ethanschoonover.com/solarized/ due to
   contrast issues. Nowadays, this can instead be fixed with
   `terminal.integrated.minimumContrastRatio` (see #121107).
3. Solarized Dark uses `#93A1A1` for normal text in a few places where
   `#839496` should be used instead.
4. Solarized Dark uses `#657B83` in a few places, which is not part of
   the official theme, use the correct `#586E75` instead.
5. Solarized Light uses `#073642` in one place, which is not part of the
   official theme, use the correct `#586E75` instead.
---
 .../themes/solarized-dark-color-theme.json           | 12 ++++++------
 .../themes/solarized-light-color-theme.json          |  8 ++++----
 2 files changed, 10 insertions(+), 10 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 f31061830fa..d6129d26a83 100644
--- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
+++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
@@ -3,13 +3,13 @@
 	"tokenColors": [
 		{
 			"settings": {
-				"foreground": "#93A1A1"
+				"foreground": "#839496"
 			}
 		},
 		{
 			"scope": ["meta.embedded", "source.groovy.embedded"],
 			"settings": {
-				"foreground": "#93A1A1"
+				"foreground": "#839496"
 			}
 		},
 		{
@@ -17,7 +17,7 @@
 			"scope": "comment",
 			"settings": {
 				"fontStyle": "italic",
-				"foreground": "#657B83"
+				"foreground": "#586E75"
 			}
 		},
 		{
@@ -156,7 +156,7 @@
 			"name": "Tag start/end",
 			"scope": "punctuation.definition.tag",
 			"settings": {
-				"foreground": "#657B83"
+				"foreground": "#586E75"
 			}
 		},
 		{
@@ -369,7 +369,7 @@
 
 		// Editor
 		"editor.background": "#002B36",
-		// "editor.foreground": "#6688cc",
+		"editor.foreground": "#839496",
 		"editorWidget.background": "#00212B",
 		"editorCursor.foreground": "#D30102",
 		"editorWhitespace.foreground": "#93A1A180",
@@ -498,7 +498,7 @@
 		"terminal.ansiMagenta": "#d33682",
 		"terminal.ansiCyan": "#2aa198",
 		"terminal.ansiWhite": "#eee8d5",
-		"terminal.ansiBrightBlack": "#586e75",
+		"terminal.ansiBrightBlack": "#002b36",
 		"terminal.ansiBrightRed": "#cb4b16",
 		"terminal.ansiBrightGreen": "#586e75",
 		"terminal.ansiBrightYellow": "#657b83",
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 12012b03248..a0d5f976984 100644
--- a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
+++ b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
@@ -66,7 +66,7 @@
 			"scope": "storage",
 			"settings": {
 				"fontStyle": "bold",
-				"foreground": "#073642"
+				"foreground": "#586E75"
 			}
 		},
 		{
@@ -361,8 +361,8 @@
 		// "scrollbarSlider.hoverBackground": "",
 		// Editor
 		"editor.background": "#FDF6E3",
+		"editor.foreground": "#657B83",
 		"notebook.cellEditorBackground": "#F7F0E0",
-		// "editor.foreground": "#6688cc",
 		"editorWidget.background": "#EEE8D5",
 		"editorCursor.foreground": "#657B83",
 		"editorWhitespace.foreground": "#586E7580",
@@ -480,14 +480,14 @@
 		"terminal.ansiMagenta": "#d33682",
 		"terminal.ansiCyan": "#2aa198",
 		"terminal.ansiWhite": "#eee8d5",
-		"terminal.ansiBrightBlack": "#586e75",
+		"terminal.ansiBrightBlack": "#002b36",
 		"terminal.ansiBrightRed": "#cb4b16",
 		"terminal.ansiBrightGreen": "#586e75",
 		"terminal.ansiBrightYellow": "#657b83",
 		"terminal.ansiBrightBlue": "#839496",
 		"terminal.ansiBrightMagenta": "#6c71c4",
 		"terminal.ansiBrightCyan": "#93a1a1",
-		"terminal.ansiBrightWhite": "#eee8d5",
+		"terminal.ansiBrightWhite": "#fdf6e3",
 		// Interactive Playground
 		"walkThrough.embeddedEditorBackground": "#00000014"
 	},