Skip to content

Commit c5a98d8

Browse files
author
msftbot[bot]
authored
Merge pull request #42750 from CyrusNajmabadi/simpleDisplay
Remove members from ISymbolDisplayService
2 parents 5b54220 + 3ede7c1 commit c5a98d8

File tree

53 files changed

+155
-212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+155
-212
lines changed

‎src/Features/CSharp/Portable/Completion/CompletionProviders/EnumAndCompletionListTagCompletionProvider.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,9 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
133133
// Does type have any aliases?
134134
var alias = await type.FindApplicableAliasAsync(position, semanticModel, cancellationToken).ConfigureAwait(false);
135135

136-
var displayService = document.GetLanguageService<ISymbolDisplayService>();
137136
var displayText = alias != null
138137
? alias.Name
139-
: displayService.ToMinimalDisplayString(semanticModel, position, type);
138+
: type.ToMinimalDisplayString(semanticModel, position);
140139

141140
var workspace = document.Project.Solution.Workspace;
142141
var text = await semanticModel.SyntaxTree.GetTextAsync(cancellationToken).ConfigureAwait(false);

‎src/Features/CSharp/Portable/GenerateConstructorFromMembers/CSharpGenerateConstructorFromMembersCodeRefactoringProvider.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ internal CSharpGenerateConstructorFromMembersCodeRefactoringProvider(IPickMember
3434
{
3535
}
3636

37+
protected override string ToDisplayString(IParameterSymbol parameter, SymbolDisplayFormat format)
38+
=> SymbolDisplay.ToDisplayString(parameter, format);
39+
3740
protected override bool PrefersThrowExpression(DocumentOptionSet options)
3841
=> options.GetOption(CSharpCodeStyleOptions.PreferThrowExpression).Value;
3942
}

‎src/Features/CSharp/Portable/ImplementInterface/CSharpImplementInterfaceService.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ public CSharpImplementInterfaceService()
2626
{
2727
}
2828

29+
protected override string ToDisplayString(IMethodSymbol disposeImplMethod, SymbolDisplayFormat format)
30+
=> SymbolDisplay.ToDisplayString(disposeImplMethod, format);
31+
2932
protected override bool TryInitializeState(
3033
Document document, SemanticModel model, SyntaxNode node, CancellationToken cancellationToken,
3134
out SyntaxNode classOrStructDecl, out INamedTypeSymbol classOrStructType, out IEnumerable<INamedTypeSymbol> interfaceTypes)

‎src/Features/CSharp/Portable/LanguageServices/CSharpAnonymousTypeDisplayService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public CSharpAnonymousTypeDisplayService()
2424
}
2525

2626
public override IEnumerable<SymbolDisplayPart> GetAnonymousTypeParts(
27-
INamedTypeSymbol anonymousType, SemanticModel semanticModel, int position, ISymbolDisplayService displayService)
27+
INamedTypeSymbol anonymousType, SemanticModel semanticModel, int position)
2828
{
2929
var members = new List<SymbolDisplayPart>();
3030

@@ -43,7 +43,7 @@ public override IEnumerable<SymbolDisplayPart> GetAnonymousTypeParts(
4343
}
4444

4545
first = false;
46-
members.AddRange(displayService.ToMinimalDisplayParts(semanticModel, position, property.Type).Select(p => p.MassageErrorTypeNames("?")));
46+
members.AddRange(property.Type.ToMinimalDisplayParts(semanticModel, position).Select(p => p.MassageErrorTypeNames("?")));
4747
members.AddRange(Space());
4848
members.Add(new SymbolDisplayPart(SymbolDisplayPartKind.PropertyName, property, property.Name));
4949
}

‎src/Features/CSharp/Portable/LanguageServices/CSharpSymbolDisplayService.SymbolDescriptionBuilder.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,12 @@ protected class SymbolDescriptionBuilder : AbstractSymbolDescriptionBuilder
3434
.AddMemberOptions(SymbolDisplayMemberOptions.IncludeModifiers);
3535

3636
public SymbolDescriptionBuilder(
37-
ISymbolDisplayService displayService,
3837
SemanticModel semanticModel,
3938
int position,
4039
Workspace workspace,
4140
IAnonymousTypeDisplayService anonymousTypeDisplayService,
4241
CancellationToken cancellationToken)
43-
: base(displayService, semanticModel, position, workspace, anonymousTypeDisplayService, cancellationToken)
42+
: base(semanticModel, position, workspace, anonymousTypeDisplayService, cancellationToken)
4443
{
4544
}
4645

‎src/Features/CSharp/Portable/LanguageServices/CSharpSymbolDisplayService.cs‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using System.Collections.Immutable;
65
using System.Threading;
76
using Microsoft.CodeAnalysis.Host;
87
using Microsoft.CodeAnalysis.LanguageServices;
@@ -16,19 +15,7 @@ public CSharpSymbolDisplayService(HostLanguageServices provider)
1615
{
1716
}
1817

