Fix: Fixed ArgumentOutOfRangeException in ItemViewModel (#14634)

Author: hishitetsu

src/Files.App/Data/Models/ItemViewModel.cs

@@ -692,67 +692,21 @@ void ClearDisplay()
 				var isSemaphoreReleased = false;
 				try
 				{
-					FilesAndFolders.BeginBulkOperation();
-
-					// After calling BeginBulkOperation, ObservableCollection.CollectionChanged is suppressed
-					// so modifies to FilesAndFolders won't trigger UI updates, hence below operations can be
-					// run safely without needs of dispatching to UI thread
-					void ApplyChanges()
+					await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 					{
-						var startIndex = -1;
-						var tempList = new List<ListedItem>();
-
-						void ApplyBulkInsertEntries()
+						try
 						{
-							if (startIndex != -1)
-							{
-								FilesAndFolders.ReplaceRange(startIndex, tempList);
-								startIndex = -1;
-								tempList.Clear();
-							}
-						}
+							FilesAndFolders.BeginBulkOperation();
 
-						for (var i = 0; i < filesAndFoldersLocal.Count; i++)
-						{
 							if (addFilesCTS.IsCancellationRequested)
 								return;
 
-							if (i < FilesAndFolders.Count)
-							{
-								if (FilesAndFolders[i] != filesAndFoldersLocal[i])
-								{
-									if (startIndex == -1)
-										startIndex = i;
+							FilesAndFolders.Clear();
+							FilesAndFolders.AddRange(filesAndFoldersLocal);
 
-									tempList.Add(filesAndFoldersLocal[i]);
-								}
-								else
-								{
-									ApplyBulkInsertEntries();
-								}
-							}
-							else
-							{
-								ApplyBulkInsertEntries();
-								FilesAndFolders.InsertRange(i, filesAndFoldersLocal.Skip(i));
+							if (folderSettings.DirectoryGroupOption != GroupOption.None)
+								OrderGroups();
 
-								break;
-							}
-						}
-
-						ApplyBulkInsertEntries();
-
-						if (FilesAndFolders.Count > filesAndFoldersLocal.Count)
-							FilesAndFolders.RemoveRange(filesAndFoldersLocal.Count, FilesAndFolders.Count - filesAndFoldersLocal.Count);
-
-						if (folderSettings.DirectoryGroupOption != GroupOption.None)
-							OrderGroups();
-					}
-
-					void UpdateUI()
-					{
-						try
-						{
 							// Trigger CollectionChanged with NotifyCollectionChangedAction.Reset
 							// once loading is completed so that UI can be updated
 							FilesAndFolders.EndBulkOperation();
@@ -764,21 +718,10 @@ void UpdateUI()
 							isSemaphoreReleased = true;
 							bulkOperationSemaphore.Release();
 						}
-					}
-
-					if (NativeWinApiHelper.IsHasThreadAccessPropertyPresent && dispatcherQueue.HasThreadAccess)
-					{
-						await Task.Run(ApplyChanges);
-						UpdateUI();
-					}
-					else
-					{
-						ApplyChanges();
-						await dispatcherQueue.EnqueueOrInvokeAsync(UpdateUI);
+					});
 
-						// The semaphore will be released in UI thread
-						isSemaphoreReleased = true;
-					}
+					// The semaphore will be released in UI thread
+					isSemaphoreReleased = true;
 				}
 				finally
 				{
@@ -806,10 +749,6 @@ private Task RequestSelectionAsync(List<ListedItem> itemsToSelect)
 
 		private Task OrderFilesAndFoldersAsync()
 		{
-			// Sorting group contents is handled elsewhere
-			if (folderSettings.DirectoryGroupOption != GroupOption.None)
-				return Task.CompletedTask;
-
 			void OrderEntries()
 			{
 				if (filesAndFolders.Count == 0)
@@ -886,32 +825,25 @@ public async Task GroupOptionsUpdatedAsync(CancellationToken token)
 				var isSemaphoreReleased = false;
 				try
 				{
-					FilesAndFolders.BeginBulkOperation();
-					UpdateGroupOptions();
-
-					if (FilesAndFolders.IsGrouped)
+					await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 					{
-						await Task.Run(() =>
+						try
 						{
-							FilesAndFolders.ResetGroups(token);
-							if (token.IsCancellationRequested)
-								return;
+							FilesAndFolders.BeginBulkOperation();
+							UpdateGroupOptions();
 
-							OrderGroups();
-						});
-					}
-					else
-					{
-						await OrderFilesAndFoldersAsync();
-					}
+							if (FilesAndFolders.IsGrouped)
+							{
+								FilesAndFolders.ResetGroups(token);
+								if (token.IsCancellationRequested)
+									return;
 
-					if (token.IsCancellationRequested)
-						return;
+								OrderGroups();
+							}
+
+							if (token.IsCancellationRequested)
+								return;
 
-					await dispatcherQueue.EnqueueOrInvokeAsync(() =>
-					{
-						try
-						{
 							FilesAndFolders.EndBulkOperation();
 						}
 						finally
@@ -1043,7 +975,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 						// Add the file icon to the DefaultIcons list
 						if
 						(
-							!DefaultIcons.ContainsKey(item.FileExtension.ToLowerInvariant()) && 
+							!DefaultIcons.ContainsKey(item.FileExtension.ToLowerInvariant()) &&
 							!string.IsNullOrEmpty(item.FileExtension) &&
 							!item.IsShortcut &&
 							!item.IsExecutable