Browse Source

Use InvariantCulture instead of Ordinal in CompletionList filtering.

pull/14/head
Daniel Grunwald 15 years ago
parent
commit
021db4c9fa
  1. 14
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs

14
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs

@ -326,31 +326,31 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion
// -1 = no match // -1 = no match
if (query == itemText) if (query == itemText)
return 8; return 8;
if (string.Equals(itemText, query, StringComparison.OrdinalIgnoreCase)) if (string.Equals(itemText, query, StringComparison.InvariantCultureIgnoreCase))
return 7; return 7;
if (itemText.StartsWith(query, StringComparison.Ordinal)) if (itemText.StartsWith(query, StringComparison.InvariantCulture))
return 6; return 6;
if (itemText.StartsWith(query, StringComparison.OrdinalIgnoreCase)) if (itemText.StartsWith(query, StringComparison.InvariantCultureIgnoreCase))
return 5; return 5;
bool? camelCaseMatch = null; bool? camelCaseMatch = null;
if (query.Length <= 2) { if (query.Length <= 2) {
camelCaseMatch = CamelCaseMatch(itemText, query); camelCaseMatch = CamelCaseMatch(itemText, query);
if (camelCaseMatch.GetValueOrDefault(false)) return 4; if (camelCaseMatch == true) return 4;
} }
// search by substring, if filtering (i.e. new behavior) turned on // search by substring, if filtering (i.e. new behavior) turned on
if (IsFiltering) { if (IsFiltering) {
if (itemText.Contains(query)) if (itemText.IndexOf(query, StringComparison.InvariantCulture) >= )
return 3; return 3;
if (itemText.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0) if (itemText.IndexOf(query, StringComparison.InvariantCultureIgnoreCase) >= 0)
return 2; return 2;
} }
if (!camelCaseMatch.HasValue) if (!camelCaseMatch.HasValue)
camelCaseMatch = CamelCaseMatch(itemText, query); camelCaseMatch = CamelCaseMatch(itemText, query);
if (camelCaseMatch.GetValueOrDefault(false)) if (camelCaseMatch == true)
return 1; return 1;
return -1; return -1;

Loading…
Cancel
Save