19-
public override ImmutableArray<SymbolDisplayPart> ToDisplayParts(ISymbol symbol, SymbolDisplayFormat format = null)
20-
{
21-
return Microsoft.CodeAnalysis.CSharp.SymbolDisplay.ToDisplayParts(symbol, format);
22-
}
23-
24-
public override ImmutableArray<SymbolDisplayPart> ToMinimalDisplayParts(SemanticModel semanticModel, int position, ISymbol symbol, SymbolDisplayFormat format)
25-
{
26-
return symbol.ToMinimalDisplayParts(semanticModel, position, format);
27-
}
28-
2918
protected override AbstractSymbolDescriptionBuilder CreateDescriptionBuilder(Workspace workspace, SemanticModel semanticModel, int position, CancellationToken cancellationToken)
30-
{
31-
return new SymbolDescriptionBuilder(this, semanticModel, position, workspace, AnonymousTypeDisplayService, cancellationToken);
32-
}
19+
=> new SymbolDescriptionBuilder(semanticModel, position, workspace, AnonymousTypeDisplayService, cancellationToken);
3320
}
3421
}

‎src/Features/CSharp/Portable/SignatureHelp/AbstractOrdinaryMethodSignatureHelpProvider.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ internal static SignatureHelpItem ConvertMethodGroupMethod(
3434
{
3535
var anonymousTypeDisplayService = document.GetLanguageService<IAnonymousTypeDisplayService>();
3636
var documentationCommentFormattingService = document.GetLanguageService<IDocumentationCommentFormattingService>();
37-
var symbolDisplayService = document.GetLanguageService<ISymbolDisplayService>();
3837

3938
return CreateItemImpl(
4039
method, semanticModel, position,
41-
symbolDisplayService, anonymousTypeDisplayService,
40+
anonymousTypeDisplayService,
4241
method.IsParams(),
4342
c => method.OriginalDefinition.GetDocumentationParts(semanticModel, position, documentationCommentFormattingService, c),
4443
GetMethodGroupPreambleParts(method, semanticModel, position),

‎src/Features/CSharp/Portable/SignatureHelp/AttributeSignatureHelpProvider.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,10 @@ protected override async Task<SignatureHelpItems> GetItemsWorkerAsync(Document d
8585
return null;
8686
}
8787

88-
var symbolDisplayService = document.GetLanguageService<ISymbolDisplayService>();
8988
var accessibleConstructors = attributeType.InstanceConstructors
9089
.WhereAsArray(c => c.IsAccessibleWithin(within))
9190
.FilterToVisibleAndBrowsableSymbols(document.ShouldHideAdvancedMembers(), semanticModel.Compilation)
92-
.Sort(symbolDisplayService, semanticModel, attribute.SpanStart);
91+
.Sort(semanticModel, attribute.SpanStart);
9392

9493
if (!accessibleConstructors.Any())
9594
{
@@ -105,7 +104,7 @@ protected override async Task<SignatureHelpItems> GetItemsWorkerAsync(Document d
105104
var selectedItem = TryGetSelectedIndex(accessibleConstructors, symbolInfo);
106105

107106
return CreateSignatureHelpItems(accessibleConstructors.Select(c =>
108-
Convert(c, within, attribute, semanticModel, symbolDisplayService, anonymousTypeDisplayService, documentationCommentFormatter, cancellationToken)).ToList(),
107+
Convert(c, within, attribute, semanticModel, anonymousTypeDisplayService, documentationCommentFormatter, cancellationToken)).ToList(),
109108
textSpan, GetCurrentArgumentState(root, position, syntaxFacts, textSpan, cancellationToken), selectedItem);
110109
}
111110

@@ -125,7 +124,6 @@ private SignatureHelpItem Convert(
125124
ISymbol within,
126125
AttributeSyntax attribute,
127126
SemanticModel semanticModel,
128-
ISymbolDisplayService symbolDisplayService,
129127
IAnonymousTypeDisplayService anonymousTypeDisplayService,
130128
IDocumentationCommentFormattingService documentationCommentFormatter,
131129
CancellationToken cancellationToken)
@@ -140,7 +138,7 @@ private SignatureHelpItem Convert(
140138

141139
var item = CreateItem(
142140
constructor, semanticModel, position,
143-
symbolDisplayService, anonymousTypeDisplayService,
141+
anonymousTypeDisplayService,
144142
isVariadic,
145143
constructor.GetDocumentationPartsFactory(semanticModel, position, documentationCommentFormatter),
146144
GetPreambleParts(constructor, semanticModel, position),

‎src/Features/CSharp/Portable/SignatureHelp/ConstructorInitializerSignatureHelpProvider.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,10 @@ protected override async Task<SignatureHelpItems> GetItemsWorkerAsync(Document d
9393

9494
var currentConstructor = semanticModel.GetDeclaredSymbol(constructorInitializer.Parent);
9595

96-
var symbolDisplayService = document.GetLanguageService<ISymbolDisplayService>();
9796
var accessibleConstructors = type.InstanceConstructors
9897
.WhereAsArray(c => c.IsAccessibleWithin(within) && !c.Equals(currentConstructor))
9998
.WhereAsArray(c => c.IsEditorBrowsable(document.ShouldHideAdvancedMembers(), semanticModel.Compilation))
100-
.Sort(symbolDisplayService, semanticModel, constructorInitializer.SpanStart);
99+
.Sort(semanticModel, constructorInitializer.SpanStart);
101100

102101
if (!accessibleConstructors.Any())
103102
{
@@ -113,7 +112,7 @@ protected override async Task<SignatureHelpItems> GetItemsWorkerAsync(Document d
113112
var selectedItem = TryGetSelectedIndex(accessibleConstructors, symbolInfo);
114113

115114
return CreateSignatureHelpItems(accessibleConstructors.SelectAsArray(c =>
116-
Convert(c, constructorInitializer.ArgumentList.OpenParenToken, semanticModel, symbolDisplayService, anonymousTypeDisplayService, documentationCommentFormattingService, cancellationToken)).ToList(),
115+
Convert(c, constructorInitializer.ArgumentList.OpenParenToken, semanticModel, anonymousTypeDisplayService, documentationCommentFormattingService, cancellationToken)).ToList(),
117116
textSpan, GetCurrentArgumentState(root, position, syntaxFacts, textSpan, cancellationToken), selectedItem);
118117
}
119118

@@ -132,15 +131,14 @@ private SignatureHelpItem Convert(
132131
IMethodSymbol constructor,
133132
SyntaxToken openToken,
134133
SemanticModel semanticModel,
135-
ISymbolDisplayService symbolDisplayService,
136134
IAnonymousTypeDisplayService anonymousTypeDisplayService,
137135
IDocumentationCommentFormattingService documentationCommentFormattingService,
138136
CancellationToken cancellationToken)
139137
{
140138
var position = openToken.SpanStart;
141139
var item = CreateItem(
142140
constructor, semanticModel, position,
143-
symbolDisplayService, anonymousTypeDisplayService,
141+
anonymousTypeDisplayService,
144142
constructor.IsParams(),
145143
constructor.GetDocumentationPartsFactory(semanticModel, position, documentationCommentFormattingService),
146144
GetPreambleParts(constructor, semanticModel, position),

‎src/Features/CSharp/Portable/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,16 @@ protected override async Task<SignatureHelpItems> GetItemsWorkerAsync(Document d
102102
return null;
103103
}
104104

105-
var symbolDisplayService = document.GetLanguageService<ISymbolDisplayService>();
106105
accessibleIndexers = accessibleIndexers.FilterToVisibleAndBrowsableSymbols(document.ShouldHideAdvancedMembers(), semanticModel.Compilation)
107-
.Sort(symbolDisplayService, semanticModel, expression.SpanStart);
106+
.Sort(semanticModel, expression.SpanStart);
108107

109108
var anonymousTypeDisplayService = document.GetLanguageService<IAnonymousTypeDisplayService>();
110109
var documentationCommentFormattingService = document.GetLanguageService<IDocumentationCommentFormattingService>();
111110
var textSpan = GetTextSpan(expression, openBrace);
112111
var syntaxFacts = document.GetLanguageService<ISyntaxFactsService>();
113112

114113
return CreateSignatureHelpItems(accessibleIndexers.Select(p =>
115-
Convert(p, openBrace, semanticModel, symbolDisplayService, anonymousTypeDisplayService, documentationCommentFormattingService, cancellationToken)).ToList(),
114+
Convert(p, openBrace, semanticModel, anonymousTypeDisplayService, documentationCommentFormattingService, cancellationToken)).ToList(),
116115
textSpan, GetCurrentArgumentState(root, position, syntaxFacts, textSpan, cancellationToken), selectedItem: null);
117116
}
118117

@@ -231,14 +230,13 @@ private SignatureHelpItem Convert(
231230
IPropertySymbol indexer,
232231
SyntaxToken openToken,
233232
SemanticModel semanticModel,
234-
ISymbolDisplayService symbolDisplayService,
235233
IAnonymousTypeDisplayService anonymousTypeDisplayService,
236234
IDocumentationCommentFormattingService documentationCommentFormattingService,
237235
CancellationToken cancellationToken)
238236
{
239237
var position = openToken.SpanStart;
240238
var item = CreateItem(indexer, semanticModel, position,
241-
symbolDisplayService, anonymousTypeDisplayService,
239+
anonymousTypeDisplayService,
242240
indexer.IsParams(),
243241
indexer.GetDocumentationPartsFactory(semanticModel, position, documentationCommentFormattingService),
244242
GetPreambleParts(indexer, position, semanticModel),

0 commit comments

Comments
 (0)