Skip to content

Commit f6566cb

Browse files
CyrusNajmabadiCyrusNajmabadi
committed
Merge remote-tracking branch 'upstream/master' into useExprBody
2 parents ec8e914 + c5a98d8 commit f6566cb

File tree

53 files changed

+155
-200
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
-200
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 & 8 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,13 +15,7 @@ public CSharpSymbolDisplayService(HostLanguageServices provider)
1615
{
1716
}
1817

19-
public override ImmutableArray<SymbolDisplayPart> ToDisplayParts(ISymbol symbol, SymbolDisplayFormat format = null)
20-
=> Microsoft.CodeAnalysis.CSharp.SymbolDisplay.ToDisplayParts(symbol, format);
21-
22-
public override ImmutableArray<SymbolDisplayPart> ToMinimalDisplayParts(SemanticModel semanticModel, int position, ISymbol symbol, SymbolDisplayFormat format)
23-
=> symbol.ToMinimalDisplayParts(semanticModel, position, format);
24-
2518
protected override AbstractSymbolDescriptionBuilder CreateDescriptionBuilder(Workspace workspace, SemanticModel semanticModel, int position, CancellationToken cancellationToken)
26-
=> new SymbolDescriptionBuilder(this, semanticModel, position, workspace, AnonymousTypeDisplayService, cancellationToken);
19+
=> new SymbolDescriptionBuilder(semanticModel, position, workspace, AnonymousTypeDisplayService, cancellationToken);
2720
}
2821
}

‎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
@@ -81,11 +81,10 @@ protected override async Task<SignatureHelpItems> GetItemsWorkerAsync(Document d
8181
return null;
8282
}
8383

84-
var symbolDisplayService = document.GetLanguageService<ISymbolDisplayService>();
8584
var accessibleConstructors = attributeType.InstanceConstructors
8685
.WhereAsArray(c => c.IsAccessibleWithin(within))
8786
.FilterToVisibleAndBrowsableSymbols(document.ShouldHideAdvancedMembers(), semanticModel.Compilation)
88-
.Sort(symbolDisplayService, semanticModel, attribute.SpanStart);
87+
.Sort(semanticModel, attribute.SpanStart);
8988

9089
if (!accessibleConstructors.Any())
9190
{
@@ -101,7 +100,7 @@ protected override async Task<SignatureHelpItems> GetItemsWorkerAsync(Document d
101100
var selectedItem = TryGetSelectedIndex(accessibleConstructors, symbolInfo);
102101

103102
return CreateSignatureHelpItems(accessibleConstructors.Select(c =>
104-
Convert(c, within, attribute, semanticModel, symbolDisplayService, anonymousTypeDisplayService, documentationCommentFormatter, cancellationToken)).ToList(),
103+
Convert(c, within, attribute, semanticModel, anonymousTypeDisplayService, documentationCommentFormatter, cancellationToken)).ToList(),
105104
textSpan, GetCurrentArgumentState(root, position, syntaxFacts, textSpan, cancellationToken), selectedItem);
106105
}
107106

