Improved reliability of the search experience (#6671)

Author: gave92

Files/Filesystem/Search/FolderSearch.cs

@@ -41,6 +41,23 @@ public class FolderSearch
 
         public EventHandler SearchTick;
 
+        private bool IsAQSQuery => Query is not null && (Query.StartsWith("$") || Query.Contains(":"));
+
+        private string QueryWithWildcard
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(Query) && Query.Contains('.')) // ".docx" -> "*.docx"
+                {
+                    var split = Query.Split('.');
+                    var leading = string.Join('.', split.SkipLast(1));
+                    var query = $"{leading}*.{split.Last()}";
+                    return $"{query}*";
+                }
+                return $"{Query}*";
+            }
+        }
+
         public string AQSQuery
         {
             get
@@ -56,7 +73,7 @@ public string AQSQuery
                 }
                 else
                 {
-                    return $"System.FileName:\"{Query}\"";
+                    return $"System.FileName:\"{QueryWithWildcard}\"";
                 }
             }
         }
@@ -245,20 +262,12 @@ private async Task AddItemsAsync(string folder, IList<ListedItem> results, Cance
                 if (workingFolder)
                 {
                     await SearchAsync(workingFolder, results, token);
-                    //foreach (var item in await SearchAsync(workingFolder))
-                    //{
-                    //    results.Add(item);
-                    //}
-                    hiddenOnlyFromWin32 = true;
+                    hiddenOnlyFromWin32 = (results.Count != 0);
                 }
 
-                if (!hiddenOnlyFromWin32 || UserSettingsService.FilesAndFoldersSettingsService.AreHiddenItemsVisible)
+                if (!IsAQSQuery && (!hiddenOnlyFromWin32 || UserSettingsService.FilesAndFoldersSettingsService.AreHiddenItemsVisible))
                 {
                     await SearchWithWin32Async(folder, hiddenOnlyFromWin32, UsedMaxItemCount - (uint)results.Count, results, token);
-                    //foreach (var item in)
-                    //{
-                    //    results.Add(item);
-                    //}
                 }
             }
         }
@@ -269,7 +278,7 @@ private async Task SearchWithWin32Async(string folder, bool hiddenOnly, uint max
             (IntPtr hFile, WIN32_FIND_DATA findData) = await Task.Run(() =>
             {
                 int additionalFlags = FIND_FIRST_EX_LARGE_FETCH;
-                IntPtr hFileTsk = FindFirstFileExFromApp($"{folder}\\*{Query}*.*", FINDEX_INFO_LEVELS.FindExInfoBasic,
+                IntPtr hFileTsk = FindFirstFileExFromApp($"{folder}\\{QueryWithWildcard}", FINDEX_INFO_LEVELS.FindExInfoBasic,
                     out WIN32_FIND_DATA findDataTsk, FINDEX_SEARCH_OPS.FindExSearchNameMatch, IntPtr.Zero, additionalFlags);
                 return (hFileTsk, findDataTsk);
             }).WithTimeoutAsync(TimeSpan.FromSeconds(5));

Files/Services/Implementation/FileTagsSettingsService.cs

@@ -44,7 +44,7 @@ public FileTag GetTagById(string uid)
 
         public IEnumerable<FileTag> GetTagsByName(string tagName)
         {
-            return FileTagList.Where(x => x.TagName.Equals(tagName, StringComparison.OrdinalIgnoreCase));
+            return FileTagList.Where(x => x.TagName.StartsWith(tagName, StringComparison.OrdinalIgnoreCase));
         }
     }
 }

Files/Views/ModernShellPage.xaml.cs

@@ -661,9 +661,12 @@ private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, Keybo
                         break;
                     }
 
-                case (false, false, false, true, VirtualKey.F3): //f3
-                case (true, false, false, true, VirtualKey.F): // ctrl + f
-                    NavToolbarViewModel.SwitchSearchBoxVisibility();
+                case (false, false, false, _, VirtualKey.F3): //f3
+                case (true, false, false, _, VirtualKey.F): // ctrl + f
+                    if (tabInstance || CurrentPageType == typeof(WidgetsPage))
+                    {
+                        NavToolbarViewModel.SwitchSearchBoxVisibility();
+                    }
                     break;
 
                 case (true, true, false, true, VirtualKey.N): // ctrl + shift + n, new item
@@ -1137,7 +1140,7 @@ public class PathBoxItem
     public class NavigationParams
     {
         public string NavPath { get; set; }
-        public string SelectItem { get; set;}
+        public string SelectItem { get; set; }
     }
 
     public class NavigationArguments