More CR feedback

Fix tests

src/EditorFeatures/Core/Extensibility/Completion/CompletionHelper.cs

@@ -190,18 +190,13 @@ private PatternMatcher GetFallbackPatternMatcher(string value)
         /// text, or false if it is not better.
         /// </summary>
         public virtual bool IsBetterFilterMatch(CompletionItem item1, CompletionItem item2, string filterText, CompletionTrigger trigger, CompletionFilterReason filterReason, ImmutableArray<string> recentItems = default(ImmutableArray<string>))
-        {
-            return IsBetterFilterMatchWorker(item1, item2, filterText, recentItems, comparePriorityBeforeCapitalization: false);
-        }
-
-        protected bool IsBetterFilterMatchWorker(CompletionItem item1, CompletionItem item2, string filterText, ImmutableArray<string> recentItems, bool comparePriorityBeforeCapitalization)
         {
             var match1 = GetMatch(item1, filterText);
             var match2 = GetMatch(item2, filterText);
 
             if (match1 != null && match2 != null)
             {
-                var result = CompareMatches(match1.Value, match2.Value, item1, item2, comparePriorityBeforeCapitalization);
+                var result = CompareMatches(match1.Value, match2.Value, item1, item2);
                 if (result != 0)
                 {
                     return result < 0;
@@ -275,7 +270,7 @@ protected int GetPrefixLength(string text, string pattern)
             return x;
         }
 
-        protected int CompareMatches(PatternMatch match1, PatternMatch match2, CompletionItem item1, CompletionItem item2, bool comparePriorityBeforeCapitalization)
+        protected int CompareMatches(PatternMatch match1, PatternMatch match2, CompletionItem item1, CompletionItem item2)
         {
             int diff;
 
@@ -301,16 +296,6 @@ protected int CompareMatches(PatternMatch match1, PatternMatch match2, Completio
                 return -1;
             }
 
-            // preselected items are prefered
-            if (comparePriorityBeforeCapitalization && item1.Rules.MatchPriority > item2.Rules.MatchPriority)
-            {
-                return -1;
-            }
-            else if (comparePriorityBeforeCapitalization && item2.Rules.MatchPriority > item1.Rules.MatchPriority)
-            {
-                return 1;
-            }
-
             diff = PatternMatch.CompareCase(match1, match2);
             if (diff != 0)
             {

src/EditorFeatures/VisualBasic/Completion/VisualBasicCompletionHelper.vb

@@ -87,7 +87,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Completion
                 End If
             End If
 
-            Return IsBetterFilterMatchWorker(item1, item2, filterText, recentItems, comparePriorityBeforeCapitalization:=True)
+            Return MyBase.IsBetterFilterMatch(item1, item2, filterText, trigger, filterReason, recentItems)
         End Function
 
         Public Overrides Function ShouldSoftSelectItem(item As CompletionItem, filterText As String, trigger As CompletionTrigger) As Boolean

src/Features/Core/Portable/Completion/CommonCompletionItem.cs

@@ -54,7 +54,7 @@ internal static class CommonCompletionItem
             }
 
             rules = rules ?? CompletionItemRules.Default;
-            rules = rules.WithMatchPriority(matchPriority ?? MatchPriority.Default)
+            rules = rules.WithMatchPriority(matchPriority.GetValueOrDefault())
                          .WithFormatOnCommit(shouldFormatOnCommit);
 
             return CompletionItem.Create(

src/Features/Core/Portable/Completion/Providers/SymbolCompletionItem.cs

@@ -94,7 +94,7 @@ internal static class SymbolCompletionItem
                 insertionText: insertionText,
                 glyph: glyph,
                 filterText: filterText,
-                matchPriority: matchPriority ?? MatchPriority.Default,
+                matchPriority: matchPriority.GetValueOrDefault(),
                 supportedPlatforms: supportedPlatforms,
                 isArgumentName: isArgumentName,
                 properties: properties,

src/Features/VisualBasic/Portable/Completion/CompletionProviders/EnumCompletionProvider.vb

@@ -119,7 +119,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
                 contextPosition:=context.Position,
                 descriptionPosition:=position,
                 sortText:=insertionText,
-                matchPriority:=MatchPriority.Preselect,
+                matchPriority:=If(preselect, MatchPriority.Preselect, MatchPriority.Default),
                 supportedPlatforms:=supportedPlatformData,
                 rules:=GetCompletionItemRules(symbols, context))
         End Function