Release v0.6.28: typo correction, partial sync and selection diagnostics

src/sync_merge.inl

@@ -4,6 +4,9 @@ namespace
 {
 Json normalizeProfile(Json j)
 {
+    if (!j.contains("autoCorrectReplace")) j["autoCorrectReplace"] = false;
+    if (!j.contains("autoCorrectTypos")) j["autoCorrectTypos"] = false;
+    if (!j.contains("autoCorrectReplacements")) j["autoCorrectReplacements"] = Json::object();
     if (!j.contains("snippetTombstones")) j["snippetTombstones"] = Json::array();
     for (auto &sn : j.at("snippets"))
         if (!sn.contains("id")) sn["id"] = utf8(snippetId({wide(sn.at("trigger").get<std::string>()), L""}));
@@ -46,6 +49,10 @@ Json treeProfile(const Json &source)
 }
 Json flatProfile(Json j)
 {
+    auto &replacements = j["autoCorrectReplacements"];
+    for (auto it = replacements.begin(); it != replacements.end();)
+        if (it.value().is_null()) it = replacements.erase(it);
+        else ++it;
     Json snippets = Json::array(), deleted = Json::array();
     for (const auto &[id, item] : j.at("snippets").items())
     {
@@ -90,6 +97,8 @@ std::wstring fieldLabel(const std::string &key)
         {"convertLastWord", L"Convert recent word"}, {"switchSystemLayout", L"Switch system layout"},
         {"autoCorrectMinLength", L"Minimum word length"}, {"autoCorrectMaxRank", L"Maximum word rank"},
         {"autoCorrectLayout", L"Automatic layout correction"}, {"autoCorrectLanguages", L"Dictionary languages"},
+        {"autoCorrectReplace", L"Custom automatic replacements"}, {"autoCorrectTypos", L"Dictionary typo correction"},
+        {"autoCorrectReplacements", L"Replacement pairs"},
         {"autoCorrectPrefixChars", L"Punctuation before words"}, {"autoCorrectSuffixChars", L"Punctuation after words"},
         {"screenshotAutoOpenEditor", L"Open screenshot editor"}, {"tesseractLanguages", L"OCR languages"},
         {"trigger", L"Trigger"}, {"text", L"Text"}};
@@ -167,8 +176,9 @@ void collisionPaths(const Json &j, std::set<std::string> &paths)
 SyncMerge mergeSyncProfile(const Bytes &base, const Bytes &local, const Bytes &remote, const std::vector<SyncChoice> &choices)
 {
     auto l = treeProfile(parse(local)), r = treeProfile(parse(remote));
-    if (base.empty() && l != r) throw std::runtime_error("First connection: choose Download remote or Upload local.");
-    auto b = base.empty() ? l : treeProfile(parse(base));
+    // With no common history, union independent entries; differing scalar values
+    // remain on their respective devices until the user resolves the conflict.
+    auto b = base.empty() ? Json::object() : treeProfile(parse(base));
     SyncMerge result;
     auto merged = mergeNode(b, l, r, "", L"", choices, result.conflicts, {});
     std::set<std::string> collisions;