nuget package

README.md

@@ -11,7 +11,7 @@
 * Synchronizes access between multiple threads and multiple instances of the same program.
 * Implements an interface to support Dependency Inversion and unit tests (mockable).
 
-[Project Reference and Release Notes](https://github.com/FolkerKinzel/RecentFiles.WPF/releases/tag/v1.5.0)
+[Project Reference and Release Notes](https://github.com/FolkerKinzel/RecentFiles.WPF/releases/tag/v1.5.1)
 
 [See code examples on GitHub](https://github.com/FolkerKinzel/RecentFiles.WPF)
 

src/FolkerKinzel.RecentFiles.WPF.Tests/Intls/FileNameFormatterTest.cs → src/FolkerKinzel.RecentFiles.WPF.Tests/Intls/FileNameFormatterTests.cs

@@ -3,7 +3,7 @@
 namespace FolkerKinzel.RecentFiles.WPF.Intls.Tests;
 
 [TestClass]
-public class FileNameFormatterTest
+public class FileNameFormatterTests
 {
     [TestMethod]
     public void GetMenuItemHeaderFromFilenameTest1()
@@ -14,5 +14,13 @@ public void GetMenuItemHeaderFromFilenameTest1()
 
         Assert.IsTrue(output.StartsWith("_1: C:\\one"));
         Assert.IsTrue(output.EndsWith("fifteen\\sixteen"));
+        StringAssert.Contains(output, FileNameFormatter.GetReplacement());
+    }
+
+    [TestMethod]
+    public void GetMenuItemHeaderFromFilenameTest2()
+    {
+        string output = FileNameFormatter.GetMenuItemHeaderFromFilename("C:\\test.txt", 9);
+        Assert.AreEqual(output, "1_0: C:\\test.txt", false);
     }
 }

src/FolkerKinzel.RecentFiles.WPF.Tests/RecentFilesMenuTests.cs

@@ -75,7 +75,12 @@ public void MenuLoadedTest1()
     [WpfTestMethod()]
     public void MenuLoadedTest2()
     {
-        File.WriteAllText(_fileName, "C:\\test.txt");
+        File.WriteAllText(_fileName,
+            """
+            C:\\test1.txt
+
+            C:\\test2.txt
+            """);
         using var menu = new RecentFilesMenu(Environment.CurrentDirectory);
 
         var menuItem = new System.Windows.Controls.MenuItem();
@@ -142,6 +147,7 @@ public void MenuLoadedTest4()
             C:\\test6.txt
             C:\\test7.txt
             C:\\test8.txt
+            C:\\test9.txt
             """);
         using var menu = new RecentFilesMenu(Environment.CurrentDirectory);
 

src/FolkerKinzel.RecentFiles.WPF/FolkerKinzel.RecentFiles.WPF.csproj

@@ -12,10 +12,10 @@
     <!-- nuget-Package: -->
     <PackageId>FolkerKinzel.RecentFiles.WPF</PackageId>
     <Product>FolkerKinzel.RecentFiles.WPF</Product>
-    <Version>1.5.0</Version>
-    <FileVersion>1.5.0.11</FileVersion>
+    <Version>1.5.1</Version>
+    <FileVersion>1.5.1.4</FileVersion>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <PackageReleaseNotes>https://github.com/FolkerKinzel/RecentFiles.WPF/releases/tag/v1.5.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/FolkerKinzel/RecentFiles.WPF/releases/tag/v1.5.1</PackageReleaseNotes>
     <PackageTags>recent menu WPF</PackageTags>
     <Description>Recent files menu for WPF applications.</Description>
     <Authors>Folker Kinzel</Authors>

src/FolkerKinzel.RecentFiles.WPF/Intls/FileNameFormatter.cs

@@ -5,6 +5,7 @@ namespace FolkerKinzel.RecentFiles.WPF.Intls;
 internal static class FileNameFormatter
 {
     private const int MAX_DISPLAYED_FILE_PATH_LENGTH = 88;
+    private const string REPLACEMENT = " \u2026 ";
 
     internal static string GetMenuItemHeaderFromFilename(string fileName, int i)
     {
@@ -16,11 +17,11 @@ internal static string GetMenuItemHeaderFromFilename(string fileName, int i)
             fileName =
 #if NET462
                         fileName.Substring(0, QUARTER_DISPLAYED_FILE_PATH_LENGTH - 3) +
-                        "..." +
+                        REPLACEMENT +
                         fileName.Substring(fileName.Length - THREE_QUARTER_DISPLAYED_FILE_PATH_LENGTH);
 #else
                     string.Concat(fileName.AsSpan(0, QUARTER_DISPLAYED_FILE_PATH_LENGTH - 3),
-                              " \u2026 ",
+                              REPLACEMENT,
                               fileName.AsSpan(fileName.Length - THREE_QUARTER_DISPLAYED_FILE_PATH_LENGTH));
 #endif
         }
@@ -36,4 +37,11 @@ internal static string GetMenuItemHeaderFromFilename(string fileName, int i)
 
         return fileName;
     }
+
+
+    /// <summary>
+    /// Helper method to support unit tests.
+    /// </summary>
+    /// <returns>The value of <see cref="REPLACEMENT"/>.</returns>
+    internal static string GetReplacement() => REPLACEMENT;
 }

src/FolkerKinzel.RecentFiles.WPF/RecentFilesMenu.cs

@@ -244,6 +244,8 @@ private void HandleLoaded()
 
                     if (string.IsNullOrWhiteSpace(currentFile))
                     {
+                        recentFiles.RemoveAt(i);
+                        --i;
                         continue;
                     }
 

src/FolkerKinzel.RecentFiles.WPF/md/NugetReadme.md

@@ -9,6 +9,6 @@
 * Synchronizes access between multiple threads and multiple instances of the same program.
 * Implements an interface to support Dependency Inversion and unit tests (mockable).
 
-[Project Reference and Release Notes](https://github.com/FolkerKinzel/RecentFiles.WPF/releases/tag/v1.5.0)
+[Project Reference and Release Notes](https://github.com/FolkerKinzel/RecentFiles.WPF/releases/tag/v1.5.1)
 
 [See code examples on GitHub](https://github.com/FolkerKinzel/RecentFiles.WPF)

src/WpfExample/MainWindow.xaml.cs

@@ -16,14 +16,12 @@ public sealed partial class MainWindow : Window, INotifyPropertyChanged
     private readonly IRecentFilesMenu _recentFilesMenu;
     private string? _currentFile;
 
-
     public MainWindow(IRecentFilesMenu recentFilesMenu)
     {
         this._recentFilesMenu = recentFilesMenu;
         InitializeComponent();
     }
 
-
     public string? CurrentFile
     {
         get => _currentFile;
@@ -42,7 +40,6 @@ private set
         }
     }
 
-
     private void Window_Loaded(object? sender, RoutedEventArgs e)
     {
         // Assign the RecentFilesMenu the MenuItem next to which the 
@@ -54,7 +51,6 @@ private void Window_Loaded(object? sender, RoutedEventArgs e)
         _recentFilesMenu.RecentFileSelected += RecentFilesMenu_RecentFileSelected;
     }
 
-
     private async void Window_Closed(object? sender, EventArgs e)
     {
         // Wait all tasks to be finished before disposing the
@@ -63,15 +59,12 @@ private async void Window_Closed(object? sender, EventArgs e)
         _recentFilesMenu.Dispose();
     }
 
-
     private void Quit_Click(object? sender, RoutedEventArgs e) => Close();
 
-
     private void RecentFilesMenu_RecentFileSelected(
         object? sender,
         RecentFileSelectedEventArgs e) => OpenFile(e.FileName);
 
-
     private void OpenDirectory_Executed(object? sender, ExecutedRoutedEventArgs e)
     {
         using var dialog = new System.Windows.Forms.FolderBrowserDialog();
@@ -91,7 +84,6 @@ private void OpenFile_Executed(object? sender, ExecutedRoutedEventArgs e)
         }
     }
 
-
     private void OpenFile(string fileName)
     {
         try
@@ -108,7 +100,6 @@ private void OpenFile(string fileName)
         CurrentFile = fileName;
     }
 
-
     private void OnPropertyChanged([CallerMemberName] string propName = "")
         => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propName));
 }