Add Cascading User + Default Settings

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

@@ -249,6 +249,7 @@
     <Content Include="$(OpenConsoleDir)res\terminal\Wide310x150Logo.scale-400.png">
       <Link>Images\Wide310x150Logo.scale-400.png</Link>
     </Content>
+    <!-- Profile Icons -->
     <Content Include="ProfileIcons\{0caa0dad-35be-5f56-a8ff-afceeeaa6101}.scale-100.png" />
     <Content Include="ProfileIcons\{0caa0dad-35be-5f56-a8ff-afceeeaa6101}.scale-200.png" />
     <Content Include="ProfileIcons\{574e775e-4f2a-5b96-ac1e-a2962a402336}.scale-100.png" />
@@ -259,9 +260,16 @@
     <Content Include="ProfileIcons\{9acb9455-ca41-5af7-950f-6bca1bc9722f}.scale-200.png" />
     <Content Include="ProfileIcons\{b453ae62-4e3d-5e58-b989-0a998ec441b8}.scale-100.png" />
     <Content Include="ProfileIcons\{b453ae62-4e3d-5e58-b989-0a998ec441b8}.scale-200.png" />
+    <!-- Default Settings -->
+    <Content Include="$(OpenConsoleDir)src\cascadia\TerminalApp\defaults.json">
+      <Link>defaults.json</Link>
+    </Content>
+    <!-- Resources -->
     <PRIResource Include="Resources\en-US\Resources.resw" />
   </ItemGroup>
+
   <Import Project="$(OpenConsoleDir)src\wap-common.build.post.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\WindowsTerminal\WindowsTerminal.vcxproj" />
     <ProjectReference Include="..\..\host\exe\Host.EXE.vcxproj" />

src/cascadia/LocalTests_TerminalApp/ColorSchemeTests.cpp

