Expand builtin shortcuts when needed

VictoriousRaptor · VictoriousRaptor · commit 072113a12797 · 2023-01-12T17:06:23.000+08:00
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -841,15 +841,20 @@ private Query ConstructQuery(string queryText, IEnumerable<CustomShortcutModel>
                 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)
                     {

Original file line number	Diff line number	Diff line change
`@@ -841,15 +841,20 @@ private Query ConstructQuery(string queryText, IEnumerable<CustomShortcutModel>`
`841`	`841`	`queryBuilder.Replace('@' + shortcut.Key, shortcut.Expand());`
`842`	`842`	`}`
`843`	`843`
	`844`	`+ string customExpanded = queryBuilder.ToString();`
	`845`	`+`
`844`	`846`	`Application.Current.Dispatcher.Invoke(() =>`
`845`	`847`	`{`
`846`	`848`	`foreach (var shortcut in builtInShortcuts)`
`847`	`849`	`{`
`848`	`850`	`try`
`849`	`851`	`{`
`850`		`- var expansion = shortcut.Expand();`
`851`		`- queryBuilder.Replace(shortcut.Key, expansion);`
`852`		`- queryBuilderTmp.Replace(shortcut.Key, expansion);`
	`852`	`+ if (customExpanded.Contains(shortcut.Key))`
	`853`	`+ {`
	`854`	`+ var expansion = shortcut.Expand();`
	`855`	`+ queryBuilder.Replace(shortcut.Key, expansion);`
	`856`	`+ queryBuilderTmp.Replace(shortcut.Key, expansion);`
	`857`	`+ }`
`853`	`858`	`}`
`854`	`859`	`catch (Exception e)`
`855`	`860`	`{`