Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't set completion text to full signature unless its override or partial method completion #868

Merged
merged 2 commits into from
May 19, 2017
Merged

Don't set completion text to full signature unless its override or partial method completion #868

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1661ba4
Don't set completion text to full signature unless its override or pa…
DustinCampbell May 18, 2017
62b361e
Fix CR feedback and use completion item's InsertionText if available
DustinCampbell May 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions src/OmniSharp.Roslyn.CSharp/Services/Intellisense/CompletionItemExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using System.Reflection;
Expand All @@ -13,24 +12,36 @@ namespace OmniSharp.Roslyn.CSharp.Services.Intellisense
{
internal static class CompletionItemExtensions
{
private const string GetSymbolsAsync = "GetSymbolsAsync";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use named?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

private const string OverrideCompletionProvider = "Microsoft.CodeAnalysis.CSharp.Completion.Providers.OverrideCompletionProvider";
private const string ParitalMethodCompletionProvider = "Microsoft.CodeAnalysis.CSharp.Completion.Providers.PartialMethodCompletionProvider";
private const string Provider = "Provider";
private const string SymbolCompletionItem = "Microsoft.CodeAnalysis.Completion.Providers.SymbolCompletionItem";
private const string SymbolCompletionProvider = "Microsoft.CodeAnalysis.CSharp.Completion.Providers.SymbolCompletionProvider";
private const string SymbolKind = "SymbolKind";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use nameof?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

private const string SymbolName = "SymbolName";
private const string Symbols = "Symbols";

private static MethodInfo _getSymbolsAsync;

static CompletionItemExtensions()
{
var symbolCompletionItemType = typeof(CompletionItem).GetTypeInfo().Assembly.GetType("Microsoft.CodeAnalysis.Completion.Providers.SymbolCompletionItem");
_getSymbolsAsync = symbolCompletionItemType.GetMethod("GetSymbolsAsync", BindingFlags.Public | BindingFlags.Static);
var symbolCompletionItemType = typeof(CompletionItem).GetTypeInfo().Assembly.GetType(SymbolCompletionItem);
_getSymbolsAsync = symbolCompletionItemType.GetMethod(GetSymbolsAsync, BindingFlags.Public | BindingFlags.Static);
}

public static async Task<IEnumerable<ISymbol>> GetCompletionSymbolsAsync(this CompletionItem completionItem, IEnumerable<ISymbol> recommendedSymbols, Document document)
{
var properties = completionItem.Properties;

// for SymbolCompletionProvider, use the logic of extracting information from recommended symbols
if (completionItem.Properties.ContainsKey("Provider") && completionItem.Properties["Provider"] == "Microsoft.CodeAnalysis.CSharp.Completion.Providers.SymbolCompletionProvider")
if (properties.TryGetValue(Provider, out var provider) && provider == SymbolCompletionProvider)
{
return recommendedSymbols.Where(x => x.Name == completionItem.Properties["SymbolName"] && (int)x.Kind == int.Parse(completionItem.Properties["SymbolKind"])).Distinct();
return recommendedSymbols.Where(x => x.Name == properties[SymbolName] && (int)x.Kind == int.Parse(properties[SymbolKind])).Distinct();
}

// if the completion provider encoded symbols into Properties, we can return them
if (completionItem.Properties.ContainsKey("Symbols"))
if (properties.ContainsKey(Symbols))
{
// the API to decode symbols is not public at the moment
// http://source.roslyn.io/#Microsoft.CodeAnalysis.Features/Completion/Providers/SymbolCompletionItem.cs,93
Expand All @@ -43,5 +54,11 @@ public static async Task<IEnumerable<ISymbol>> GetCompletionSymbolsAsync(this Co

return Enumerable.Empty<ISymbol>();
}

public static bool UseDisplayTextAsCompletionText(this CompletionItem completionItem)
{
return completionItem.Properties.TryGetValue(Provider, out var provider)
&& (provider == OverrideCompletionProvider || provider == ParitalMethodCompletionProvider);
}
}
}
64 changes: 39 additions & 25 deletions src/OmniSharp.Roslyn.CSharp/Services/Intellisense/IntellisenseService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,22 @@ public async Task<IEnumerable<AutoCompleteResponse>> Handle(AutoCompleteRequest
{
foreach (var symbol in symbols)
{
completionText = item.UseDisplayTextAsCompletionText()
? item.DisplayText
: symbol.Name;

if (symbol != null)
{
if (request.WantSnippet)
{
foreach (var completion in MakeSnippetedResponses(request, symbol, item.DisplayText))
foreach (var completion in MakeSnippetedResponses(request, symbol, completionText))
{
completions.Add(completion);
}
}
else
{
completions.Add(MakeAutoCompleteResponse(request, symbol, item.DisplayText));
completions.Add(MakeAutoCompleteResponse(request, symbol, completionText));
}
}
}
Expand Down Expand Up @@ -104,50 +108,60 @@ public async Task<IEnumerable<AutoCompleteResponse>> Handle(AutoCompleteRequest
.ThenBy(c => c.CompletionText, StringComparer.OrdinalIgnoreCase);
}

private IEnumerable<AutoCompleteResponse> MakeSnippetedResponses(AutoCompleteRequest request, ISymbol symbol, string displayName)
private IEnumerable<AutoCompleteResponse> MakeSnippetedResponses(AutoCompleteRequest request, ISymbol symbol, string completionText)
{
switch (symbol)
{
case IMethodSymbol methodSymbol:
return MakeSnippetedResponses(request, methodSymbol, completionText);
case INamedTypeSymbol typeSymbol:
return MakeSnippetedResponses(request, typeSymbol, completionText);

default:
return new[] { MakeAutoCompleteResponse(request, symbol, completionText) };
}
}

private IEnumerable<AutoCompleteResponse> MakeSnippetedResponses(AutoCompleteRequest request, IMethodSymbol methodSymbol, string completionText)
{
var completions = new List<AutoCompleteResponse>();

var methodSymbol = symbol as IMethodSymbol;
if (methodSymbol != null)
if (methodSymbol.Parameters.Any(p => p.IsOptional))
{
if (methodSymbol.Parameters.Any(p => p.IsOptional))
{
completions.Add(MakeAutoCompleteResponse(request, symbol, displayName, false));
}
completions.Add(MakeAutoCompleteResponse(request, methodSymbol, completionText, includeOptionalParams: false));
}

completions.Add(MakeAutoCompleteResponse(request, symbol, displayName));
completions.Add(MakeAutoCompleteResponse(request, methodSymbol, completionText));

return completions;
}
return completions;
}

var typeSymbol = symbol as INamedTypeSymbol;
if (typeSymbol != null)
private IEnumerable<AutoCompleteResponse> MakeSnippetedResponses(AutoCompleteRequest request, INamedTypeSymbol typeSymbol, string completionText)
{
var completions = new List<AutoCompleteResponse>
{
completions.Add(MakeAutoCompleteResponse(request, symbol, displayName));
MakeAutoCompleteResponse(request, typeSymbol, completionText)
};

if (typeSymbol.TypeKind != TypeKind.Enum)
if (typeSymbol.TypeKind != TypeKind.Enum)
{
foreach (var ctor in typeSymbol.InstanceConstructors)
{
foreach (var ctor in typeSymbol.InstanceConstructors)
{
completions.Add(MakeAutoCompleteResponse(request, ctor, displayName));
}
completions.Add(MakeAutoCompleteResponse(request, ctor, completionText));
}

return completions;
}

return new[] { MakeAutoCompleteResponse(request, symbol, displayName) };
return completions;
}

private AutoCompleteResponse MakeAutoCompleteResponse(AutoCompleteRequest request, ISymbol symbol, string displayName, bool includeOptionalParams = true)
private AutoCompleteResponse MakeAutoCompleteResponse(AutoCompleteRequest request, ISymbol symbol, string completionText, bool includeOptionalParams = true)
{
var displayNameGenerator = new SnippetGenerator();
displayNameGenerator.IncludeMarkers = false;
displayNameGenerator.IncludeOptionalParameters = includeOptionalParams;

var response = new AutoCompleteResponse();
response.CompletionText = displayName;
response.CompletionText = completionText;

// TODO: Do something more intelligent here
response.DisplayText = displayNameGenerator.Generate(symbol);
Expand Down
16 changes: 14 additions & 2 deletions src/OmniSharp.Roslyn/Extensions/SymbolExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,23 @@ public static class SymbolExtensions
{
public static string GetKind(this ISymbol symbol)
{
var namedType = symbol as INamedTypeSymbol;
if (namedType != null)
if (symbol is INamedTypeSymbol namedType)
{
return Enum.GetName(namedType.TypeKind.GetType(), namedType.TypeKind);
}

if (symbol.Kind == SymbolKind.Field &&
symbol.ContainingType?.TypeKind == TypeKind.Enum &&
symbol.Name != WellKnownMemberNames.EnumBackingFieldName)
{
return "EnumMember";
}

if ((symbol as IFieldSymbol)?.IsConst == true)
{
return "Const";
}

return Enum.GetName(symbol.Kind.GetType(), symbol.Kind);
}
}
Expand Down