prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

separate acronym count and check

Browse source
This commit is contained in:
Jeremy Wu 2021-02-02 07:41:36 +11:00
parent d9a4836118
commit 2bdf69b431
2 changed files with 47 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Flow.Launcher.Infrastructure/StringMatcher.cs
View file

@ -72,7 +72,7 @@ namespace Flow.Launcher.Infrastructure
var fullStringToCompareWithoutCase = opt.IgnoreCase ? stringToCompare.ToLower() : stringToCompare; var fullStringToCompareWithoutCase = opt.IgnoreCase ? stringToCompare.ToLower() : stringToCompare;
var queryWithoutCase = opt.IgnoreCase ? query.ToLower() : query; var queryWithoutCase = opt.IgnoreCase ? query.ToLower() : query;
var querySubstrings = queryWithoutCase.Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries); var querySubstrings = queryWithoutCase.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
int currentQuerySubstringIndex = 0; int currentQuerySubstringIndex = 0;
var currentQuerySubstring = querySubstrings[currentQuerySubstringIndex]; var currentQuerySubstring = querySubstrings[currentQuerySubstringIndex];
var currentQuerySubstringCharacterIndex = 0; var currentQuerySubstringCharacterIndex = 0;
@ -92,7 +92,7 @@ namespace Flow.Launcher.Infrastructure
// If acronyms matching successfully finished, this gets the remaining not matched acronyms for score calculation // If acronyms matching successfully finished, this gets the remaining not matched acronyms for score calculation
if (currentAcronymQueryIndex >= query.Length && acronymsMatched == query.Length) if (currentAcronymQueryIndex >= query.Length && acronymsMatched == query.Length)
{ {
if (IsAcronym(stringToCompare, compareStringIndex)) if (IsAcronymCount(stringToCompare, compareStringIndex))
acronymsTotalCount++; acronymsTotalCount++;
continue; continue;
} }
@ -117,9 +117,11 @@ namespace Flow.Launcher.Infrastructure
currentAcronymQueryIndex++; currentAcronymQueryIndex++;
} }
acronymsTotalCount++;
} }
if (IsAcronymCount(stringToCompare, compareStringIndex))
acronymsTotalCount++;
// Acronym end // Acronym end
if (allQuerySubstringsMatched || fullStringToCompareWithoutCase[compareStringIndex] != if (allQuerySubstringsMatched || fullStringToCompareWithoutCase[compareStringIndex] !=
@ -215,13 +217,45 @@ namespace Flow.Launcher.Infrastructure
private bool IsAcronym(string stringToCompare, int compareStringIndex) private bool IsAcronym(string stringToCompare, int compareStringIndex)
{ {
if (char.IsUpper(stringToCompare[compareStringIndex]) || if (IsAcronymChar(stringToCompare, compareStringIndex) || IsAcronymNumber(stringToCompare, compareStringIndex))
char.IsNumber(stringToCompare[compareStringIndex]) ||
char.IsDigit(stringToCompare[compareStringIndex]) ||
compareStringIndex == 0) //0 index means char is the start of the compare string, which is an acronym
return true; return true;
if (compareStringIndex != 0 && char.IsWhiteSpace(stringToCompare[compareStringIndex - 1])) return false;
}
// When counting acronyms, treat a set of numbers as one acronym ie. Visual 2019 as 2 acronyms instead of 5
private bool IsAcronymCount(string stringToCompare, int compareStringIndex)
{
if (IsAcronymChar(stringToCompare, compareStringIndex))
return true;
if (char.IsNumber(stringToCompare[compareStringIndex]) || char.IsDigit(stringToCompare[compareStringIndex]))
{
return compareStringIndex switch
{
int i when i == 0 => true,
int i when char.IsWhiteSpace(stringToCompare[i - 1]) => true,
_ => false,
};
}
return false;
}
private bool IsAcronymChar(string stringToCompare, int compareStringIndex)
{
if (char.IsUpper(stringToCompare[compareStringIndex]) ||
compareStringIndex == 0 || //0 index means char is the start of the compare string, which is an acronym
compareStringIndex != 0 && char.IsWhiteSpace(stringToCompare[compareStringIndex - 1]))
return true;
return false;
}
private bool IsAcronymNumber(string stringToCompare, int compareStringIndex)
{
if (char.IsNumber(stringToCompare[compareStringIndex]) ||
char.IsDigit(stringToCompare[compareStringIndex]))
return true; return true;
return false; return false;

4
Flow.Launcher.Test/FuzzyMatcherTest.cs
View file

@ -163,7 +163,11 @@ namespace Flow.Launcher.Test
[TestCase("vs", VisualStudioCode, SearchPrecisionScore.Regular, true)] [TestCase("vs", VisualStudioCode, SearchPrecisionScore.Regular, true)]
[TestCase("vc", VisualStudioCode, SearchPrecisionScore.Regular, true)] [TestCase("vc", VisualStudioCode, SearchPrecisionScore.Regular, true)]
[TestCase("vts", VisualStudioCode, SearchPrecisionScore.Regular, false)] [TestCase("vts", VisualStudioCode, SearchPrecisionScore.Regular, false)]
[TestCase("vcs", VisualStudioCode, SearchPrecisionScore.Regular, false)]
[TestCase("wt", "Windows Terminal From Microsoft Store", SearchPrecisionScore.Regular, false)] [TestCase("wt", "Windows Terminal From Microsoft Store", SearchPrecisionScore.Regular, false)]
[TestCase("vsp", "Visual Studio 2019 Preview", SearchPrecisionScore.Regular, true)]
[TestCase("vsp", "2019 Visual Studio Preview", SearchPrecisionScore.Regular, true)]
[TestCase("2019p", "Visual Studio 2019 Preview", SearchPrecisionScore.Regular, true)]
public void WhenGivenDesiredPrecision_ThenShouldReturn_AllResultsGreaterOrEqual( public void WhenGivenDesiredPrecision_ThenShouldReturn_AllResultsGreaterOrEqual(
string queryString, string queryString,
string compareString, string compareString,