Skip to content
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

Modifying a bit weighting of completion list SmartMatch #1173

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Modifying a bit weighting of completion list SmartMatch #1173

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
34 changes: 18 additions & 16 deletions PluginCore/PluginCore/Controls/CompletionList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,11 +479,12 @@ static public void FindWordStartingWith(String word)
ICompletionListItem item;
exactMatchInList = false;
smartMatchInList = false;
bool allUpper = word == word.ToUpperInvariant();
while (i < n)
{
item = allItems[i];
// compare item's label with the searched word
score = SmartMatch(item.Label, word, len);
score = SmartMatch(item.Label, word, len, allUpper);
if (score > 0)
{
// first match found
Expand Down Expand Up @@ -635,13 +636,14 @@ private static int TestDefaultItem(Int32 index, String word, Int32 len)
{
if (defaultItem != null && completionList.Items.Contains(defaultItem))
{
Int32 score = (len == 0) ? 1 : SmartMatch(defaultItem.Label, word, len);
bool allUpper = word == word.ToUpperInvariant();
int score = (len == 0) ? 1 : SmartMatch(defaultItem.Label, word, len, allUpper);
if (score > 0 && score < 6) return completionList.Items.IndexOf(defaultItem);
}
return index;
}

static public int SmartMatch(string label, string word, int len)
static public int SmartMatch(string label, string word, int len, bool allUpper)
{
if (label.Length < len) return 0;

Expand All @@ -657,13 +659,13 @@ static public int SmartMatch(string label, string word, int len)
}

// try abbreviation
bool firstUpper = Char.IsUpper(word[0]);
if (firstUpper)
if (allUpper)
{
int abbr = IsAbbreviation(label, word);
if (abbr > 0) return abbr;
}


bool firstUpper = Char.IsUpper(word[0]);
int p = label.IndexOf(word, StringComparison.OrdinalIgnoreCase);
if (p >= 0)
{
Expand All @@ -678,7 +680,7 @@ static public int SmartMatch(string label, string word, int len)
{
if (p3 == label.LastIndexOf('.'))
{
if (label.EndsWithOrdinal("." + word)) return 1;
if (label.EndsWithOrdinal("." + word)) return 2;
else return 3;
}
else return 4;
Expand All @@ -697,10 +699,10 @@ static public int SmartMatch(string label, string word, int len)
{
if (p2 == label.LastIndexOf('.'))
{
if (label.EndsWith("." + word, StringComparison.OrdinalIgnoreCase)) return 2;
else return 4;
if (label.EndsWith("." + word, StringComparison.OrdinalIgnoreCase)) return 3;
else return 5;
}
else return 5;
else return 6;
}
if (p == 0)
{
Expand All @@ -714,8 +716,8 @@ static public int SmartMatch(string label, string word, int len)
else
{
int p4 = label.IndexOf(':');
if (p4 > 0) return SmartMatch(label.Substring(p4 + 1), word, len);
return 5;
if (p4 > 0) return SmartMatch(label.Substring(p4 + 1), word, len, allUpper);
return 6;
}
}

Expand Down Expand Up @@ -762,8 +764,7 @@ static public int IsAbbreviation(string label, string word)
{
p = p2;
c = word[i++];
if (Char.IsUpper(c)) p2 = label.IndexOfOrdinal(c.ToString(), p + 1);
else p2 = label.IndexOf(c.ToString(), p + 1, StringComparison.OrdinalIgnoreCase);
p2 = label.IndexOf(c, p + 1);
if (p2 < 0) return 0;

int ups = 0;
Expand All @@ -776,8 +777,9 @@ static public int IsAbbreviation(string label, string word)
}
if (dist == len - 1)
{
if (label == word || label.EndsWithOrdinal("." + word)) return 1;
return score;
if (label == word) return 1;
if (label.EndsWithOrdinal("." + word)) return 2;
return score + 1;
}
else return score + 2;
}
Expand Down