提交 4391b0f8 编写于 作者: C CyrusNajmabadi

Always determine glyph by symbol passed in.

上级 9776ed94
......@@ -103,7 +103,6 @@ internal async Task<IEnumerable<CompletionItem>> GetItemsAsync()
return MemberInsertionCompletionItem.Create(
displayString,
symbol.GetGlyph(),
modifiers,
_startLineNumber,
symbol,
......
......@@ -105,7 +105,6 @@ private CompletionItem CreateItem(IMethodSymbol method, int line, TextSpan lineS
return MemberInsertionCompletionItem.Create(
displayText,
Glyph.MethodPrivate,
modifiers,
line,
method,
......
......@@ -11,7 +11,6 @@ internal class MemberInsertionCompletionItem
{
public static CompletionItem Create(
string displayText,
Glyph? glyph,
DeclarationModifiers modifiers,
int line,
ISymbol symbol,
......@@ -27,7 +26,6 @@ internal class MemberInsertionCompletionItem
return SymbolCompletionItem.CreateWithSymbolId(
displayText: displayText,
symbols: ImmutableArray.Create(symbol),
glyph: glyph,
contextPosition: descriptionPosition,
properties: props,
rules: rules);
......
......@@ -21,7 +21,6 @@ internal static partial class SymbolCompletionItem
Func<IReadOnlyList<ISymbol>, CompletionItem, CompletionItem> symbolEncoder,
string sortText = null,
string insertionText = null,
Glyph? glyph = null,
string filterText = null,
SupportedPlatformData supportedPlatforms = null,
ImmutableDictionary<string, string> properties = null,
......@@ -36,12 +35,13 @@ internal static partial class SymbolCompletionItem
props = props.Add("ContextPosition", contextPosition.ToString());
var firstSymbol = symbols[0];
var item = CommonCompletionItem.Create(
displayText: displayText,
rules: rules,
filterText: filterText ?? (displayText.Length > 0 && displayText[0] == '@' ? displayText : symbols[0].Name),
sortText: sortText ?? symbols[0].Name,
glyph: glyph ?? symbols[0].GetGlyph(),
filterText: filterText ?? (displayText.Length > 0 && displayText[0] == '@' ? displayText : firstSymbol.Name),
sortText: sortText ?? firstSymbol.Name,
glyph: firstSymbol.GetGlyph(),
showsWarningIcon: supportedPlatforms != null,
properties: props,
tags: tags);
......@@ -244,7 +244,6 @@ public static string GetInsertionText(CompletionItem item)
int contextPosition,
string sortText = null,
string insertionText = null,
Glyph? glyph = null,
string filterText = null,
SupportedPlatformData supportedPlatforms = null,
ImmutableDictionary<string, string> properties = null,
......@@ -252,7 +251,7 @@ public static string GetInsertionText(CompletionItem item)
{
return CreateWorker(
displayText, symbols, rules, contextPosition,
AddSymbolEncoding, sortText, insertionText, glyph,
AddSymbolEncoding, sortText, insertionText,
filterText, supportedPlatforms, properties, tags);
}
......@@ -263,7 +262,6 @@ public static string GetInsertionText(CompletionItem item)
int contextPosition,
string sortText = null,
string insertionText = null,
Glyph? glyph = null,
string filterText = null,
SupportedPlatformData supportedPlatforms = null,
ImmutableDictionary<string, string> properties = null,
......@@ -271,7 +269,7 @@ public static string GetInsertionText(CompletionItem item)
{
return CreateWorker(
displayText, symbols, rules, contextPosition,
AddSymbolNameAndKind, sortText, insertionText, glyph,
AddSymbolNameAndKind, sortText, insertionText,
filterText, supportedPlatforms, properties, tags);
}
......
......@@ -75,7 +75,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
rules:=CompletionItemRules.Default.WithMatchPriority(MatchPriority.Preselect),
contextPosition:=context.Position,
sortText:=displayText,
glyph:=Glyph.EnumMember,
supportedPlatforms:=supportedPlatformData)
End Function
End Class
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册