Fixed issue with MakeSuggestionsPrivate which was unnecassarily duplicating functionality. Fixes issue with PathInformation returning an empty string if the path ended with \\.

Combined two ISuggest classes into CombinedSuggest.

Author: Declan Taylor

source/Demos/CachedPathSuggestBoxDemo/Infrastructure/CachedPathInformationSuggest.cs

@@ -41,10 +41,10 @@ public void Insert(string path)
         /// </example>
         public async Task<IEnumerable<object>?> MakeSuggestions(string queryThis)
         {
-            return await Task.Run(() => MakeSuggestionsPrivate(queryThis).ToArray());
+            return await Task.Run(() => MakeSuggestionsPrivate().ToArray());
 
-            IEnumerable<object> MakeSuggestionsPrivate(string queryThis) => from item in GetPathInformations(queryThis)
-                where item.Name.Contains(queryThis, StringComparison.CurrentCultureIgnoreCase)
+            IEnumerable<object> MakeSuggestionsPrivate() => 
+                from item in GetPathInformations(queryThis)
                 select new { Header = item.FullName, Value = item.FullName };
 
             static PathInformation[] GetPathInformations(string key)

source/Demos/CachedPathSuggestBoxDemo/Infrastructure/CombinedSuggest.cs

@@ -0,0 +1,33 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CachedPathSuggestBoxDemo.Infrastructure
+{
+    class CombinedSuggest:ISuggest
+    {
+        private readonly DirectorySuggest directorySuggest = new DirectorySuggest();
+
+        public readonly CachedPathInformationSuggest CachedPathInformationSuggest = new CachedPathInformationSuggest();
+
+        public async Task<IEnumerable<object>?> MakeSuggestions(string queryThis)
+        {
+
+            var suggestions1 = (await CachedPathInformationSuggest.MakeSuggestions(queryThis))?.ToArray();
+
+            var suggestions2 = (await directorySuggest.MakeSuggestions(queryThis))?.ToArray();
+
+            if (suggestions2 == null && suggestions1?.Any()==false)
+            {
+                return null;
+            }
+
+            return suggestions2!=null ?
+                suggestions1?.Concat(suggestions2) :
+                suggestions1;
+        }
+    }
+}

source/Demos/CachedPathSuggestBoxDemo/Infrastructure/LiteRepository.cs

@@ -31,8 +31,8 @@ public IEnumerable<KeyValuePair<string, DateTime>> Filter(string key, string? co
         {
             using var db = new LiteDatabase(DbPath);
             var col = db.GetCollection<KeyValuePair<string, DateTime>>(collectionName ?? CollectionName);
-            return string.IsNullOrEmpty(key)?
-                new KeyValuePair<string, DateTime>[]{}:
+            return string.IsNullOrWhiteSpace(key)?
+                col.Query().ToArray():
                 col.Find(Query.Contains(nameof(KeyValuePair<string, DateTime>.Key), key)).ToArray();
         }
 

source/Demos/CachedPathSuggestBoxDemo/Infrastructure/PathInformation.cs

@@ -7,7 +7,10 @@ public class PathInformation : IEquatable<PathInformation>
     {
         public PathInformation(string argValue)
         {
-            Name = new DirectoryInfo(argValue).Parent == null ? argValue : Path.GetFileName(argValue);
+            Name = new DirectoryInfo(argValue).Parent == null ? argValue : 
+                argValue.EndsWith("\\")? Path.GetDirectoryName(argValue): 
+                Path.GetFileName(argValue);
+
             FullName = argValue;
         }
 
@@ -18,17 +21,16 @@ public PathInformation(string argValue)
 
         public bool Equals(PathInformation other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
             return Name == other.Name && FullName == other.FullName;
         }
 
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
-            if (obj.GetType() != this.GetType()) return false;
-            return Equals((PathInformation)obj);
+            return obj.GetType() == this.GetType() && Equals((PathInformation)obj);
         }
 
         public override int GetHashCode()

source/Demos/CachedPathSuggestBoxDemo/MainWindow.xaml.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+
 using System.Linq;
 using System.Windows;
 using CachedPathSuggestBoxDemo.Infrastructure;
@@ -11,10 +10,8 @@ namespace CachedPathSuggestBoxDemo
     /// </summary>
     public partial class MainWindow : Window
     {
-        private readonly DirectorySuggest directorySuggest = new DirectorySuggest();
+        private readonly CombinedSuggest combinedSuggest =new CombinedSuggest();
         private readonly FastObservableCollection<object> listQueryResult = new FastObservableCollection<object>();
-        public readonly CachedPathInformationSuggest cachedPathInformationSuggest =new CachedPathInformationSuggest();
-
         public MainWindow()
         {
             InitializeComponent();
@@ -36,28 +33,20 @@ private async void Execute(object p)
             if (!(p is string newText))
                 return;
 
-            var suggestions2 = await directorySuggest.MakeSuggestions(newText);
-
+            var suggestions = (await combinedSuggest.MakeSuggestions(newText))?.ToArray();
             listQueryResult.Clear();
-            if (suggestions2 == null)
+            if (suggestions == null)
             {
                 this.DiskPathSuggestBox.ValidText = false;
                 return;
             }
             this.DiskPathSuggestBox.ValidText = true;
-
-            var suggestions1 = await cachedPathInformationSuggest.MakeSuggestions(newText);
-
-            var enumerable = suggestions1
-                                        .Concat(suggestions2)
-                                        .ToArray();
-
-            listQueryResult.AddItems(enumerable);
+            listQueryResult.AddItems(suggestions);
         }
 
         private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
         {
-            cachedPathInformationSuggest.Insert(Text);
+            combinedSuggest.CachedPathInformationSuggest.Insert(Text);
         }
     }
 }