From cdf62de18975e8c991f11fd60841b2e5a19d3547 Mon Sep 17 00:00:00 2001
From: Dustin Howett <duhowett@microsoft.com>
Date: Wed, 18 Sep 2019 12:52:07 -0700
Subject: [PATCH] Fix some issues patching in profiles

---
 .../CascadiaSettingsSerialization.cpp         | 41 +++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/cascadia/TerminalApp/CascadiaSettingsSerialization.cpp b/src/cascadia/TerminalApp/CascadiaSettingsSerialization.cpp
index 10dbadaac..5358f8ab9 100644
--- a/src/cascadia/TerminalApp/CascadiaSettingsSerialization.cpp
+++ b/src/cascadia/TerminalApp/CascadiaSettingsSerialization.cpp
@@ -294,14 +294,37 @@ bool CascadiaSettings::_AppendDynamicProfilesToUserSettings()
         return false;
     };
 
+    bool changedFile = false;
+
     // Get the index in the user settings string of the _last_ profile.
     // We want to start inserting profiles immediately following the last profile.
     const auto userProfilesObj = _GetProfilesJsonObject(_userSettings);
-    const auto numProfiles = userProfilesObj.size();
-    const auto lastProfile = userProfilesObj[numProfiles - 1];
-    size_t currentInsertIndex = lastProfile.getOffsetLimit();
-
-    bool changedFile = false;
+    auto numProfiles = userProfilesObj.size();
+    size_t currentInsertIndex = 0;
+    if (userProfilesObj && numProfiles == 0)
+    {
+        // There's a profiles object, but there's no profiles in it.
+        currentInsertIndex = userProfilesObj.getOffsetStart() + 1;
+    }
+    else if (!userProfilesObj)
+    {
+        // There's no profiles object. Insert one right before the parent's closing }.
+        currentInsertIndex = _userSettings.getOffsetLimit() - 1;
+        std::string profileObjectSerialization = R"(    "profiles": [)";
+        if (_userSettings.size() > 0)
+        {
+            profileObjectSerialization.insert(0, ",\n");
+        }
+        _userSettingsString.insert(currentInsertIndex, profileObjectSerialization);
+        currentInsertIndex += profileObjectSerialization.size();
+        _userSettingsString.insert(currentInsertIndex, R"(])");
+        changedFile = true;
+    }
+    else
+    {
+        const auto lastProfile = userProfilesObj[numProfiles - 1];
+        currentInsertIndex = lastProfile.getOffsetLimit();
+    }
 
     for (const auto& profile : _profiles)
     {
@@ -345,14 +368,18 @@ bool CascadiaSettings::_AppendDynamicProfilesToUserSettings()
 
         // Write a comma, newline to the file
         changedFile = true;
-        _userSettingsString.insert(currentInsertIndex, ",");
-        currentInsertIndex++;
+        if (numProfiles > 0)
+        {
+            _userSettingsString.insert(currentInsertIndex, ",");
+            currentInsertIndex++;
+        }
         _userSettingsString.insert(currentInsertIndex, "\n");
         currentInsertIndex++;
 
         // Write the profile's serialization to the file
         _userSettingsString.insert(currentInsertIndex, profileSerialization);
         currentInsertIndex += profileSerialization.size();
+        ++numProfiles;
     }
 
     return changedFile;