提交 11c26899 编写于 作者: D David Wengier

Formatting changes from PR feedback

上级 ecd15e70
......@@ -36,9 +36,7 @@ public CSharpConvertTupleToStructCodeRefactoringProvider()
}
protected override ArgumentSyntax GetArgumentWithChangedName(ArgumentSyntax argument, string name)
{
return argument.WithNameColon(ChangeName(argument.NameColon, name));
}
=> argument.WithNameColon(ChangeName(argument.NameColon, name));
private static NameColonSyntax? ChangeName(NameColonSyntax? nameColon, string name)
{
......
......@@ -53,6 +53,8 @@ internal abstract partial class AbstractConvertTupleToStructCodeRefactoringProvi
where TTypeBlockSyntax : SyntaxNode
where TNamespaceDeclarationSyntax : SyntaxNode
{
protected abstract TArgumentSyntax GetArgumentWithChangedName(TArgumentSyntax argument, string name);
public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
{
var (document, textSpan, cancellationToken) = context;
......@@ -305,7 +307,7 @@ private static string GetTitle(Scope scope)
// We should only ever get a default array (meaning, update the root), or a
// non-empty array. We should never be asked to update exactly '0' nodes.
Debug.Assert(documentToUpdate.NodesToUpdate.IsDefault ||
!documentToUpdate.NodesToUpdate.IsEmpty);
!documentToUpdate.NodesToUpdate.IsEmpty);
// If we were given specific nodes to update, only update those. Otherwise
// updated everything from the root down.
......@@ -679,8 +681,6 @@ private SyntaxNodeOrToken ConvertArgumentOrToken(SyntaxGenerator generator, Synt
return (TArgumentSyntax)generator.Argument(expr).WithTriviaFrom(argument);
}
protected abstract TArgumentSyntax GetArgumentWithChangedName(TArgumentSyntax argument, string name);
private static async Task<bool> ReplaceMatchingTupleTypesAsync(
Document document, SyntaxEditor editor, SyntaxNode startingNode,
INamedTypeSymbol tupleType, TNameSyntax qualifiedTypeName,
......@@ -879,7 +879,7 @@ private SyntaxNodeOrToken ConvertArgumentOrToken(SyntaxGenerator generator, Synt
}
private static string GetConstructorParameterName(string name)
=> name.ToCamelCase(trimLeadingTypePrefix: false);
=> name.ToCamelCase(trimLeadingTypePrefix: false); // TODO: This is the common case, but should ideally match the users style preference
private class MyCodeAction : CodeAction.SolutionChangeAction
{
......
......@@ -40,14 +40,14 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ConvertTupleToStruct
Dim nameColonEquals = simpleArgument.NameColonEquals
If nameColonEquals Is Nothing Then
Return argument
End If
Return simpleArgument.WithNameColonEquals(ChangeName(nameColonEquals, name))
End Function
Private Shared Function ChangeName(nameColonEquals As NameColonEqualsSyntax, name As String) As NameColonEqualsSyntax
If nameColonEquals Is Nothing Then
Return Nothing
End If
Dim newName = SyntaxFactory.IdentifierName(name).WithTriviaFrom(nameColonEquals.Name)
Return nameColonEquals.WithName(newName)
End Function
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册