Improve distinguish between home query and global query

Author: Jack251970

Flow.Launcher.Core/Plugin/QueryBuilder.cs

@@ -16,8 +16,7 @@ public static Query Build(string text, Dictionary<string, PluginPair> nonGlobalP
                     Search = string.Empty,
                     RawQuery = string.Empty,
                     SearchTerms = Array.Empty<string>(),
-                    // must use null because we need to distinguish between home query and global query
-                    ActionKeyword = null
+                    ActionKeyword = string.Empty
                 };
             }
 

Flow.Launcher.Plugin/Query.cs

@@ -53,7 +53,6 @@ public class Query
         /// <summary>
         /// The action keyword part of this query.
         /// For global plugins this value will be empty.
-        /// For home query this value will be null.
         /// </summary>
         public string ActionKeyword { get; init; }
 

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -33,6 +33,7 @@ public partial class MainViewModel : BaseModel, ISavable, IDisposable
 
         private bool _isQueryRunning;
         private Query _lastQuery;
+        private bool _lastHomeQuery;
         private string _queryTextBeforeLeaveResults;
         private string _ignoredQueryText = null;
 
@@ -1261,6 +1262,8 @@ private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, b
                 return;
             }
 
+            var homeQuery = query.RawQuery == string.Empty;
+
             _updateSource = new CancellationTokenSource();
 
             ProgressBarVisibility = Visibility.Hidden;
@@ -1275,11 +1278,11 @@ private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, b
             query.IsReQuery = isReQuery;
 
             // handle the exclusiveness of plugin using action keyword
-            RemoveOldQueryResults(query);
+            RemoveOldQueryResults(query, homeQuery);
 
             _lastQuery = query;
+            _lastHomeQuery = homeQuery;
 
-            var homeQuery = query.RawQuery == string.Empty;
             ICollection<PluginPair> plugins = Array.Empty<PluginPair>();
             if (homeQuery)
             {
@@ -1524,9 +1527,15 @@ private async Task BuildQueryAsync(IEnumerable<BaseBuiltinShortcutModel> builtIn
             }
         }
 
-        private void RemoveOldQueryResults(Query query)
+        private void RemoveOldQueryResults(Query query, bool homeQuery)
         {
-            if (_lastQuery?.ActionKeyword != query?.ActionKeyword)
+            // If last or current query is home query, we need to clear the results
+            if (_lastHomeQuery || homeQuery)
+            {
+                Results.Clear();
+            }
+            // If last and current query are not home query, we need to check action keyword
+            else if (_lastQuery?.ActionKeyword != query?.ActionKeyword)
             {
                 Results.Clear();
             }