Add application-scoped snippets with global fallback and scope-aware sync
This commit is contained in:
1 parent
c18148a574
commit
a124e030ab
10 files changed
+215
-18
No files matched your search
+28
-3
@@ -169,8 +169,19 @@ void validateSettings(const Settings &s)
|
||||
if (snippet.trigger.size() < 2 || snippet.trigger.size() > 64 ||
|
||||
snippet.trigger.find_first_of(L"\r\n\t ") != snippet.trigger.npos)
|
||||
throw std::runtime_error("Snippet triggers must contain 2–64 characters without whitespace");
|
||||
if (!seen.insert(lower(snippet.trigger)).second)
|
||||
throw std::runtime_error("Duplicate snippet trigger");
|
||||
if (snippet.apps.size() > 64) throw std::runtime_error("Too many snippet applications");
|
||||
std::vector<std::wstring> scopes;
|
||||
for (const auto &app : snippet.apps)
|
||||
{
|
||||
auto normalized = snippetAppName(app);
|
||||
if (normalized.empty() || normalized.size() > 250 || normalized.find_first_of(L"\\/:*?\"<>|,\r\n\t") != normalized.npos)
|
||||
throw std::runtime_error("Use application names such as chrome.exe, not paths or wildcards");
|
||||
scopes.push_back(normalized);
|
||||
}
|
||||
if (scopes.empty()) scopes.push_back(L"");
|
||||
for (const auto &scope : scopes)
|
||||
if (!seen.insert(lower(snippet.trigger) + L"\n" + scope).second)
|
||||
throw std::runtime_error("Duplicate snippet trigger for the same application or global scope");
|
||||
auto t = parseTemplate(snippet.text);
|
||||
if (t.text.empty() || t.cursors > 1)
|
||||
throw std::runtime_error("Each snippet needs text and at most one {cursor} marker");
|
||||
@@ -281,6 +292,12 @@ Settings decodeSettings(const Bytes &bytes, const std::vector<Layout> &layouts)
|
||||
for (auto &sn : j.at("snippets"))
|
||||
{
|
||||
Snippet item{str(sn, "trigger"), str(sn, "text"), str(sn, "id")};
|
||||
if (sn.contains("apps"))
|
||||
{
|
||||
if (!sn.at("apps").is_array()) throw std::runtime_error("Snippet apps must be a list");
|
||||
for (const auto &app : sn.at("apps")) item.apps.push_back(snippetAppName(wide(app.get<std::string>())));
|
||||
}
|
||||
if (item.id.empty() && !item.apps.empty()) item.id = newSnippetId();
|
||||
item.id = snippetId(item);
|
||||
s.snippets.push_back(std::move(item));
|
||||
}
|
||||
@@ -354,7 +371,15 @@ Bytes encodeSettings(const Settings &s)
|
||||
j["layoutHotkeys"].push_back({{"layoutId", utf8(s.directIds[i])}, {"hotkey", utf8(s.direct[i])}});
|
||||
j["snippets"] = Json::array();
|
||||
for (auto &sn : s.snippets)
|
||||
j["snippets"].push_back({{"trigger", utf8(sn.trigger)}, {"text", utf8(sn.text)}, {"id", utf8(snippetId(sn))}});
|
||||
{
|
||||
Json item{{"trigger", utf8(sn.trigger)}, {"text", utf8(sn.text)}, {"id", utf8(snippetId(sn))}};
|
||||
if (!sn.apps.empty())
|
||||
{
|
||||
item["apps"] = Json::array();
|
||||
for (const auto &app : sn.apps) item["apps"].push_back(utf8(snippetAppName(app)));
|
||||
}
|
||||
j["snippets"].push_back(std::move(item));
|
||||
}
|
||||
j["snippetTombstones"] = Json::array();
|
||||
for (const auto &id : s.snippetTombstones) j["snippetTombstones"].push_back(utf8(id));
|
||||
j["excludedApps"] = Json::array();
|
||||
|
||||
Reference in new issue
Block a user