Merge remote-tracking branch 'origin/main' into dev/migrie/f/dec-self…

…host

src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs

@@ -79,8 +79,8 @@ private static ServiceProvider ConfigureServices()
         services.AddSingleton<ICommandProvider, AllAppsCommandProvider>();
         services.AddSingleton<ICommandProvider, ShellCommandsProvider>();
         services.AddSingleton<ICommandProvider, CalculatorCommandProvider>();
-        services.AddSingleton<ICommandProvider, BookmarksCommandProvider>();
         services.AddSingleton<ICommandProvider, IndexerActionsProvider>();
+        services.AddSingleton<ICommandProvider, BookmarksCommandProvider>();
         services.AddSingleton<ICommandProvider, SettingsCommandProvider>();
         services.AddSingleton<ICommandProvider, QuitCommandProvider>();
         services.AddSingleton<ICommandProvider, ReloadExtensionsCommandProvider>();

src/modules/cmdpal/extensionsdk/Microsoft.CmdPal.Extensions.Helpers/ListHelpers.cs

@@ -57,8 +57,11 @@ public static IEnumerable<IListItem> FilterList(IEnumerable<IListItem> items, st
     public static void InPlaceUpdateList<T>(Collection<T> original, IEnumerable<T> newContents)
         where T : class
     {
+        // we're not changing newContents - stash this so we don't re-evaluate it every time
+        var numberOfNew = newContents.Count();
+
         // Short circuit - new contents should just be empty
-        if (!newContents.Any())
+        if (numberOfNew == 0)
         {
             original.Clear();
             return;
@@ -106,14 +109,14 @@ public static void InPlaceUpdateList<T>(Collection<T> original, IEnumerable<T> n
         }
 
         // Remove any extra trailing items from the destination
-        while (original.Count > newContents.Count())
+        while (original.Count > numberOfNew)
         {
             // RemoveAtEnd
             original.RemoveAt(original.Count - 1);
         }
 
         // Add any extra trailing items from the source
-        if (original.Count < newContents.Count())
+        if (original.Count < numberOfNew)
         {
             var remaining = newContents.Skip(original.Count);
             foreach (var item in remaining)