Skip to content

Fix UpdateCommandPaletteSuggestions #18496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KrisVandermotten wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −32
Open

Fix UpdateCommandPaletteSuggestions #18496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 10 additions & 32 deletions src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using Files.App.Controls;
using Files.App.ViewModels.Settings;
using Files.Shared.Helpers;
using Microsoft.Extensions.Logging;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
Expand Down Expand Up @@ -1030,12 +1029,12 @@ public async Task PopulateOmnibarSuggestionsForPathMode()
void AddNoResultsItem()
{
PathModeSuggestionItems.Clear();

// Use null-safe access to avoid NullReferenceException during app lifecycle transitions
var workingDirectory = string.IsNullOrEmpty(ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory)
? Constants.UserEnvironmentPaths.HomePath
: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;

PathModeSuggestionItems.Add(new(
workingDirectory,
Strings.NavigationToolbarVisiblePathNoResults.GetLocalizedResource()));
Expand All @@ -1062,7 +1061,7 @@ public async Task PopulateOmnibarSuggestionsForCommandPaletteMode()
int processedCount = 0;

foreach (var command in commandsToProcess)
{
{
if (!command.IsExecutable)
{
processedCount++;
Expand Down Expand Up @@ -1104,37 +1103,16 @@ private void UpdateCommandPaletteSuggestions(List<NavigationBarSuggestionItem> n
});
}

if (!OmnibarCommandPaletteModeSuggestionItems.IntersectBy(newSuggestions, x => x.PrimaryDisplay).Any())
for (int index = 0; index < newSuggestions.Count; index++)
{
for (int index = 0; index < newSuggestions.Count; index++)
{
if (index < OmnibarCommandPaletteModeSuggestionItems.Count)
OmnibarCommandPaletteModeSuggestionItems[index] = newSuggestions[index];
else
OmnibarCommandPaletteModeSuggestionItems.Add(newSuggestions[index]);
}

while (OmnibarCommandPaletteModeSuggestionItems.Count > newSuggestions.Count)
OmnibarCommandPaletteModeSuggestionItems.RemoveAt(OmnibarCommandPaletteModeSuggestionItems.Count - 1);
if (index < OmnibarCommandPaletteModeSuggestionItems.Count)
OmnibarCommandPaletteModeSuggestionItems[index] = newSuggestions[index];
else
OmnibarCommandPaletteModeSuggestionItems.Add(newSuggestions[index]);
}
else
{
foreach (var s in OmnibarCommandPaletteModeSuggestionItems.ExceptBy(newSuggestions, x => x.PrimaryDisplay).ToList())
OmnibarCommandPaletteModeSuggestionItems.Remove(s);

for (int index = 0; index < newSuggestions.Count; index++)
{
if (OmnibarCommandPaletteModeSuggestionItems.Count > index
&& OmnibarCommandPaletteModeSuggestionItems[index].PrimaryDisplay == newSuggestions[index].PrimaryDisplay)
{
OmnibarCommandPaletteModeSuggestionItems[index] = newSuggestions[index];
}
else
{
OmnibarCommandPaletteModeSuggestionItems.Insert(index, newSuggestions[index]);
}
}
}
while (OmnibarCommandPaletteModeSuggestionItems.Count > newSuggestions.Count)
OmnibarCommandPaletteModeSuggestionItems.RemoveAt(OmnibarCommandPaletteModeSuggestionItems.Count - 1);
}

public async Task PopulateOmnibarSuggestionsForSearchMode()
Expand Down
Loading