From 1fcb4464dc7752e3df35ad153fea416678e9c9cc Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Thu, 26 Mar 2020 00:24:14 -0700 Subject: [PATCH] Remove parameters --- ...ractOrdinaryMethodSignatureHelpProvider.cs | 3 +-- ...tructorInitializerSignatureHelpProvider.cs | 9 +++----- ...ntAccessExpressionSignatureHelpProvider.cs | 23 ++++++------------- ...tializerExpressionSignatureHelpProvider.cs | 2 +- ...onSignatureHelpProviderBase_MethodGroup.cs | 2 +- ...ressionSignatureHelpProvider_NormalType.cs | 9 +++----- 6 files changed, 16 insertions(+), 32 deletions(-) diff --git a/src/Features/CSharp/Portable/SignatureHelp/AbstractOrdinaryMethodSignatureHelpProvider.cs b/src/Features/CSharp/Portable/SignatureHelp/AbstractOrdinaryMethodSignatureHelpProvider.cs index 23fb8a02b99..a407d5595a6 100644 --- a/src/Features/CSharp/Portable/SignatureHelp/AbstractOrdinaryMethodSignatureHelpProvider.cs +++ b/src/Features/CSharp/Portable/SignatureHelp/AbstractOrdinaryMethodSignatureHelpProvider.cs @@ -19,8 +19,7 @@ internal abstract class AbstractOrdinaryMethodSignatureHelpProvider : AbstractCS Document document, IMethodSymbol method, int position, - SemanticModel semanticModel, - CancellationToken cancellationToken) + SemanticModel semanticModel) { return ConvertMethodGroupMethod(document, method, position, semanticModel, descriptionParts: null); } diff --git a/src/Features/CSharp/Portable/SignatureHelp/ConstructorInitializerSignatureHelpProvider.cs b/src/Features/CSharp/Portable/SignatureHelp/ConstructorInitializerSignatureHelpProvider.cs index dfb0aaca5e1..9ff0bd9dcf5 100644 --- a/src/Features/CSharp/Portable/SignatureHelp/ConstructorInitializerSignatureHelpProvider.cs +++ b/src/Features/CSharp/Portable/SignatureHelp/ConstructorInitializerSignatureHelpProvider.cs @@ -142,7 +142,7 @@ public override SignatureHelpState GetCurrentArgumentState(SyntaxNode root, int constructor.GetDocumentationPartsFactory(semanticModel, position, documentationCommentFormattingService), GetPreambleParts(constructor, semanticModel, position), GetSeparatorParts(), - GetPostambleParts(constructor), + GetPostambleParts(), constructor.Parameters.Select(p => Convert(p, semanticModel, position, documentationCommentFormattingService)).ToList()); return item; } @@ -160,10 +160,7 @@ public override SignatureHelpState GetCurrentArgumentState(SyntaxNode root, int return result; } - private IList GetPostambleParts(IMethodSymbol method) - { - return SpecializedCollections.SingletonList( - Punctuation(SyntaxKind.CloseParenToken)); - } + private IList GetPostambleParts() + => SpecializedCollections.SingletonList(Punctuation(SyntaxKind.CloseParenToken)); } } diff --git a/src/Features/CSharp/Portable/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs b/src/Features/CSharp/Portable/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs index 6f53a51146c..d84f210167f 100644 --- a/src/Features/CSharp/Portable/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs +++ b/src/Features/CSharp/Portable/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs @@ -118,14 +118,9 @@ private TextSpan GetTextSpan(ExpressionSyntax expression, SyntaxToken openBracke { if (openBracket.Parent is BracketedArgumentListSyntax) { - if (expression.Parent is ConditionalAccessExpressionSyntax conditional) - { - return TextSpan.FromBounds(conditional.Span.Start, openBracket.FullSpan.End); - } - else - { - return CompleteElementAccessExpression.GetTextSpan(expression, openBracket); - } + return expression.Parent is ConditionalAccessExpressionSyntax conditional + ? TextSpan.FromBounds(conditional.Span.Start, openBracket.FullSpan.End) + : CompleteElementAccessExpression.GetTextSpan(openBracket); } else if (openBracket.Parent is ArrayRankSpecifierSyntax) { @@ -160,7 +155,6 @@ public override SignatureHelpState GetCurrentArgumentState(SyntaxNode root, int if (expression.Parent is ConditionalAccessExpressionSyntax) { // The typed code looks like: ?[ - var conditional = (ConditionalAccessExpressionSyntax)expression.Parent; var elementBinding = SyntaxFactory.ElementBindingExpression(newBracketedArgumentList); var conditionalAccessExpression = SyntaxFactory.ConditionalAccessExpression(expression, elementBinding); offset = expression.SpanStart - conditionalAccessExpression.SpanStart; @@ -240,7 +234,7 @@ public override SignatureHelpState GetCurrentArgumentState(SyntaxNode root, int indexer.GetDocumentationPartsFactory(semanticModel, position, documentationCommentFormattingService), GetPreambleParts(indexer, position, semanticModel), GetSeparatorParts(), - GetPostambleParts(indexer), + GetPostambleParts(), indexer.Parameters.Select(p => Convert(p, semanticModel, position, documentationCommentFormattingService)).ToList()); return item; } @@ -280,11 +274,8 @@ public override SignatureHelpState GetCurrentArgumentState(SyntaxNode root, int return result; } - private IList GetPostambleParts(IPropertySymbol indexer) - { - return SpecializedCollections.SingletonList( - Punctuation(SyntaxKind.CloseBracketToken)); - } + private IList GetPostambleParts() + => SpecializedCollections.SingletonList(Punctuation(SyntaxKind.CloseBracketToken)); private static class CompleteElementAccessExpression { @@ -303,7 +294,7 @@ internal static bool IsArgumentListToken(ElementAccessExpressionSyntax expressio token != expression.ArgumentList.CloseBracketToken; } - internal static TextSpan GetTextSpan(SyntaxNode expression, SyntaxToken openBracket) + internal static TextSpan GetTextSpan(SyntaxToken openBracket) { Contract.ThrowIfFalse(openBracket.Parent is BracketedArgumentListSyntax && (openBracket.Parent.Parent is ElementAccessExpressionSyntax || openBracket.Parent.Parent is ElementBindingExpressionSyntax)); diff --git a/src/Features/CSharp/Portable/SignatureHelp/InitializerExpressionSignatureHelpProvider.cs b/src/Features/CSharp/Portable/SignatureHelp/InitializerExpressionSignatureHelpProvider.cs index 043aec40fa6..97914ba0e42 100644 --- a/src/Features/CSharp/Portable/SignatureHelp/InitializerExpressionSignatureHelpProvider.cs +++ b/src/Features/CSharp/Portable/SignatureHelp/InitializerExpressionSignatureHelpProvider.cs @@ -61,7 +61,7 @@ protected override async Task GetItemsWorkerAsync(Document d var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false); return CreateCollectionInitializerSignatureHelpItems(addMethods.Select(s => - ConvertMethodGroupMethod(document, s, initializerExpression.OpenBraceToken.SpanStart, semanticModel, cancellationToken)).ToList(), + ConvertMethodGroupMethod(document, s, initializerExpression.OpenBraceToken.SpanStart, semanticModel)).ToList(), textSpan, GetCurrentArgumentState(root, position, syntaxFacts, textSpan, cancellationToken)); } diff --git a/src/Features/CSharp/Portable/SignatureHelp/InvocationExpressionSignatureHelpProviderBase_MethodGroup.cs b/src/Features/CSharp/Portable/SignatureHelp/InvocationExpressionSignatureHelpProviderBase_MethodGroup.cs index 76857bcb6ff..35fe08d09ae 100644 --- a/src/Features/CSharp/Portable/SignatureHelp/InvocationExpressionSignatureHelpProviderBase_MethodGroup.cs +++ b/src/Features/CSharp/Portable/SignatureHelp/InvocationExpressionSignatureHelpProviderBase_MethodGroup.cs @@ -26,7 +26,7 @@ internal partial class InvocationExpressionSignatureHelpProviderBase CancellationToken cancellationToken) { return Task.FromResult( - (accessibleMethods.SelectAsArray(m => ConvertMethodGroupMethod(document, m, invocationExpression.SpanStart, semanticModel, cancellationToken)), + (accessibleMethods.SelectAsArray(m => ConvertMethodGroupMethod(document, m, invocationExpression.SpanStart, semanticModel)), TryGetSelectedIndex(accessibleMethods, currentSymbol))); } diff --git a/src/Features/CSharp/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_NormalType.cs b/src/Features/CSharp/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_NormalType.cs index c5dc9884ead..355a0562895 100644 --- a/src/Features/CSharp/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_NormalType.cs +++ b/src/Features/CSharp/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_NormalType.cs @@ -58,7 +58,7 @@ internal partial class ObjectCreationExpressionSignatureHelpProvider constructor.GetDocumentationPartsFactory(semanticModel, position, documentationCommentFormattingService), GetNormalTypePreambleParts(constructor, semanticModel, position), GetSeparatorParts(), - GetNormalTypePostambleParts(constructor), + GetNormalTypePostambleParts(), constructor.Parameters.Select(p => Convert(p, semanticModel, position, documentationCommentFormattingService)).ToList()); return item; @@ -77,10 +77,7 @@ internal partial class ObjectCreationExpressionSignatureHelpProvider return result; } - private IList GetNormalTypePostambleParts(IMethodSymbol method) - { - return SpecializedCollections.SingletonList( - Punctuation(SyntaxKind.CloseParenToken)); - } + private IList GetNormalTypePostambleParts() + => SpecializedCollections.SingletonList(Punctuation(SyntaxKind.CloseParenToken)); } } -- GitLab