simplify grouping

Author: SimonCropp

docs/mdsource/tray.source.md

@@ -23,6 +23,11 @@ Run `diffenginetray` in a console to start the app.
 <img src="..\src\DiffEngineTray.Tests\MenuBuilderTest.Full.verified.png">
 
 
+### Grouping
+
+Moves and deletes will be grouped by the containing solution. In the above, the files exist in DiffEngine, so the they are grouped under it.
+
+
 ### Moves
 
 "Pending Moves" will accept the changes to file3 and file4.

docs/tray.md

@@ -30,6 +30,11 @@ Run `diffenginetray` in a console to start the app.
 <img src="..\src\DiffEngineTray.Tests\MenuBuilderTest.Full.verified.png">
 
 
+### Grouping
+
+Moves and deletes will be grouped by the containing solution. In the above, the files exist in DiffEngine, so the they are grouped under it.
+
+
 ### Moves
 
 "Pending Moves" will accept the changes to file3 and file4.

src/DiffEngineTray.Tests/MenuBuilderTest.Full.verified.png

@@ -47,14 +47,24 @@ public async Task Full()
         await Verifier.Verify(menu, settings);
     }
 
+    [Fact]
+    public async Task Grouped()
+    {
+        await using var tracker = new RecordingTracker();
+        tracker.AddDelete("file2.txt");
+        tracker.AddMove(file4, "file4.txt", "theExe", "theArguments", true, null);
+        var menu = MenuBuilder.Build(() => { }, () => { }, tracker);
+        await Verifier.Verify(menu, settings);
+    }
+
     [Fact]
     public async Task FullGrouped()
     {
         await using var tracker = new RecordingTracker();
         tracker.AddDelete(file1);
-        tracker.AddDelete("bar.txt");
+        tracker.AddDelete("file2.txt");
         tracker.AddMove(file3, file3, "theExe", "theArguments", true, null);
-        tracker.AddMove(file4, "foo.txt", "theExe", "theArguments", true, null);
+        tracker.AddMove(file4, "file4.txt", "theExe", "theArguments", true, null);
         var menu = MenuBuilder.Build(() => { }, () => { }, tracker);
         await Verifier.Verify(menu, settings);
     }

src/DiffEngineTray.Tests/MenuBuilderTest.FullGrouped.verified.png

@@ -82,27 +82,17 @@ static IEnumerable<ToolStripItem> BuildTrackingMenuItems(Tracker tracker)
             .Distinct()
             .ToList();
 
-        if (groups.Count == 1)
+        foreach (var group in groups)
         {
-            foreach (var toolStripItem in BuildMovesAndDeletes(null, tracker, deletes, moves))
+            foreach (var toolStripItem in BuildMovesAndDeletes(
+                group,
+                tracker,
+                deletes.Where(x => x.Group == group).ToList(),
+                moves.Where(x => x.Group == group).ToList()))
             {
                 yield return toolStripItem;
             }
         }
-        else
-        {
-            foreach (var group in groups)
-            {
-                foreach (var toolStripItem in BuildMovesAndDeletes(
-                    group,
-                    tracker,
-                    deletes.Where(x => x.Group == group).ToList(),
-                    moves.Where(x => x.Group == group).ToList()))
-                {
-                    yield return toolStripItem;
-                }
-            }
-        }
 
         yield return new MenuButton($"Clear ({count})", tracker.Clear, Images.Clear);
         yield return new MenuButton($"Accept all ({count})", tracker.AcceptAll, Images.AcceptAll);

src/DiffEngineTray.Tests/MenuBuilderTest.Grouped.verified.png

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649</NoWarn>
-    <Version>6.1.0</Version>
+    <Version>6.1.1</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>Testing, Snapshot, Diff, Compare</PackageTags>
     <Description>Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.</Description>