From ccf201fe440fd8163115f8630eb4a0529d420f50 Mon Sep 17 00:00:00 2001
From: "Dustin L. Howett" <duhowett@microsoft.com>
Date: Mon, 20 Jul 2020 13:50:50 -0700
Subject: [PATCH] Swap brightBlack/black in the Solarized color schemes (#6985)

Original notes from @M-Pixel:

> Console applications assume that backgrounds are black, and that
> `lightBlack`/`DarkGrey` are lighter than `black`/`Black`.  This
> assumption is accounted for by all color schemes in `defaults.json`,
> except for the Solarized themes.
>
> The Solarized Dark theme, in particular, makes `-Parameters` invisible
> against the background in PowerShell, which is obviously an unacceptable
> usability flaw.
>
> This change makes `black` and `background` to the same (which is common
> throughout the color schemes), and makes `brightBlack` (`DarkGray` in
> .NET) lighter than black (which is obviously more correct given the
> meanings of those words).

Out of the box, we ship a pretty bad behavior.

If I look at all of the existing shipped color schemes--and that
includes things like Tango and One Half--we are universally following a
`background` == `black` rule.

If I consult gnome-terminal or xterm, they do the same thing; Xterm by
default, gnome-terminal for solarized. The background generally matches
color index `0` across all their **dark** schemes. Konsole and
lxterminal disagree and map background to `0 intense` for Solarized.

I want to put our Solarized schemes on a deprecation path, but
unfortunately we still need to ship _something_ for users who we're
going to strand on them.

I'm going to have to swallow my bitter and say that yes, we should
probably just change the index mapping and go with something that works
right out of the box while we figure out how to do perceptual color
nudging and eventually remove bad defaults (like Solarized).

From #6618.

Fixes #4047.
Closes #6618.

(cherry picked from commit 04f5ee7ebf6da648f16cbc592829b0420e93662b)
---
 src/cascadia/TerminalApp/defaults.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cascadia/TerminalApp/defaults.json b/src/cascadia/TerminalApp/defaults.json
index b4167968f79..a05668723f8 100644
--- a/src/cascadia/TerminalApp/defaults.json
+++ b/src/cascadia/TerminalApp/defaults.json
@@ -187,7 +187,7 @@
             "foreground": "#839496",
             "background": "#002B36",
             "cursorColor": "#FFFFFF",
-            "black": "#073642",
+            "black": "#002B36",
             "red": "#DC322F",
             "green": "#859900",
             "yellow": "#B58900",
@@ -195,7 +195,7 @@
             "purple": "#D33682",
             "cyan": "#2AA198",
             "white": "#EEE8D5",
-            "brightBlack": "#002B36",
+            "brightBlack": "#073642",
             "brightRed": "#CB4B16",
             "brightGreen": "#586E75",
             "brightYellow": "#657B83",
@@ -209,7 +209,7 @@
             "foreground": "#657B83",
             "background": "#FDF6E3",
             "cursorColor": "#002B36",
-            "black": "#073642",
+            "black": "#002B36",
             "red": "#DC322F",
             "green": "#859900",
             "yellow": "#B58900",
@@ -217,7 +217,7 @@
             "purple": "#D33682",
             "cyan": "#2AA198",
             "white": "#EEE8D5",
-            "brightBlack": "#002B36",
+            "brightBlack": "#073642",
             "brightRed": "#CB4B16",
             "brightGreen": "#586E75",
             "brightYellow": "#657B83",