From 072113a127979f9403ae4938eb15dd11a8aa7228 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Thu, 12 Jan 2023 17:06:23 +0800 Subject: [PATCH] Expand builtin shortcuts when needed --- Flow.Launcher/ViewModel/MainViewModel.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs index 71b0d02373b..705f6aad0a1 100644 --- a/Flow.Launcher/ViewModel/MainViewModel.cs +++ b/Flow.Launcher/ViewModel/MainViewModel.cs @@ -841,15 +841,20 @@ private Query ConstructQuery(string queryText, IEnumerable queryBuilder.Replace('@' + shortcut.Key, shortcut.Expand()); } + string customExpanded = queryBuilder.ToString(); + Application.Current.Dispatcher.Invoke(() => { foreach (var shortcut in builtInShortcuts) { try { - var expansion = shortcut.Expand(); - queryBuilder.Replace(shortcut.Key, expansion); - queryBuilderTmp.Replace(shortcut.Key, expansion); + if (customExpanded.Contains(shortcut.Key)) + { + var expansion = shortcut.Expand(); + queryBuilder.Replace(shortcut.Key, expansion); + queryBuilderTmp.Replace(shortcut.Key, expansion); + } } catch (Exception e) {