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

Optimize code

Browse source
This commit is contained in:
弘韬 张 2021-02-02 12:38:41 +08:00
parent 2bdf69b431
commit f9b7294b93
1 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -229,52 +229,35 @@ namespace Flow.Launcher.Infrastructure
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,
};
}
if (IsAcronymNumber(stringToCompare, compareStringIndex))
return compareStringIndex == 0 || char.IsWhiteSpace(stringToCompare[compareStringIndex - 1]);
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;
=> char.IsUpper(stringToCompare[compareStringIndex]) ||
compareStringIndex == 0 || // 0 index means char is the start of the compare string, which is an acronym
char.IsWhiteSpace(stringToCompare[compareStringIndex - 1]);
return false;
}
private bool IsAcronymNumber(string stringToCompare, int compareStringIndex)
{
if (char.IsNumber(stringToCompare[compareStringIndex]) ||
char.IsDigit(stringToCompare[compareStringIndex]))
return true;
return false;
}
private bool IsAcronymNumber(string stringToCompare, int compareStringIndex) => stringToCompare[compareStringIndex] >= 0 && stringToCompare[compareStringIndex] <= 9;
// To get the index of the closest space which preceeds the first matching index
private int CalculateClosestSpaceIndex(List<int> spaceIndices, int firstMatchIndex)
{
if (spaceIndices.Count == 0)
var closestSpaceIndex = -1;
// spaceIndices should be ordered asc
foreach (var index in spaceIndices)
{
return -1;
}
else
{
int? ind = spaceIndices.OrderBy(item => (firstMatchIndex - item))
.FirstOrDefault(item => firstMatchIndex > item);
int closestSpaceIndex = ind ?? -1;
return closestSpaceIndex;
if (index < firstMatchIndex)
closestSpaceIndex = index;
else
break;
}
return closestSpaceIndex;
}
private static bool AllPreviousCharsMatched(int startIndexToVerify, int currentQuerySubstringCharacterIndex,