@@ -0,0 +1,234 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "precomp.h"
+
+#include "../TerminalApp/ColorScheme.h"
+#include "../TerminalApp/CascadiaSettings.h"
+#include "JsonTestClass.h"
+
+using namespace Microsoft::Console;
+using namespace TerminalApp;
+using namespace WEX::Logging;
+using namespace WEX::TestExecution;
+using namespace WEX::Common;
+
+namespace TerminalAppLocalTests
+{
+    // Unfortunately, these tests _WILL NOT_ work in our CI, until we have a lab
+    // machine available that can run Windows version 18362.
+
+    class ColorSchemeTests : public JsonTestClass
+    {
+        // Use a custom manifest to ensure that we can activate winrt types from
+        // our test. This property will tell taef to manually use this as the
+        // sxs manifest during this test class. It includes all the cppwinrt
+        // types we've defined, so if your test is crashing for an unknown
+        // reason, make sure it's included in that file.
+        // If you want to do anything XAML-y, you'll need to run yor test in a
+        // packaged context. See TabTests.cpp for more details on that.
+        BEGIN_TEST_CLASS(ColorSchemeTests)
+            TEST_CLASS_PROPERTY(L"ActivationContext", L"TerminalApp.LocalTests.manifest")
+        END_TEST_CLASS()
+
+        TEST_METHOD(CanLayerColorScheme);
+        TEST_METHOD(LayerColorSchemeProperties);
+        TEST_METHOD(LayerColorSchemesOnArray);
+
+        TEST_CLASS_SETUP(ClassSetup)
+        {
+            InitializeJsonReader();
+            return true;
+        }
+    };
+
+    void ColorSchemeTests::CanLayerColorScheme()
+    {
+        const std::string scheme0String{ R"({
+            "name": "scheme0",
+            "foreground": "#000000",
+            "background": "#010101"
+        })" };
+        const std::string scheme1String{ R"({
+            "name": "scheme1",
+            "foreground": "#020202",
+            "background": "#030303"
+        })" };
+        const std::string scheme2String{ R"({
+            "name": "scheme0",
+            "foreground": "#040404",
+            "background": "#050505"
+        })" };
+        const std::string scheme3String{ R"({
+            // "name": "scheme3",
+            "foreground": "#060606",
+            "background": "#070707"
+        })" };
+
+        const auto scheme0Json = VerifyParseSucceeded(scheme0String);
+        const auto scheme1Json = VerifyParseSucceeded(scheme1String);
+        const auto scheme2Json = VerifyParseSucceeded(scheme2String);
+        const auto scheme3Json = VerifyParseSucceeded(scheme3String);
+
+        auto scheme0 = ColorScheme::FromJson(scheme0Json);
+
+        VERIFY_IS_TRUE(scheme0.ShouldBeLayered(scheme0Json));
+        VERIFY_IS_FALSE(scheme0.ShouldBeLayered(scheme1Json));
+        VERIFY_IS_TRUE(scheme0.ShouldBeLayered(scheme2Json));
+        VERIFY_IS_FALSE(scheme0.ShouldBeLayered(scheme3Json));
+
+        auto scheme1 = ColorScheme::FromJson(scheme1Json);
+
+        VERIFY_IS_FALSE(scheme1.ShouldBeLayered(scheme0Json));
+        VERIFY_IS_TRUE(scheme1.ShouldBeLayered(scheme1Json));
+        VERIFY_IS_FALSE(scheme1.ShouldBeLayered(scheme2Json));
+        VERIFY_IS_FALSE(scheme1.ShouldBeLayered(scheme3Json));
+
+        auto scheme3 = ColorScheme::FromJson(scheme3Json);
+
+        VERIFY_IS_FALSE(scheme3.ShouldBeLayered(scheme0Json));
+        VERIFY_IS_FALSE(scheme3.ShouldBeLayered(scheme1Json));
+        VERIFY_IS_FALSE(scheme3.ShouldBeLayered(scheme2Json));
+        VERIFY_IS_FALSE(scheme3.ShouldBeLayered(scheme3Json));
+    }
+
+    void ColorSchemeTests::LayerColorSchemeProperties()
+    {
+        const std::string scheme0String{ R"({
+            "name": "scheme0",
+            "foreground": "#000000",
+            "background": "#010101",
+            "red": "#010000",
+            "green": "#000100",
+            "blue": "#000001"
+        })" };
+        const std::string scheme1String{ R"({
+            "name": "scheme1",
+            "foreground": "#020202",
+            "background": "#030303",
+            "red": "#020000",
+
+            "blue": "#000002"
+        })" };
+        const std::string scheme2String{ R"({
+            "name": "scheme0",
+            "foreground": "#040404",
+            "background": "#050505",
+            "red": "#030000",
+            "green": "#000300"
+        })" };
+
+        const auto scheme0Json = VerifyParseSucceeded(scheme0String);
+        const auto scheme1Json = VerifyParseSucceeded(scheme1String);
+        const auto scheme2Json = VerifyParseSucceeded(scheme2String);
+
+        auto scheme0 = ColorScheme::FromJson(scheme0Json);
+        VERIFY_ARE_EQUAL(L"scheme0", scheme0._schemeName);
+        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0._defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0._defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 0, 0), scheme0._table[XTERM_RED_ATTR]);
+        VERIFY_ARE_EQUAL(ARGB(0, 0, 1, 0), scheme0._table[XTERM_GREEN_ATTR]);
+        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 1), scheme0._table[XTERM_BLUE_ATTR]);
+
+        Log::Comment(NoThrowString().Format(
+            L"Layering scheme1 on top of scheme0"));
+        scheme0.LayerJson(scheme1Json);
+
+        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme0._defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme0._defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 2, 0, 0), scheme0._table[XTERM_RED_ATTR]);
+        VERIFY_ARE_EQUAL(ARGB(0, 0, 1, 0), scheme0._table[XTERM_GREEN_ATTR]);
+        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 2), scheme0._table[XTERM_BLUE_ATTR]);
+
+        Log::Comment(NoThrowString().Format(
+            L"Layering scheme2Json on top of (scheme0+scheme1)"));
+        scheme0.LayerJson(scheme2Json);
+
+        VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0._defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0._defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 3, 0, 0), scheme0._table[XTERM_RED_ATTR]);
+        VERIFY_ARE_EQUAL(ARGB(0, 0, 3, 0), scheme0._table[XTERM_GREEN_ATTR]);
+        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 2), scheme0._table[XTERM_BLUE_ATTR]);
+    }
+
+    void ColorSchemeTests::LayerColorSchemesOnArray()
+    {
+        const std::string scheme0String{ R"({
+            "name": "scheme0",
+            "foreground": "#000000",
+            "background": "#010101"
+        })" };
+        const std::string scheme1String{ R"({
+            "name": "scheme1",
+            "foreground": "#020202",
+            "background": "#030303"
+        })" };
+        const std::string scheme2String{ R"({
+            "name": "scheme0",
+            "foreground": "#040404",
+            "background": "#050505"
+        })" };
+        const std::string scheme3String{ R"({
+            // "name": "scheme3",
+            "foreground": "#060606",
+            "background": "#070707"
+        })" };
+
+        const auto scheme0Json = VerifyParseSucceeded(scheme0String);
+        const auto scheme1Json = VerifyParseSucceeded(scheme1String);
+        const auto scheme2Json = VerifyParseSucceeded(scheme2String);
+        const auto scheme3Json = VerifyParseSucceeded(scheme3String);
+
+        CascadiaSettings settings{};
+
+        VERIFY_ARE_EQUAL(0u, settings._globals.GetColorSchemes().size());
+        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme0Json));
+        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme1Json));
+        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme2Json));
+        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+
+        settings._LayerOrCreateColorScheme(scheme0Json);
+        VERIFY_ARE_EQUAL(1u, settings._globals.GetColorSchemes().size());
+        VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
+        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme1Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme2Json));
+        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), settings._globals.GetColorSchemes().at(0)._defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), settings._globals.GetColorSchemes().at(0)._defaultBackground);
+
+        settings._LayerOrCreateColorScheme(scheme1Json);
+        VERIFY_ARE_EQUAL(2u, settings._globals.GetColorSchemes().size());
+        VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme1Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme2Json));
+        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), settings._globals.GetColorSchemes().at(0)._defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), settings._globals.GetColorSchemes().at(0)._defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), settings._globals.GetColorSchemes().at(1)._defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), settings._globals.GetColorSchemes().at(1)._defaultBackground);
+
+        settings._LayerOrCreateColorScheme(scheme2Json);
+        VERIFY_ARE_EQUAL(2u, settings._globals.GetColorSchemes().size());
+        VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme1Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme2Json));
+        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+        VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), settings._globals.GetColorSchemes().at(0)._defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), settings._globals.GetColorSchemes().at(0)._defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), settings._globals.GetColorSchemes().at(1)._defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), settings._globals.GetColorSchemes().at(1)._defaultBackground);
+
+        settings._LayerOrCreateColorScheme(scheme3Json);
+        VERIFY_ARE_EQUAL(3u, settings._globals.GetColorSchemes().size());
+        VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme0Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme1Json));
+        VERIFY_IS_NOT_NULL(settings._FindMatchingColorScheme(scheme2Json));
+        VERIFY_IS_NULL(settings._FindMatchingColorScheme(scheme3Json));
+        VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), settings._globals.GetColorSchemes().at(0)._defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), settings._globals.GetColorSchemes().at(0)._defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), settings._globals.GetColorSchemes().at(1)._defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), settings._globals.GetColorSchemes().at(1)._defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 6, 6, 6), settings._globals.GetColorSchemes().at(2)._defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 7, 7, 7), settings._globals.GetColorSchemes().at(2)._defaultBackground);
+    }
+}

src/cascadia/LocalTests_TerminalApp/JsonTestClass.h

@@ -0,0 +1,36 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- JsonTestClass.h
+
+Abstract:
+- This class is a helper that can be used to quickly create tests that need to
+  read & parse json data. Test classes that need to read JSON should make sure
+  to derive from this class, and also make sure to call InitializeJsonReader()
+  in the TEST_CLASS_SETUP().
+
+Author(s):
+    Mike Griese (migrie) August-2019
+--*/
+
+class JsonTestClass
+{
+public:
+    void InitializeJsonReader()
+    {
+        reader = std::unique_ptr<Json::CharReader>(Json::CharReaderBuilder::CharReaderBuilder().newCharReader());
+    };
+    Json::Value VerifyParseSucceeded(std::string content)
+    {
+        Json::Value root;
+        std::string errs;
+        const bool parseResult = reader->parse(content.c_str(), content.c_str() + content.size(), &root, &errs);
+        VERIFY_IS_TRUE(parseResult, winrt::to_hstring(errs).c_str());
+        return root;
+    };
+
+protected:
+    std::unique_ptr<Json::CharReader> reader;
+};