Compare commits

...
Author SHA1 Message Date
agrynco 367a5fd9f7 Release KSwitcher v0.6.121 (#67)
Ship the Files Markdown startup retry and apply word-boundary checks to all snippet triggers.
2026-11-20 16:40:10 +02:00
17 changed files with 338 additions and 116 deletions

No files matched your search

+1 -1
View File
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.24)
project(KSwitcher VERSION 0.6.120 LANGUAGES CXX RC)
project(KSwitcher VERSION 0.6.121 LANGUAGES CXX RC)
if(NOT WIN32)
message(FATAL_ERROR "KSwitcher uses native Windows APIs")
endif()
+4 -2
View File
@@ -331,8 +331,10 @@ Warning і початковий фокус на No.
перерендерюється зі збереженням позиції прокрутки.
Вебпосилання HTTP і HTTPS відкриваються в системному браузері.
Для LAN зображення завантажуються у фоні, а файли за посиланнями — після
кліку. Mermaid працює офлайн. Якщо WebView2 недоступний або файл більший за
8 МіБ, F3 відкриває текстовий перегляд.
кліку. Mermaid працює офлайн і завантажується лише для документів із
діаграмами Mermaid. Якщо WebView2 не завершує запуск, Files один раз
повторює спробу в тому самому вікні. Якщо форматований перегляд недоступний
або файл більший за 8 МіБ, F3 відкриває текстовий перегляд.
- F3 у фоні підраховує сумарний розмір файлів у папці та її підпапках.
На рядку `..` F3 рахує всі папки поточного списку, а за наявності
позначених папок в інших рядках рахує позначені папки. Без позначок
+6 -4
View File
@@ -473,14 +473,16 @@ expand the snippet.
Type `;` at the start of a trigger to open suggestions near the caret, or
type the first three characters of another trigger. The list filters as you
type and fits the widest matching trigger. Use **↑ / ↓** and **Tab** or click
an entry. **Esc** dismisses the list. Full triggers still expand
automatically. See the [snippet guide](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/wiki/Snippets).
an entry. **Esc** dismisses the list. Full triggers expand automatically at the
start of a word, including when typed in another keyboard layout. See the
[snippet guide](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/wiki/Snippets).
**Українською.** Введіть `;` на початку тригера або три перші символи іншого
тригера, щоб відкрити підказки біля курсора. Список фільтрується під час набору
й підлаштовує ширину під найдовший збіг. Для вибору натисніть **↑ / ↓** і
**Tab** або клацніть рядок. **Esc** закриває список. Повні тригери й далі
спрацьовують автоматично. Дивіться [посібник зі сніпетів](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/wiki/Snippets-uk).
**Tab** або клацніть рядок. **Esc** закриває список. Повні тригери спрацьовують
автоматично на межі перед словом, зокрема під час набору в іншій розкладці.
Дивіться [посібник зі сніпетів](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/wiki/Snippets-uk).
З v0.6.70 підказки відкриваються біля текстового курсора. Якщо редактор не
надає його позицію, введіть повний тригер для розгортання сніпета.
+13 -1
View File
@@ -1,5 +1,17 @@
# Latest Windows release
## v0.6.121 — 2026-11-20
KSwitcher Files retries WebView2 startup once when a Markdown preview fails to initialize. If the retry succeeds, the same window displays the formatted document. The Markdown viewer loads the bundled Mermaid library only for documents with Mermaid diagrams.
Snippet expansion now requires a word boundary before the trigger, even after a pause. The same rule applies across keyboard layouts and in Far Manager.
**Українською.**
Якщо перегляд Markdown не запускається, KSwitcher Files один раз повторює запуск WebView2. Після успішної спроби форматований документ з’являється в тому самому вікні. Бібліотека Mermaid завантажується лише для документів із діаграмами Mermaid.
KSwitcher розгортає сніпети, коли тригер відокремлено від попереднього слова. Перевірка діє після паузи, у різних розкладках і у Far Manager.
## v0.6.120 — 2026-11-20
Layout conversion starts faster when the Windows clipboard contains an image. KSwitcher keeps the image and accompanying formats in memory for the duration of the operation. It restores them after conversion if the clipboard still belongs to the operation. A newer copy takes precedence.
@@ -542,6 +554,6 @@ Use **Test mouse buttons here** to check which events Windows delivers. Mouse pr
Choose **Update** in the tray menu. For v0.3.x–v0.4.1, install the [v0.4.2 bridge](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/releases/tag/v0.4.2) manually first. Close KSwitcher and its editors, extract the bridge ZIP into the installation folder while keeping personal data, dictionaries, and tools, then start v0.4.2 and choose **Update**. v0.2.3 and earlier require manual installation.
For a manual upgrade, exit KSwitcher and its configurator and screenshot editors, then extract the entire **KSwitcher-win-x64.zip** into its installation folder. Verify it with **SHA256SUMS.txt**. Keep personal data, customized dictionaries and tools. Keep the three KSwitcher executables together.
For a manual upgrade, save your work and exit KSwitcher, Settings, Files, screenshot editors and bundled StayHere. Verify **KSwitcher-win-x64.zip** with **SHA256SUMS.txt**, then extract the entire ZIP into the installation folder. Keep personal data, customized dictionaries and tools.
See the [English Wiki](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/wiki/Home) or [Українська Wiki](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/wiki/Home-uk).
+1 -1
View File
@@ -1 +1 @@
53334ba83a44c69c3acd2aad297db177366fe553fae8813b88b81e0a215c860f KSwitcher-win-x64.zip
c7163b614f4e92e25137a3f89e750878fc9a3e559037e7a8933468b8b83d829d KSwitcher-win-x64.zip
+67 -67
View File
@@ -1,166 +1,166 @@
{
"version": "0.6.121",
"schema": 1,
"files": [
{
"path": "KSwitcher.exe",
"sha256": "152b41278761439ce5ebe87bca3a4d8a96d89db82264ec0fbb2299e7c207dfb5",
"size": 2372096
"size": 2479616,
"sha256": "fbdb81083b17c15d784f6772fea286d78a7e7b48ae16ca0216734631ba374fa7"
},
{
"path": "KSwitcher.Config.exe",
"sha256": "3d44721ba688a6916e393d2b9d9291e38ee063795b54cdae8e78cfd621835619",
"size": 2369536
"size": 2457088,
"sha256": "d55ba3ffead5ef585d41e705388eb8f9282e74b8a3c603d0eaf37576e2072b6d"
},
{
"path": "KSwitcher.Screenshot.exe",
"sha256": "81d9fbb770e876937310a0b483e11bd96cdb9e20b0f6baf0fa9927f24965aeeb",
"size": 3348992
"size": 3059200,
"sha256": "207f9cb7bd26c3eb1a2e71719aac0d503514af1754d18659934610a80f02a8da"
},
{
"path": "KSwitcher.Files.exe",
"sha256": "04c9af5324144a46a5f3cc0d8f2c6912745f8bbad7fbef0576bd52c88b5c5e03",
"size": 4370944
"size": 4370944,
"sha256": "54030d33097766cb9665ec0f5ab0967642d1bcdf3b9e151948ae5d85781dd1fe"
},
{
"path": "WebView2Loader.dll",
"sha256": "d3fce90bdeecb08596e377dea6a316354dd8949e32ff09b89d51be00c14e21b6",
"size": 194912
"size": 194912,
"sha256": "d3fce90bdeecb08596e377dea6a316354dd8949e32ff09b89d51be00c14e21b6"
},
{
"path": "terminal/addon-fit-LICENSE.txt",
"sha256": "e256f01188af527e4d06d21d06fbf785ae9c50d4b328bf03cbe0ba7f0aa4228f",
"size": 1103
"size": 1103,
"sha256": "e256f01188af527e4d06d21d06fbf785ae9c50d4b328bf03cbe0ba7f0aa4228f"
},
{
"path": "terminal/addon-fit.js",
"sha256": "ba3ea256ce0620a0992a197d6c9baea64823fc93d8da07a9e366ca9943c18527",
"size": 1521
"size": 1521,
"sha256": "ba3ea256ce0620a0992a197d6c9baea64823fc93d8da07a9e366ca9943c18527"
},
{
"path": "terminal/index.html",
"sha256": "084d97a727b778fb10d31adcd557ee7840a38377ed60e0ef0f3ece93b349b1ef",
"size": 527
"size": 527,
"sha256": "084d97a727b778fb10d31adcd557ee7840a38377ed60e0ef0f3ece93b349b1ef"
},
{
"path": "terminal/markdown-it-LICENSE.txt",
"sha256": "792c48c5a849a15fdf9e37e8bcf9e6d1dd13b32b46c642a748a0a46a9919d473",
"size": 1073
"size": 1073,
"sha256": "792c48c5a849a15fdf9e37e8bcf9e6d1dd13b32b46c642a748a0a46a9919d473"
},
{
"path": "terminal/markdown-it.js",
"sha256": "391f2aa638e75e6c7859d0a5c5650ef0956722a45998f17e05b83bc655778e1e",
"size": 100786
"size": 100786,
"sha256": "391f2aa638e75e6c7859d0a5c5650ef0956722a45998f17e05b83bc655778e1e"
},
{
"path": "terminal/markdown.html",
"sha256": "8268f55e8642034efa5a762cbd65d02a1d416aea9e777e0fe30a7e916ae3ee79",
"size": 3635
"size": 3599,
"sha256": "b83ae50c2ada2aa6efcb02016ab54461fc9de5653111f976a51945ee0afd2094"
},
{
"path": "terminal/markdown.js",
"sha256": "4c68dff619cf248f6bd32b09a45458675c22341892dc377204e46c2f4fd562f8",
"size": 16944
"size": 17575,
"sha256": "9a48dc026dbd3970a88c34775836534d795b90765a381fce3f2a7be9640d44c8"
},
{
"path": "terminal/mermaid-LICENSE.txt",
"sha256": "ec9fb67dcb25eccc416ed56e1aab819222c805a2a4bfe4cb19e7556bf2ffde80",
"size": 1089
"size": 1089,
"sha256": "ec9fb67dcb25eccc416ed56e1aab819222c805a2a4bfe4cb19e7556bf2ffde80"
},
{
"path": "terminal/mermaid.js",
"sha256": "336df803d87a38b70a01e736e666c8f7601d2ce42f5e47c8fafe5d721074b9a3",
"size": 5537838
"size": 5537838,
"sha256": "336df803d87a38b70a01e736e666c8f7601d2ce42f5e47c8fafe5d721074b9a3"
},
{
"path": "terminal/terminal.js",
"sha256": "8268049507da54079422db2b4d90b41cd0a1e99b5946b675173ea3543de27f0b",
"size": 5065
"size": 5065,
"sha256": "8268049507da54079422db2b4d90b41cd0a1e99b5946b675173ea3543de27f0b"
},
{
"path": "terminal/xterm-LICENSE.txt",
"sha256": "b569f629d00f2626a8100df2a1798210535621e42164dfd426a6fe5aac7b0ccd",
"size": 1261
"size": 1261,
"sha256": "b569f629d00f2626a8100df2a1798210535621e42164dfd426a6fe5aac7b0ccd"
},
{
"path": "terminal/xterm.css",
"sha256": "854a7c0fb70e8b1a083c16797ab827299fb18744f5ad34f227b48337e33293c6",
"size": 7112
"size": 7112,
"sha256": "854a7c0fb70e8b1a083c16797ab827299fb18744f5ad34f227b48337e33293c6"
},
{
"path": "terminal/xterm.js",
"sha256": "14903579ff54664cd72f8e8699e6961a6272c21863ec1c3b118cdc8af5d4a972",
"size": 488663
"size": 488663,
"sha256": "14903579ff54664cd72f8e8699e6961a6272c21863ec1c3b118cdc8af5d4a972"
},
{
"path": "LICENSE",
"sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c",
"size": 4401
"size": 4401,
"sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c"
},
{
"path": "json-LICENSE.txt",
"sha256": "61e08da79c44061654015ce6b0c4061c23ee1dd18237fbf09e9bfda3c0ea2831",
"size": 1096
"size": 1096,
"sha256": "61e08da79c44061654015ce6b0c4061c23ee1dd18237fbf09e9bfda3c0ea2831"
},
{
"path": "files-text-license.txt",
"sha256": "185c5a37521316e940ead89cbf0b1ba5862d810c7c966e6c6a14a4a515b23625",
"size": 883
"size": 883,
"sha256": "185c5a37521316e940ead89cbf0b1ba5862d810c7c966e6c6a14a4a515b23625"
},
{
"path": "README.md",
"sha256": "afc7e78c4c3600888f642692423cd993b4aa431dfa54f752c7ac394de18186c6",
"size": 95354
"size": 95524,
"sha256": "23d203a1fe73d1adc5e51d088420848cfabf03929401b78c4dbb249d0b5bdbf6"
},
{
"path": "LAN-PREVIEW.md",
"sha256": "1233d6a0ed76564dd034f178a9f65db076244a819137f74dc9f2c27df9d3c930",
"size": 11577
"size": 11577,
"sha256": "1233d6a0ed76564dd034f178a9f65db076244a819137f74dc9f2c27df9d3c930"
},
{
"path": "dictionaries/en.txt",
"sha256": "d0c022b27b9fbc2ff7b6b8bec723cc1adc4eef517202f9ff77eed5d8bea3acb9",
"size": 732485
"size": 732485,
"sha256": "d0c022b27b9fbc2ff7b6b8bec723cc1adc4eef517202f9ff77eed5d8bea3acb9"
},
{
"path": "dictionaries/LICENSE-CC-BY-SA-4.0.txt",
"sha256": "0bdfb0201d1803634f268cdff0993b8349d2c70e956a06dbb667c8dd65254ec5",
"size": 20566
"size": 20566,
"sha256": "0bdfb0201d1803634f268cdff0993b8349d2c70e956a06dbb667c8dd65254ec5"
},
{
"path": "dictionaries/README.md",
"sha256": "3017bf44d3be9d9dfab21bd6778aa52b7947e61acf9ce2bc86b41d6e949ac311",
"size": 2265
"size": 2265,
"sha256": "3017bf44d3be9d9dfab21bd6778aa52b7947e61acf9ce2bc86b41d6e949ac311"
},
{
"path": "dictionaries/ru.txt",
"sha256": "80e6b6a27815973535f7facb636c597eb845dfee45cfabfc4e9b3341b9332849",
"size": 1109134
"size": 1109134,
"sha256": "80e6b6a27815973535f7facb636c597eb845dfee45cfabfc4e9b3341b9332849"
},
{
"path": "dictionaries/sources.json",
"sha256": "98e5b3fe7304e37705c9e5ff48b0b399ccb16e806736d21f09921b99e5f2a408",
"size": 1280
"size": 1280,
"sha256": "98e5b3fe7304e37705c9e5ff48b0b399ccb16e806736d21f09921b99e5f2a408"
},
{
"path": "dictionaries/uk.txt",
"sha256": "d30e990d6ec2983c04f3644a3c61c6c668e8c542323f5931916fdd55b916eebf",
"size": 940799
"size": 940799,
"sha256": "d30e990d6ec2983c04f3644a3c61c6c668e8c542323f5931916fdd55b916eebf"
},
{
"path": "tools/README.txt",
"sha256": "a34b5161a8315af037e1ec71d816bfc688f7c364141d4ee2347cf0515ef0c82a",
"size": 993
"size": 993,
"sha256": "a34b5161a8315af037e1ec71d816bfc688f7c364141d4ee2347cf0515ef0c82a"
},
{
"path": "tools/StayHere.exe",
"sha256": "6ef5cf64708d62b7fc63c3c793cc99188a513433ff4774cae01dc014f6664376",
"size": 134656
"size": 133120,
"sha256": "e23960ff3328f38c050528091ba78b822f0fa74e3396e1a349150e2947598d96"
},
{
"path": "tools/StayHere-README.md",
"sha256": "ba214e2aca7405e698b3ab21ceb1f41ce088edd996b3e30e4a9d58ff496f9413",
"size": 2796
"size": 2796,
"sha256": "ba214e2aca7405e698b3ab21ceb1f41ce088edd996b3e30e4a9d58ff496f9413"
}
],
"schema": 1,
"version": "0.6.120"
]
}
+3 -3
View File
@@ -9,8 +9,8 @@ IDC_SCREENSHOT_PENCIL CURSOR "icons/lucide/pencil.cur"
1 RT_MANIFEST "app.manifest"
201 RCDATA "update.ps1"
1 VERSIONINFO
FILEVERSION 0,6,120,0
PRODUCTVERSION 0,6,120,0
FILEVERSION 0,6,121,0
PRODUCTVERSION 0,6,121,0
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
BEGIN
@@ -20,7 +20,7 @@ BEGIN
BEGIN
VALUE "FileDescription", "KSwitcher — native keyboard and clipboard utility"
VALUE "ProductName", "KSwitcher"
VALUE "FileVersion", "0.6.120"
VALUE "FileVersion", "0.6.121"
END
END
BLOCK "VarFileInfo"
-1
View File
@@ -52,6 +52,5 @@ figure svg .edgeLabel rect { fill: Canvas !important; opacity: 1 !important; str
</nav>
<main></main>
<script src="markdown-it.js"></script>
<script src="mermaid.js"></script>
<script src="markdown.js"></script>
</html>
+24 -8
View File
@@ -18,14 +18,28 @@ let activeMatch = -1;
let taskMarkers = new WeakMap();
let pendingTask;
let previewRevision = 0;
let mermaidReady;
mermaid.initialize({
startOnLoad: false,
securityLevel: 'strict',
theme: matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'default',
suppressErrorRendering: true,
flowchart: { htmlLabels: false }
});
function loadMermaid() {
mermaidReady ??= new Promise((resolve, reject) => {
const script = document.createElement('script');
script.src = 'mermaid.js';
script.onload = resolve;
script.onerror = () => reject(new Error('Could not load Mermaid'));
document.head.append(script);
}).then(() => {
const renderer = window.mermaid;
renderer.initialize({
startOnLoad: false,
securityLevel: 'strict',
theme: matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'default',
suppressErrorRendering: true,
flowchart: { htmlLabels: false }
});
return renderer;
});
return mermaidReady;
}
markdown.core.ruler.after('inline', 'task_lists', ({ tokens, src, env }) => {
const lines = src.split('\n');
@@ -254,7 +268,9 @@ async function render({ text, fragment, scroll, title, keepPosition, revision, c
const blocks = Array.from(content.querySelectorAll('pre > code.language-mermaid'));
for (const [index, block] of blocks.entries()) {
try {
const { svg } = await mermaid.render('diagram-' + current + '-' + index, block.textContent);
const renderer = await loadMermaid();
if (current !== generation) return;
const { svg } = await renderer.render('diagram-' + current + '-' + index, block.textContent);
if (current !== generation) return;
const figure = document.createElement('figure');
figure.innerHTML = svg;
+57 -5
View File
@@ -200,6 +200,14 @@ std::vector<std::wstring> buildSnippetVariants(const std::wstring &trigger, cons
}
return variants;
}
bool snippetWordCharacter(wchar_t character)
{
WORD type{};
if (character == L'_' ||
(GetStringTypeW(CT_CTYPE1, &character, 1, &type) && (type & (C1_ALPHA | C1_DIGIT))))
return true;
return GetStringTypeW(CT_CTYPE3, &character, 1, &type) && (type & (C3_NONSPACING | C3_VOWELMARK));
}
size_t caretSteps(std::wstring text)
{
size_t n = 0;
@@ -535,12 +543,16 @@ class Transaction
farSelectedSteps = 0;
return valid() && chord(VK_LEFT);
}
while (farSelectedSteps && valid())
return narrowFarSelection(0);
}
bool narrowFarSelection(size_t count)
{
while (farSelectedSteps > count && valid())
{
if (!chord(VK_RIGHT, MOD_ALT | MOD_SHIFT)) return false;
--farSelectedSteps;
}
return !farSelectedSteps && valid();
return farSelectedSteps == count && valid();
}
std::optional<std::wstring> readFarSnippet(size_t count)
{
@@ -549,6 +561,21 @@ class Transaction
if (!finishSelection(false) || observed.empty()) return {};
return observed;
}
std::optional<bool> farSnippetWordBoundary(std::wstring_view trigger)
{
// Select to the beginning of Far's input line in one operation, then
// use the copied prefix to find the preceding character and restore the range.
if (!valid() || !chord(VK_HOME, MOD_ALT | MOD_SHIFT)) return {};
const auto context = copy();
if (!valid() || !context.ends_with(trigger)) return {};
if (context == trigger) return true;
const auto triggerSteps = farSelectedSteps;
farSelectedSteps = caretSteps(context);
if (snippetWordCharacter(context[context.size() - trigger.size() - 1]))
return false;
if (!narrowFarSelection(triggerSteps) || copy() != trigger || !valid()) return {};
return true;
}
std::wstring copyRange(size_t count, const std::wstring &wordCandidate,
const std::function<bool(const std::wstring &)> &matches,
const std::function<bool(const std::wstring &)> &suffixMatches = {})
@@ -1231,7 +1258,16 @@ void App::matchSnippets(HWND fg, bool expandExact)
trigger = sn.trigger;
}
if (expandExact && std::any_of(variants.begin(), variants.end(), [&](const auto &trigger) {
return keys.ends_with(trigger);
if (!keys.ends_with(trigger)) return false;
// A fresh key run can start inside existing text. The editor
// verifies the boundary before expansion even when this check passes.
if (keys.size() == trigger.size()) return true;
const auto layout = std::find_if(layouts.begin(), layouts.end(), [&](const auto &candidate) {
return candidate.handle == run.layout && candidate.convertible;
});
const auto previous = keys[keys.size() - trigger.size() - 1];
return layout == layouts.end() ||
!snippetWordCharacter(layout->at(physicalLayout().code(previous)));
}))
{
queueSnippet(fg, i, sn.trigger.size());
@@ -2207,6 +2243,7 @@ void App::transform(int command, int snippet, size_t snippetLength, HWND snippet
{"command", transformCommandName(command)}, {"source", layout(text.empty() ? hint : detect(text, layouts, hint))}, {"target", layout(to)},
{"outcome", utf8(reason)}, {"verification", utf8(verification)},
{"problem", reason != L"Paste verified" && reason != L"layout-only" &&
reason != L"snippet-inside-word" &&
!(command == 0 && reason == L"paste-sent-unverified")},
{"elapsedMs", GetTickCount64() - start}, {"verificationMs", verificationMs},
{"foregroundSame", GetForegroundWindow() == target},
@@ -2489,11 +2526,13 @@ void App::transform(int command, int snippet, size_t snippetLength, HWND snippet
}
bool sent = false;
const bool requireReadback = tx.recoveredSelection() || snippet >= 0;
const bool verifySelection = snippet >= 0 || (requireReadback && result != text);
auto probeStarted = GetTickCount64();
PasteProbe probe(!farSnippet && ((config.writeLog && manual) || requireReadback) && result != text, text, target);
PasteProbe probe(!farSnippet && (verifySelection || (config.writeLog && manual && result != text)),
text, target, snippet >= 0);
verificationMs = GetTickCount64() - probeStarted;
diagnosticEvent(L"Paste probe prepared: elapsedMs=" + std::to_wstring(verificationMs) + L" status=" + probe.status);
if (requireReadback && !farSnippet && result != text && probe.status != L"ready")
if (!farSnippet && verifySelection && probe.status != L"ready")
{
verification = probe.status;
reason = snippet >= 0 ? L"snippet-verification-unavailable" : L"recovered-selection-unavailable";
@@ -2502,6 +2541,19 @@ void App::transform(int command, int snippet, size_t snippetLength, HWND snippet
run.reset();
return;
}
if (snippet >= 0)
{
std::optional<bool> boundary;
if (farSnippet)
boundary = tx.farSnippetWordBoundary(text);
else if (const auto &preceding = probe.precedingCharacter)
boundary = preceding->empty() || !snippetWordCharacter(preceding->back());
if (!boundary.value_or(false))
{
reason = boundary ? L"snippet-inside-word" : L"snippet-word-boundary-unavailable";
return;
}
}
diagnosticEvent(L"Conversion source=" + std::to_wstring(hint) + L" target=" + std::to_wstring(to) +
L" changed=" + std::to_wstring(result != text));
if (result != text)
+20 -7
View File
@@ -806,7 +806,7 @@ private:
bool uploadPending{};
bool switchAfterSave{};
FilesTerminalView preview;
bool previewWanted{}, previewVisible{};
bool previewWanted{}, previewVisible{}, previewRetried{};
ULONGLONG previewDeadline{};
ULONGLONG nextFileCheck{};
struct FileStamp
@@ -918,6 +918,7 @@ private:
bool needsSave() const;
bool canPreview() const;
void updatePreview();
bool startPreviewBrowser();
void stopPreview(bool refresh=true,bool keepBrowser=false);
void renderPreview(bool keepPosition=false);
void applyMarkdownPreferences(const MarkdownPreferences &preferences);
@@ -1598,14 +1599,21 @@ void TextWindow::updatePreview()
return;
}
previewWanted=true;
previewDeadline=GetTickCount64()+8000;
previewRetried=false;
previewStamp=previewFileStamp();
nextFileCheck=GetTickCount64()+350;
cancelImages=std::make_shared<std::atomic<bool>>(false);
if(!SetTimer(window,previewTimer,50,nullptr)) { stopPreview(); return; }
if(preview.initialized()) renderPreview();
else if(!preview.create(window,[this](const auto &value){previewMessage(value);},
[this]{PostMessageW(window,previewFailed,0,0);},true,[this](UINT key)
else if(!startPreviewBrowser()) { stopPreview(); return; }
layout();
}
bool TextWindow::startPreviewBrowser()
{
previewDeadline=GetTickCount64()+8000;
return preview.create(window,[this](const auto &value){previewMessage(value);},
[this]{previewDeadline=GetTickCount64()+300;},true,[this](UINT key)
{
const bool ctrl=(GetKeyState(VK_CONTROL)&0x8000)!=0;
const bool alt=(GetKeyState(VK_MENU)&0x8000)!=0;
@@ -1628,9 +1636,7 @@ void TextWindow::updatePreview()
if(key!=VK_F6 && key!=VK_ESCAPE && key!=VK_F10 && !(ctrl && key=='W')) return false;
PostMessageW(window,WM_COMMAND,key==VK_F6?switchMode:key==VK_ESCAPE?previewEscape:close,0);
return true;
}))
stopPreview();
layout();
});
}
void TextWindow::stopPreview(bool refresh,bool keepBrowser)
@@ -2027,6 +2033,13 @@ void TextWindow::pollImages()
refreshPreview();
if(!previewVisible && GetTickCount64()>=previewDeadline)
{
if(!preview.initialized() && !previewRetried)
{
// The previous window's WebView2 process may still be shutting down.
previewRetried=true;
preview.close();
if(startPreviewBrowser()) return;
}
stopPreview();
return;
}
+29 -11
View File
@@ -11,8 +11,19 @@ class PasteProbe
IUIAutomationElement *element{};
IUIAutomationTextPattern *pattern{};
static std::optional<std::wstring> rangeText(IUIAutomationTextRange *range)
{
BSTR value{};
const HRESULT hr = range->GetText(8193, &value);
std::wstring text(value ? value : L"", SysStringLen(value));
SysFreeString(value);
if (FAILED(hr)) return {};
return text;
}
public:
std::wstring status = L"not-requested";
std::optional<std::wstring> precedingCharacter;
PasteProbe(bool enabled, HWND target)
{
if (!enabled)
@@ -48,11 +59,11 @@ class PasteProbe
!pattern)
return;
}
PasteProbe(bool enabled, const std::wstring &original, HWND target = nullptr)
PasteProbe(bool enabled, const std::wstring &original, HWND target = nullptr, bool readPreceding = false)
: PasteProbe(enabled, target)
{
if (!pattern) return;
auto selected = read(1, false);
auto selected = read(1, false, readPreceding);
auto normalize = [](std::wstring value)
{
for (size_t at = 0; (at = value.find(L"\r\n", at)) != value.npos;)
@@ -80,7 +91,7 @@ class PasteProbe
if (automation)
automation->Release();
}
std::optional<std::wstring> read(int characters, bool allowCaret = true)
std::optional<std::wstring> read(int characters, bool allowCaret = true, bool readPreceding = false)
{
if (!pattern)
return {};
@@ -162,19 +173,26 @@ class PasteProbe
if (SUCCEEDED(hr) && moved != -characters)
hr = E_FAIL;
}
BSTR value{};
if (SUCCEEDED(hr))
hr = range->GetText(8193, &value);
auto text = SUCCEEDED(hr) ? rangeText(range) : std::nullopt;
if (readPreceding && text &&
SUCCEEDED(range->MoveEndpointByRange(TextPatternRangeEndpoint_End, range, TextPatternRangeEndpoint_Start)))
{
int moved{};
if (SUCCEEDED(range->MoveEndpointByUnit(TextPatternRangeEndpoint_Start, TextUnit_Character, -1, &moved)))
{
if (moved == 0)
precedingCharacter.emplace();
else if (auto previous = rangeText(range); previous && !previous->empty())
precedingCharacter = std::move(previous);
}
}
range->Release();
if (FAILED(hr))
if (!text)
{
SysFreeString(value);
status = L"range-read-failed";
return {};
}
std::wstring text(value ? value : L"", SysStringLen(value));
SysFreeString(value);
if (text.size() > 8192)
if (text->size() > 8192)
{
status = L"readback-size-limit";
return {};
+1 -1
View File
@@ -2,7 +2,7 @@
#include "platform.h"
namespace ks
{
inline constexpr wchar_t AppVersion[] = L"0.6.120";
inline constexpr wchar_t AppVersion[] = L"0.6.121";
inline constexpr UINT UpdateMessage = WM_APP + 7;
inline constexpr UINT UpdateCheckIntervalMs = 6 * 60 * 60 * 1000;
inline constexpr UINT UpdateNotificationRetryMs = 5 * 60 * 1000;
+9 -2
View File
@@ -84,9 +84,11 @@ int WINAPI wWinMain(HINSTANCE instance,HINSTANCE,PWSTR,int) {
{
ks::App app(instance,false,folder/L"data");app.window=owner;
app.settings.history=false;app.settings.autoCorrect=false;app.settings.writeLog=true;
auto prepare=[&](wchar_t last=L'r') {
auto prepare=[&](wchar_t last=L'r', wchar_t prefix=0) {
if(!ks::activateWindow(target))throw std::runtime_error("isolated Far lost foreground");
key(VK_ESCAPE);key('Y',0,LEFT_CTRL_PRESSED);key(VK_OEM_1,L':',SHIFT_PRESSED);key(WORD(towupper(last)),last);
key(VK_ESCAPE);key('Y',0,LEFT_CTRL_PRESSED);
if(prefix)key(prefix==L' '?VK_SPACE:WORD(towupper(prefix)),prefix);
key(VK_OEM_1,L':',SHIFT_PRESSED);key(WORD(towupper(last)),last);
app.run.reset();app.run.window=target;app.run.layout=ks::windowLayout(target);
app.run.at=GetTickCount64();app.run.keys=L":r";
};
@@ -103,6 +105,11 @@ int WINAPI wWinMain(HINSTANCE instance,HINSTANCE,PWSTR,int) {
require(ks::readClipboard(owner).text()==sentinel.text(),"snippet restores original clipboard");
prepare(L'x');before=position();original=row();expand(L"rider .{enter}");
require(row()==original && position().X==before.X,"mismatched trigger restores original caret and never executes Enter");
prepare(L'r',L'x');before=position();original=row();expand(L"rider .");
require(row()==original && position().X==before.X,"trigger inside a word restores original caret");
prepare(L'r',L' ');before=position();expand(L"rider .");
require(row().substr(before.X-3,8)==L" rider ." && position().X==before.X+5,
"trigger after a space preserves the separator");
prepare();before=position();original=row();expand(L"left{cursor}right");
require(row().substr(before.X-2,9)==L"leftright" && position().X==before.X+2,"cursor marker uses Far selection semantics");
prepare();before=position();original=row();expand(L"first\nsecond{enter}");
+38
View File
@@ -117,6 +117,18 @@ function Scintilla($Window) {
[MarkdownUi]::FindWindowEx($Window,0,'Scintilla',[NullString]::Value)
}
function Assert-ReopenedMarkdown($Window, $File) {
try { Browser 'reopen' '' $File }
finally {
if ([MarkdownUi]::IsWindowVisible((Scintilla $Window))) { throw "$File opened as raw text." }
}
}
function Close-Preview($Window) {
Post $Window 0x10 0
[void](Wait-For 'the Markdown preview to close' { ![MarkdownUi]::IsWindowVisible($Window) })
}
function Assert-TextWindowAppearance($Window, [string]$Mode) {
$identity = "HrynCo.KSwitcher.Files.$Mode"
$resource = if($Mode -eq 'Editor') { ',-104' } else { ',-103' }
@@ -204,6 +216,8 @@ const value = 42;
'@
$original = Join-Path $docs 'Preview.md'
[IO.File]::WriteAllText($original,$fixture)
[IO.File]::WriteAllText("$docs\Reopen.md",'# Reopened Markdown')
[IO.File]::WriteAllText("$docs\Second.md",'# Second Markdown')
$childText = '# Linked Markdown' + "`n`n" + (("Filler paragraph.`n`n") * 60) + '## Target heading'
[IO.File]::WriteAllText("$docs\child\Other.md",$childText)
[IO.File]::WriteAllText("$docs\Plain.txt",'Plain text')
@@ -235,6 +249,30 @@ const value = 42;
[MarkdownUi]::Activate($main)
$panel = [MarkdownUi]::GetDlgItem($main,102)
$previewScript = Join-Path $app 'terminal\markdown.js'
$originalScript = [IO.File]::ReadAllText($previewScript)
try {
# Let the page load without sending the ready message until Files starts a new WebView.
[IO.File]::WriteAllText($previewScript,"document.documentElement.dataset.startup = 'stalled';")
Open-File 'Reopen.md' 0x72
$window = Wait-For 'the stalled Markdown viewer' { Find-Window 'KSwitcher.Files.Text' 'Reopen.md' }
Browser 'startup-stalled'
} finally { [IO.File]::WriteAllText($previewScript,$originalScript) }
Assert-ReopenedMarkdown $window 'Reopen.md'
Close-Preview $window
Write-Output 'Verified that the same viewer renders Markdown after a stalled WebView2 startup.'
Open-File 'Reopen.md' 0x72
$window = Wait-For 'the Markdown viewer before early close' { Find-Window 'KSwitcher.Files.Text' 'Reopen.md' }
Close-Preview $window
foreach ($file in 'Reopen.md','Second.md','Reopen.md','Second.md','Reopen.md','Second.md') {
Open-File $file 0x72
$window = Wait-For "the reopened $file viewer" { Find-Window 'KSwitcher.Files.Text' $file }
Assert-ReopenedMarkdown $window $file
Close-Preview $window
}
Write-Output 'Verified six immediate Markdown reopens after closing the initial preview during startup.'
Open-File 'Preview.md' 0x72
$window = Wait-For 'the Markdown viewer' { Find-Window 'KSwitcher.Files.Text' 'Viewer' }
$viewerIcons = Assert-TextWindowAppearance $window 'Viewer'
+11 -2
View File
@@ -139,9 +139,18 @@ try {
clip: { x:0, y:0, width:cssContentSize.width, height:Math.min(cssContentSize.height, 620), scale:1 } });
await writeFile(artifact, Buffer.from(data, 'base64'));
}
} else if (scenario === 'startup-stalled') {
await waitFor(() => evaluate(`document.documentElement?.dataset.startup === 'stalled'`),
'the preview page to load without announcing readiness');
} else if (scenario === 'reopen') {
const heading = title === 'Reopen.md' ? 'Reopened Markdown' : 'Second Markdown';
await waitFor(() => evaluate(`document.documentElement?.classList.contains('rendered') &&
document.querySelector('h1')?.textContent === ${JSON.stringify(heading)}`), heading);
assert.equal(await evaluate(`performance.getEntriesByName(new URL('mermaid.js', location.href).href).length`),
0, 'Reopening a document without diagrams must not load Mermaid');
} else if (scenario === 'external-replacement') {
await waitFor(() => evaluate(`document.documentElement.classList.contains('rendered') &&
document.querySelector('main').textContent.trim() === 'An external replacement'`),
await waitFor(() => evaluate(`document.documentElement?.classList.contains('rendered') &&
document.querySelector('main')?.textContent.trim() === 'An external replacement'`),
'the replacement file rendered after discarding edits');
} else if (scenario === 'diagram-reference') {
await waitFor(() => evaluate("document.documentElement.classList.contains('rendered')"), 'rendered diagram page');
+54
View File
@@ -42,6 +42,10 @@ struct InputRegressionAccess
++*reinterpret_cast<int *>(context);
return DefSubclassProc(window, message, wp, lp);
}, 1, reinterpret_cast<DWORD_PTR>(&hideCount));
expireRun(app);
}
static void expireRun(App &app)
{
std::lock_guard lock(app.stateMutex);
app.run.at = GetTickCount64() - 2500;
}
@@ -867,6 +871,54 @@ LRESULT CALLBACK procedure(HWND w, UINT msg, WPARAM wp, LPARAM lp)
pasteBehavior = 0;
finish();
break;
case 84:
saved = ks::readClipboard(app->window, 64 * 1024 * 1024);
captured = true;
app->ownSequence = ks::writeClipboard(app->window, ks::textClip(sentinel));
app->settings.snippets = {{L";r", L"rider ."}, {L"[g", L"expanded"}};
app->settings.autoCorrect = false;
ActivateKeyboardLayout(app->layouts[ru].handle, 0);
prepare(L"", false);
typeKeys({'G', 'J', 'L', 'L', 'T', VK_OEM_1, 'R'});
break;
case 85:
require(text() == L"поддежк", "layout variant does not expand at the end of a word");
prepare(L"поддека", false);
SendMessageW(field, EM_SETSEL, 5, 5);
typeKeys({VK_OEM_1, 'R'});
break;
case 86:
require(text() == L"поддежкка", "layout variant does not expand at a caret inside existing text");
require(LOWORD(SendMessageW(field, EM_GETSEL, 0, 0)) == 7,
"skipping expansion restores the caret before the rest of the word");
prepare(L"", false);
typeKeys({'G', 'J', 'L', 'L', 'T'});
break;
case 87:
require(text() == L"подде", "editor received the first part of the word");
ks::InputRegressionAccess::expireRun(*app);
typeKeys({VK_OEM_1, 'R'});
break;
case 88:
require(text() == L"поддежк", "layout variant does not expand after the typing buffer expires");
prepare(L"prefix (", false);
typeKeys({VK_OEM_1, 'R'});
break;
case 89:
require(text() == L"prefix (rider .", "layout variant expands after punctuation");
prepare(L"token_", false);
typeKeys({VK_OEM_4, 'G'});
break;
case 90:
require(text() == L"token_хп", "word boundary also applies to other trigger prefixes");
prepare(L"", false);
typeKeys({VK_OEM_4, 'G'});
break;
case 91:
require(text() == L"expanded", "another layout variant expands at the start of the field");
require(ks::readClipboard(app->window).text() == sentinel, "word boundary check restores the clipboard");
finish();
break;
case 20:
if (!captured)
{
@@ -1182,6 +1234,8 @@ int main(int argc, char **argv)
stage = 64;
if (argc > 1 && std::string(argv[1]) == "--snippet-autocomplete")
stage = 66;
if (argc > 1 && std::string(argv[1]) == "--snippet-word-boundaries")
stage = 84;
SetTimer(host, 1, 100, nullptr);
auto forwarding = SetWindowsHookExW(WH_KEYBOARD_LL,forwardingHook,GetModuleHandleW(nullptr),0);
require(forwarding!=nullptr,"downstream forwarding fixture installed before application hook");