Use UI thread for populating suggestions

Author: 0x5bfa

src/Files.App/UserControls/NavigationToolbar.xaml.cs

@@ -350,18 +350,15 @@ private async void Omnibar_TextChanged(Omnibar sender, OmnibarTextChangedEventAr
 
 			if (Omnibar.CurrentSelectedMode == OmnibarPathMode)
 			{
-				await ViewModel.PopulateOmnibarSuggestionsForPathMode();
+				await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForPathMode);
 			}
 			else if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)
 			{
-				await DispatcherQueue.EnqueueOrInvokeAsync(() =>
-				{
-					ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode();
-				});
+				await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode);
 			}
 			else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
 			{
-				await ViewModel.PopulateOmnibarSuggestionsForSearchMode();
+				await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForSearchMode);
 			}
 		}
 
@@ -464,19 +461,13 @@ private async void Omnibar_ModeChanged(object sender, OmnibarModeChangedEventArg
 					? Constants.UserEnvironmentPaths.HomePath
 					: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
 
-				await DispatcherQueue.EnqueueOrInvokeAsync(async () =>
-				{
-					await ViewModel.PopulateOmnibarSuggestionsForPathMode();
-				});
+				await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForPathMode);
 			}
 			else if (e.NewMode == OmnibarCommandPaletteMode)
 			{
 				ViewModel.OmnibarCommandPaletteModeText = string.Empty;
 
-				await DispatcherQueue.EnqueueOrInvokeAsync(() =>
-				{
-					ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode();
-				});
+				await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode);
 			}
 			else if (e.NewMode == OmnibarSearchMode)
 			{
@@ -485,7 +476,7 @@ await DispatcherQueue.EnqueueOrInvokeAsync(() =>
 				else
 					ViewModel.OmnibarSearchModeText = ViewModel.InstanceViewModel.CurrentSearchQuery;
 
-				await ViewModel.PopulateOmnibarSuggestionsForSearchMode();
+				await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForSearchMode);
 			}
 		}
 
@@ -499,23 +490,17 @@ private async void Omnibar_IsFocusedChanged(Omnibar sender, OmnibarIsFocusedChan
 						? Constants.UserEnvironmentPaths.HomePath
 						: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
 
-					await DispatcherQueue.EnqueueOrInvokeAsync(async () =>
-					{
-						await ViewModel.PopulateOmnibarSuggestionsForPathMode();
-					});
+					await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForPathMode);
 				}
 				else if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)
 				{
 					ViewModel.OmnibarCommandPaletteModeText = string.Empty;
 
-					await DispatcherQueue.EnqueueOrInvokeAsync(() =>
-					{
-						ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode();
-					});
+					await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode);
 				}
 				else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
 				{
-					await ViewModel.PopulateOmnibarSuggestionsForSearchMode();
+					await DispatcherQueue.EnqueueOrInvokeAsync(ViewModel.PopulateOmnibarSuggestionsForSearchMode);
 				}
 			}
 		}

src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs

@@ -1171,7 +1171,7 @@ void AddNoResultsItem()
 			}
 		}
 
-		public void PopulateOmnibarSuggestionsForCommandPaletteMode()
+		public async Task PopulateOmnibarSuggestionsForCommandPaletteMode()
 		{
 			var newSuggestions = new List<NavigationBarSuggestionItem>();
 
@@ -1212,22 +1212,27 @@ public void PopulateOmnibarSuggestionsForCommandPaletteMode()
 				}
 			}
 
-			var suggestionItems = Commands
-				.Where(command => command.IsExecutable
-					&& command.IsAccessibleGlobally
-					&& (command.Description.Contains(OmnibarCommandPaletteModeText, StringComparison.OrdinalIgnoreCase)
-						|| command.Code.ToString().Contains(OmnibarCommandPaletteModeText, StringComparison.OrdinalIgnoreCase)))
-				.Select(command => new NavigationBarSuggestionItem
-				{
-					ThemedIconStyle = command.Glyph.ToThemedIconStyle(),
-					Glyph = command.Glyph.BaseGlyph,
-					Text = command.Description,
-					PrimaryDisplay = command.Description,
-					HotKeys = command.HotKeys,
-					SearchText = OmnibarCommandPaletteModeText,
-				})
-				.Where(item => item.Text != Commands.OpenCommandPalette.Description.ToString()
-					&& item.Text != Commands.EditPath.Description.ToString());
+			IEnumerable<NavigationBarSuggestionItem> suggestionItems = null!;
+
+			await Task.Run(() =>
+			{
+				suggestionItems = Commands
+					.Where(command => command.IsExecutable
+						&& command.IsAccessibleGlobally
+						&& (command.Description.Contains(OmnibarCommandPaletteModeText, StringComparison.OrdinalIgnoreCase)
+							|| command.Code.ToString().Contains(OmnibarCommandPaletteModeText, StringComparison.OrdinalIgnoreCase)))
+					.Select(command => new NavigationBarSuggestionItem
+					{
+						ThemedIconStyle = command.Glyph.ToThemedIconStyle(),
+						Glyph = command.Glyph.BaseGlyph,
+						Text = command.Description,
+						PrimaryDisplay = command.Description,
+						HotKeys = command.HotKeys,
+						SearchText = OmnibarCommandPaletteModeText,
+					})
+					.Where(item => item.Text != Commands.OpenCommandPalette.Description.ToString()
+						&& item.Text != Commands.EditPath.Description.ToString());
+			});
 
 			newSuggestions.AddRange(suggestionItems);