Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
genlu committed Feb 17, 2022
1 parent 32069d8 commit ef0d63f
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ public async Task<VSCompletionContext> GetExpandedCompletionContextAsync(

var suggestionItemOptions = new AsyncCompletionData.SuggestionItemOptions(
completionList.SuggestionModeItem.DisplayText,
completionList.SuggestionModeItem.Properties.TryGetValue(CommonCompletionItem.Description, out var description) ? description : string.Empty);
completionList.SuggestionModeItem.Properties.TryGetValue(CommonCompletionItem.DescriptionProperty, out var description) ? description : string.Empty);

return (new(items, suggestionItemOptions, selectionHint: AsyncCompletionData.InitialSelectionHint.SoftSelection, filters), completionList);
}
Expand Down Expand Up @@ -559,7 +559,7 @@ private VSCompletionItem Convert(
// roslynItem generated by providers can contain an insertionText in a property bag.
// We will not use it but other providers may need it.
// We actually will calculate the insertion text once again when called TryCommit.
if (!roslynItem.Properties.TryGetValue(CommonCompletionItem.InsertionText, out var insertionText))
if (!roslynItem.Properties.TryGetValue(CommonCompletionItem.InsertionTextProperty, out var insertionText))
{
insertionText = roslynItem.DisplayText;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ static async Task<TCompletionItem> CreateCompletionItemAsync<TCompletionItem>(
// If the feature flag is off, return an InsertText.
else
{
completionItem.InsertText = item.Properties.ContainsKey(CommonCompletionItem.InsertionText)
? item.Properties[CommonCompletionItem.InsertionText]
completionItem.InsertText = item.Properties.ContainsKey(CommonCompletionItem.InsertionTextProperty)
? item.Properties[CommonCompletionItem.InsertionTextProperty]
: completeDisplayText;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ private static CompletionItemRules GetRules(string displayText)

protected override Task<TextChange?> GetTextChangeAsync(CompletionItem selectedItem, char? ch, CancellationToken cancellationToken)
{
if (!selectedItem.Properties.TryGetValue(CommonCompletionItem.InsertionText, out var insertionText))
if (!selectedItem.Properties.TryGetValue(CommonCompletionItem.InsertionTextProperty, out var insertionText))
{
insertionText = selectedItem.DisplayText;
}
Expand Down
10 changes: 5 additions & 5 deletions src/Features/Core/Portable/Completion/CommonCompletionItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ namespace Microsoft.CodeAnalysis.Completion
{
internal static class CommonCompletionItem
{
public const string Description = nameof(Description);
public const string InsertionText = nameof(InsertionText);
public const string DescriptionProperty = nameof(DescriptionProperty);
public const string InsertionTextProperty = nameof(InsertionTextProperty);

public static CompletionItem Create(
string displayText,
Expand Down Expand Up @@ -45,7 +45,7 @@ public static CompletionItem Create(
properties ??= ImmutableDictionary<string, string>.Empty;
if (!description.IsDefault && description.Length > 0)
{
properties = properties.Add(Description, EncodeDescription(description.ToTaggedText()));
properties = properties.Add(DescriptionProperty, EncodeDescription(description.ToTaggedText()));
}

return CompletionItem.Create(
Expand All @@ -62,11 +62,11 @@ public static CompletionItem Create(
}

public static bool HasDescription(CompletionItem item)
=> item.Properties.ContainsKey(Description);
=> item.Properties.ContainsKey(DescriptionProperty);

public static CompletionDescription GetDescription(CompletionItem item)
{
if (item.Properties.TryGetValue(Description, out var encodedDescription))
if (item.Properties.TryGetValue(DescriptionProperty, out var encodedDescription))
{
return DecodeDescription(encodedDescription);
}
Expand Down
Original file line number Diff line number Diff line change