提交 4e6fdc02 编写于 作者: I Ivan Basov

prefer intellicode item on deletion and in general case

上级 75596178
...@@ -493,7 +493,8 @@ private static bool ShouldBeFilteredOutOfCompletionList(VSCompletionItem item, I ...@@ -493,7 +493,8 @@ private static bool ShouldBeFilteredOutOfCompletionList(VSCompletionItem item, I
var mruIndex1 = GetRecentItemIndex(recentItems, bestItem); var mruIndex1 = GetRecentItemIndex(recentItems, bestItem);
var mruIndex2 = GetRecentItemIndex(recentItems, chosenItem); var mruIndex2 = GetRecentItemIndex(recentItems, chosenItem);
if (mruIndex2 < mruIndex1) if ((mruIndex2 < mruIndex1) ||
(mruIndex2 == mruIndex1 && !bestItem.IsPreferredItem() && chosenItem.IsPreferredItem()))
{ {
bestItem = chosenItem; bestItem = chosenItem;
} }
...@@ -513,7 +514,8 @@ private static bool ShouldBeFilteredOutOfCompletionList(VSCompletionItem item, I ...@@ -513,7 +514,8 @@ private static bool ShouldBeFilteredOutOfCompletionList(VSCompletionItem item, I
var bestItemPriority = bestItem.Rules.MatchPriority; var bestItemPriority = bestItem.Rules.MatchPriority;
var currentItemPriority = chosenItem.Rules.MatchPriority; var currentItemPriority = chosenItem.Rules.MatchPriority;
if (currentItemPriority > bestItemPriority) if ((currentItemPriority > bestItemPriority) ||
((currentItemPriority == bestItemPriority) && !bestItem.IsPreferredItem() && chosenItem.IsPreferredItem()))
{ {
bestItem = chosenItem; bestItem = chosenItem;
} }
...@@ -565,7 +567,13 @@ internal static bool IsBetterDeletionMatch(FilterResult result1, FilterResult re ...@@ -565,7 +567,13 @@ internal static bool IsBetterDeletionMatch(FilterResult result1, FilterResult re
{ {
return true; return true;
} }
if (result1.CompletionItem.IsPreferredItem() && !result2.CompletionItem.IsPreferredItem())
{
return true;
}
} }
return false; return false;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册