Improve update logic & Fix update logic issue & Input for Query

Flow.Launcher.Core/Plugin/QueryBuilder.cs

@@ -6,14 +6,15 @@ namespace Flow.Launcher.Core.Plugin
 {
     public static class QueryBuilder
     {
-        public static Query Build(string text, Dictionary<string, PluginPair> nonGlobalPlugins)
+        public static Query Build(string input, string text, Dictionary<string, PluginPair> nonGlobalPlugins)
         {
             // home query
             if (string.IsNullOrEmpty(text))
             {
                 return new Query()
                 {
                     Search = string.Empty,
+                    Input = string.Empty,
                     RawQuery = string.Empty,
                     SearchTerms = Array.Empty<string>(),
                     ActionKeyword = string.Empty,
@@ -52,6 +53,7 @@ public static Query Build(string text, Dictionary<string, PluginPair> nonGlobalP
             return new Query()
             {
                 Search = search,
+                Input = input,
                 RawQuery = rawQuery,
                 SearchTerms = searchTerms,
                 ActionKeyword = actionKeyword,

Flow.Launcher.Plugin/Query.cs

@@ -7,6 +7,12 @@ namespace Flow.Launcher.Plugin
     /// </summary>
     public class Query
     {
+        /// <summary>
+        /// Input text in query box.
+        /// We didn't recommend use this property directly. You should always use Search property.
+        /// </summary>
+        public string Input { get; internal init; }
+
         /// <summary>
         /// Raw query, this includes action keyword if it has.
         /// It has handled buildin custom query shortkeys and build-in shortcuts, and it trims the whitespace.

Flow.Launcher.Test/QueryBuilderTest.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Plugin;
 
@@ -16,16 +16,16 @@
                 {">", new PluginPair {Metadata = new PluginMetadata {ActionKeywords = new List<string> {">"}}}}
             };
 
-            Query q = QueryBuilder.Build(">   ping    google.com   -n 20  -6", nonGlobalPlugins);
+            Query q = QueryBuilder.Build(">   ping    google.com   -n 20  -6", ">   ping    google.com   -n 20  -6", nonGlobalPlugins);
 
             ClassicAssert.AreEqual(">   ping    google.com   -n 20  -6", q.RawQuery);
             ClassicAssert.AreEqual("ping    google.com   -n 20  -6", q.Search, "Search should not start with the ActionKeyword.");
             ClassicAssert.AreEqual(">", q.ActionKeyword);
 
             ClassicAssert.AreEqual(5, q.SearchTerms.Length, "The length of SearchTerms should match.");
 
             ClassicAssert.AreEqual("ping", q.FirstSearch);
             ClassicAssert.AreEqual("google.com", q.SecondSearch);
             ClassicAssert.AreEqual("-n", q.ThirdSearch);
 
             ClassicAssert.AreEqual("google.com -n 20 -6", q.SecondToEndSearch, "SecondToEndSearch should be trimmed of multiple whitespace characters");
@@ -39,7 +39,7 @@
                 {">", new PluginPair {Metadata = new PluginMetadata {ActionKeywords = new List<string> {">"}, Disabled = true}}}
             };
 
-            Query q = QueryBuilder.Build(">   ping    google.com   -n 20  -6", nonGlobalPlugins);
+            Query q = QueryBuilder.Build(">   ping    google.com   -n 20  -6", ">   ping    google.com   -n 20  -6", nonGlobalPlugins);
 
             ClassicAssert.AreEqual(">   ping    google.com   -n 20  -6", q.Search);
             ClassicAssert.AreEqual(q.Search, q.RawQuery, "RawQuery should be equal to Search.");
@@ -51,7 +51,7 @@
         [Test]
         public void GenericPluginQueryTest()
         {
-            Query q = QueryBuilder.Build("file.txt file2 file3", new Dictionary<string, PluginPair>());
+            Query q = QueryBuilder.Build("file.txt file2 file3", "file.txt file2 file3", new Dictionary<string, PluginPair>());
 
             ClassicAssert.AreEqual("file.txt file2 file3", q.Search);
             ClassicAssert.AreEqual("", q.ActionKeyword);

Flow.Launcher/MainWindow.xaml.cs

@@ -81,8 +81,8 @@
         public MainWindow()
         {
             _settings = Ioc.Default.GetRequiredService<Settings>();
             _theme = Ioc.Default.GetRequiredService<Theme>();
             _viewModel = Ioc.Default.GetRequiredService<MainViewModel>();
             DataContext = _viewModel;
 
             Topmost = _settings.ShowAtTopmost;
@@ -111,7 +111,7 @@
         {
             var handle = Win32Helper.GetWindowHandle(this, true);
             _hwndSource = HwndSource.FromHwnd(handle);
             _hwndSource.AddHook(WndProc);
             Win32Helper.HideFromAltTab(this);
             Win32Helper.DisableControlBox(this);
         }
@@ -360,7 +360,7 @@
         {
             try
             {
                 _hwndSource.RemoveHook(WndProc);
             }
             catch (Exception)
             {
@@ -453,7 +453,7 @@
                             && QueryTextBox.CaretIndex == QueryTextBox.Text.Length)
                         {
                             var queryWithoutActionKeyword =
-                                QueryBuilder.Build(QueryTextBox.Text.Trim(), PluginManager.NonGlobalPlugins)?.Search;
+                                QueryBuilder.Build(QueryTextBox.Text, QueryTextBox.Text.Trim(), PluginManager.NonGlobalPlugins)?.Search;
 
                             if (FilesFolders.IsLocationPathString(queryWithoutActionKeyword))
                             {
@@ -484,7 +484,7 @@
             }
         }
 
 #pragma warning restore VSTHRD100 // Avoid async void methods
 
         #endregion
 
@@ -787,7 +787,7 @@
 
         private void UpdatePosition()
         {
             // Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
             InitializePosition();
             InitializePosition();
         }
@@ -803,7 +803,7 @@
 
         private void InitializePosition()
         {
             // Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
             InitializePositionInner();
             InitializePositionInner();
             return;