@@ -121,7 +120,6 @@ private SignatureHelpItem Convert(
121120
ISymbol within,
122121
AttributeSyntax attribute,
123122
SemanticModel semanticModel,
124-
ISymbolDisplayService symbolDisplayService,
125123
IAnonymousTypeDisplayService anonymousTypeDisplayService,
126124
IDocumentationCommentFormattingService documentationCommentFormatter,
127125
CancellationToken cancellationToken)
@@ -136,7 +134,7 @@ private SignatureHelpItem Convert(
136134

137135
var item = CreateItem(
138136
constructor, semanticModel, position,
139-
symbolDisplayService, anonymousTypeDisplayService,
137+
anonymousTypeDisplayService,
140138
isVariadic,
141139
constructor.GetDocumentationPartsFactory(semanticModel, position, documentationCommentFormatter),
142140
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
@@ -87,11 +87,10 @@ protected override async Task<SignatureHelpItems> GetItemsWorkerAsync(Document d
8787

8888
var currentConstructor = semanticModel.GetDeclaredSymbol(constructorInitializer.Parent);
8989

90-
var symbolDisplayService = document.GetLanguageService<ISymbolDisplayService>();
9190
var accessibleConstructors = type.InstanceConstructors
9291
.WhereAsArray(c => c.IsAccessibleWithin(within) && !c.Equals(currentConstructor))
9392
.WhereAsArray(c => c.IsEditorBrowsable(document.ShouldHideAdvancedMembers(), semanticModel.Compilation))
94-
.Sort(symbolDisplayService, semanticModel, constructorInitializer.SpanStart);
93+
.Sort(semanticModel, constructorInitializer.SpanStart);
9594

9695
if (!accessibleConstructors.Any())
9796
{
@@ -107,7 +106,7 @@ protected override async Task<SignatureHelpItems> GetItemsWorkerAsync(Document d
107106
var selectedItem = TryGetSelectedIndex(accessibleConstructors, symbolInfo);
108107

109108
return CreateSignatureHelpItems(accessibleConstructors.SelectAsArray(c =>
110-
Convert(c, constructorInitializer.ArgumentList.OpenParenToken, semanticModel, symbolDisplayService, anonymousTypeDisplayService, documentationCommentFormattingService, cancellationToken)).ToList(),
109+
Convert(c, constructorInitializer.ArgumentList.OpenParenToken, semanticModel, anonymousTypeDisplayService, documentationCommentFormattingService, cancellationToken)).ToList(),
111110
textSpan, GetCurrentArgumentState(root, position, syntaxFacts, textSpan, cancellationToken), selectedItem);
112111
}
113112

@@ -126,15 +125,14 @@ private SignatureHelpItem Convert(
126125
IMethodSymbol constructor,
127126
SyntaxToken openToken,
128127
SemanticModel semanticModel,
129-
ISymbolDisplayService symbolDisplayService,
130128
IAnonymousTypeDisplayService anonymousTypeDisplayService,
131129
IDocumentationCommentFormattingService documentationCommentFormattingService,
132130
CancellationToken cancellationToken)
133131
{
134132
var position = openToken.SpanStart;
135133
var item = CreateItem(
136134
constructor, semanticModel, position,
137-
symbolDisplayService, anonymousTypeDisplayService,
135+
anonymousTypeDisplayService,
138136
constructor.IsParams(),
139137
constructor.GetDocumentationPartsFactory(semanticModel, position, documentationCommentFormattingService),
140138
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
@@ -96,17 +96,16 @@ protected override async Task<SignatureHelpItems> GetItemsWorkerAsync(Document d
9696
return null;
9797
}
9898

99-
var symbolDisplayService = document.GetLanguageService<ISymbolDisplayService>();
10099
accessibleIndexers = accessibleIndexers.FilterToVisibleAndBrowsableSymbols(document.ShouldHideAdvancedMembers(), semanticModel.Compilation)
101-
.Sort(symbolDisplayService, semanticModel, expression.SpanStart);
100+
.Sort(semanticModel, expression.SpanStart);
102101

103102
var anonymousTypeDisplayService = document.GetLanguageService<IAnonymousTypeDisplayService>();
104103
var documentationCommentFormattingService = document.GetLanguageService<IDocumentationCommentFormattingService>();
105104
var textSpan = GetTextSpan(expression, openBrace);
106105
var syntaxFacts = document.GetLanguageService<ISyntaxFactsService>();
107106

108107
return CreateSignatureHelpItems(accessibleIndexers.Select(p =>
109-
Convert(p, openBrace, semanticModel, symbolDisplayService, anonymousTypeDisplayService, documentationCommentFormattingService, cancellationToken)).ToList(),
108+
Convert(p, openBrace, semanticModel, anonymousTypeDisplayService, documentationCommentFormattingService, cancellationToken)).ToList(),
110109
textSpan, GetCurrentArgumentState(root, position, syntaxFacts, textSpan, cancellationToken), selectedItem: null);
111110
}
112111

@@ -225,14 +224,13 @@ private SignatureHelpItem Convert(
225224
IPropertySymbol indexer,
226225
SyntaxToken openToken,
227226
SemanticModel semanticModel,
228-
ISymbolDisplayService symbolDisplayService,
229227
IAnonymousTypeDisplayService anonymousTypeDisplayService,
230228
IDocumentationCommentFormattingService documentationCommentFormattingService,
231229
CancellationToken cancellationToken)
232230
{
233231
var position = openToken.SpanStart;
234232
var item = CreateItem(indexer, semanticModel, position,
235-
symbolDisplayService, anonymousTypeDisplayService,
233+
anonymousTypeDisplayService,
236234
indexer.IsParams(),
237235
indexer.GetDocumentationPartsFactory(semanticModel, position, documentationCommentFormattingService),
238236
GetPreambleParts(indexer, position, semanticModel),

0 commit comments

Comments
 (0)