Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 20:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hide commands with whitespace only names better (#38159)

Browse Source 
This is a much tidier solution. Don't default _everything_ to a weight of 1 if the query is whitespace. Instead, do a simple string contains check (because FuzzySearch will beef it on just whitespace)

Closes #38133

I originally based this off of #38157, so I know these two won't collide
This commit is contained in:
Mike Griese
2025-03-26 06:36:32 -05:00
committed by GitHub
parent 2623eb10f3
commit d597bd267d
1 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs
View File

@@ -149,17 +149,14 @@ public partial class MainListPage : DynamicListPage,
// _always_ show up first. // _always_ show up first.
private int ScoreTopLevelItem(string query, IListItem topLevelOrAppItem) private int ScoreTopLevelItem(string query, IListItem topLevelOrAppItem)
{ {
if (string.IsNullOrWhiteSpace(query))
{
return 1;
}
var title = topLevelOrAppItem.Title; var title = topLevelOrAppItem.Title;
if (string.IsNullOrEmpty(title)) if (string.IsNullOrWhiteSpace(title))
{ {
return 0; return 0;
} }
var isWhiteSpace = string.IsNullOrWhiteSpace(query);
var isFallback = false; var isFallback = false;
var isAliasSubstringMatch = false; var isAliasSubstringMatch = false;
var isAliasMatch = false; var isAliasMatch = false;
@@ -179,17 +176,45 @@ public partial class MainListPage : DynamicListPage,
extensionDisplayName = topLevel.ExtensionHost?.Extension?.PackageDisplayName ?? string.Empty; extensionDisplayName = topLevel.ExtensionHost?.Extension?.PackageDisplayName ?? string.Empty;
} }
var nameMatch = StringMatcher.FuzzySearch(query, title); // StringMatcher.FuzzySearch will absolutely BEEF IT if you give it a
var descriptionMatch = StringMatcher.FuzzySearch(query, topLevelOrAppItem.Subtitle); // whitespace-only query.
var extensionTitleMatch = StringMatcher.FuzzySearch(query, extensionDisplayName); //
// in that scenario, we'll just use a simple string contains for the
// query. Maybe someone is really looking for things with a space in
// them, I don't know.
// Title:
// * whitespace query: 1 point
// * otherwise full weight match
var nameMatch = isWhiteSpace ?
(title.Contains(query) ? 1 : 0) :
StringMatcher.FuzzySearch(query, title).Score;
// Subtitle:
// * whitespace query: 1/2 point
// * otherwise ~half weight match. Minus a bit, because subtitles tend to be longer
var descriptionMatch = isWhiteSpace ?
(topLevelOrAppItem.Subtitle.Contains(query) ? .5 : 0) :
(StringMatcher.FuzzySearch(query, topLevelOrAppItem.Subtitle).Score - 4) / 2.0;
// Extension title: despite not being visible, give the extension name itself some weight
// * whitespace query: 0 points
// * otherwise more weight than a subtitle, but not much
var extensionTitleMatch = isWhiteSpace ? 0 : StringMatcher.FuzzySearch(query, extensionDisplayName).Score / 1.5;
var scores = new[] var scores = new[]
{ {
nameMatch.Score, nameMatch,
(descriptionMatch.Score - 4) / 2.0, descriptionMatch,
isFallback ? 1 : 0, // Always give fallbacks a chance... isFallback ? 1 : 0, // Always give fallbacks a chance...
}; };
var max = scores.Max(); var max = scores.Max();
max = max + (extensionTitleMatch.Score / 1.5);
// _Add_ the extension name. This will bubble items that match both
// title and extension name up above ones that just match title.
// e.g. "git" will up-weight "GitHub searches" from the GitHub extension
// above "git" from "whatever"
max = max + extensionTitleMatch;
// ... but downweight them // ... but downweight them
var matchSomething = (max / (isFallback ? 3 : 1)) var matchSomething = (max / (isFallback ? 3 : 1))