提交 1fcb4464 编写于 作者: C Cyrus Najmabadi

Remove parameters

上级 1bbda3e6
......@@ -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);
}
......
......@@ -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<SymbolDisplayPart> GetPostambleParts(IMethodSymbol method)
{
return SpecializedCollections.SingletonList(
Punctuation(SyntaxKind.CloseParenToken));
}
private IList<SymbolDisplayPart> GetPostambleParts()
=> SpecializedCollections.SingletonList(Punctuation(SyntaxKind.CloseParenToken));
}
}
......@@ -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: <expression>?[
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<SymbolDisplayPart> GetPostambleParts(IPropertySymbol indexer)
{
return SpecializedCollections.SingletonList(
Punctuation(SyntaxKind.CloseBracketToken));
}
private IList<SymbolDisplayPart> 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));
......
......@@ -61,7 +61,7 @@ protected override async Task<SignatureHelpItems> 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));
}
......
......@@ -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)));
}
......
......@@ -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<SymbolDisplayPart> GetNormalTypePostambleParts(IMethodSymbol method)
{
return SpecializedCollections.SingletonList(
Punctuation(SyntaxKind.CloseParenToken));
}
private IList<SymbolDisplayPart> GetNormalTypePostambleParts()
=> SpecializedCollections.SingletonList(Punctuation(SyntaxKind.CloseParenToken));
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册