Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove need to pass generator parameter to helper methods #76627

Merged
merged 6 commits into from
Jan 6, 2025
Merged

Remove need to pass generator parameter to helper methods #76627

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
319c939
Remove need to pass generator parameter to helper methods
CyrusNajmabadi Jan 6, 2025
42ba77c
simplfy
CyrusNajmabadi Jan 6, 2025
835e4eb
API updates
CyrusNajmabadi Jan 6, 2025
09f90e3
Remove parameter
CyrusNajmabadi Jan 6, 2025
651d5aa
Fix
CyrusNajmabadi Jan 6, 2025
6015720
Fix public api
CyrusNajmabadi Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...lyzers/CSharp/CodeFixes/AssignOutParameters/AbstractAssignOutParametersCodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ protected static ImmutableArray<SyntaxNode> GenerateAssignmentStatements(
{
result.Add(generator.ExpressionStatement(generator.AssignmentStatement(
generator.IdentifierName(parameter.Name),
ExpressionGenerator.GenerateExpression(generator, parameter.Type, value: null, canUseFieldReference: false))));
ExpressionGenerator.GenerateExpression(parameter.Type, value: null, canUseFieldReference: false))));
}

return result.ToImmutableAndFree();
Expand Down
16 changes: 8 additions & 8 deletions src/Analyzers/CSharp/CodeFixes/UseLocalFunction/CSharpUseLocalFunctionCodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ protected override async Task FixAllAsync(
foreach (var (localDeclaration, anonymousFunction, references) in nodesFromDiagnostics.OrderByDescending(nodes => nodes.function.SpanStart))
{
var delegateType = (INamedTypeSymbol)semanticModel.GetTypeInfo(anonymousFunction, cancellationToken).ConvertedType;
var parameterList = GenerateParameterList(editor.Generator, anonymousFunction, delegateType.DelegateInvokeMethod);
var parameterList = GenerateParameterList(anonymousFunction, delegateType.DelegateInvokeMethod);
var makeStatic = MakeStatic(semanticModel, makeStaticIfPossible, localDeclaration, cancellationToken);

var currentLocalDeclaration = currentRoot.GetCurrentNode(localDeclaration);
Expand Down Expand Up @@ -237,17 +237,17 @@ private static LocalFunctionStatementSyntax CreateLocalFunctionStatement(
}

private static ParameterListSyntax GenerateParameterList(
SyntaxGenerator generator, AnonymousFunctionExpressionSyntax anonymousFunction, IMethodSymbol delegateMethod)
AnonymousFunctionExpressionSyntax anonymousFunction, IMethodSymbol delegateMethod)
{
var parameterList = TryGetOrCreateParameterList(anonymousFunction);
var i = 0;

return parameterList != null
? parameterList.ReplaceNodes(parameterList.Parameters, (parameterNode, _) => PromoteParameter(generator, parameterNode, delegateMethod.Parameters.ElementAtOrDefault(i++)))
? parameterList.ReplaceNodes(parameterList.Parameters, (parameterNode, _) => PromoteParameter(parameterNode, delegateMethod.Parameters.ElementAtOrDefault(i++)))
: ParameterList([.. delegateMethod.Parameters.Select(parameter =>
PromoteParameter(generator, Parameter(parameter.Name.ToIdentifierToken()), parameter))]);
PromoteParameter(Parameter(parameter.Name.ToIdentifierToken()), parameter))]);

static ParameterSyntax PromoteParameter(SyntaxGenerator generator, ParameterSyntax parameterNode, IParameterSymbol delegateParameter)
static ParameterSyntax PromoteParameter(ParameterSyntax parameterNode, IParameterSymbol delegateParameter)
{
// delegateParameter may be null, consider this case: Action x = (a, b) => { };
// we will still fall back to object
Expand All @@ -259,7 +259,7 @@ static ParameterSyntax PromoteParameter(SyntaxGenerator generator, ParameterSynt

if (delegateParameter?.HasExplicitDefaultValue == true)
{
parameterNode = parameterNode.WithDefault(GetDefaultValue(generator, delegateParameter));
parameterNode = parameterNode.WithDefault(GetDefaultValue(delegateParameter));
}

return parameterNode;
Expand Down Expand Up @@ -312,6 +312,6 @@ private static int TryDetermineParameterIndex(NameColonSyntax argumentNameColon,
return method.Parameters.IndexOf(p => p.Name == name);
}

private static EqualsValueClauseSyntax GetDefaultValue(SyntaxGenerator generator, IParameterSymbol parameter)
=> EqualsValueClause(ExpressionGenerator.GenerateExpression(generator, parameter.Type, parameter.ExplicitDefaultValue, canUseFieldReference: true));
private static EqualsValueClauseSyntax GetDefaultValue(IParameterSymbol parameter)
=> EqualsValueClause(ExpressionGenerator.GenerateExpression(parameter.Type, parameter.ExplicitDefaultValue, canUseFieldReference: true));
}
2 changes: 1 addition & 1 deletion ...es/CSharp/Portable/CodeRefactorings/InlineMethod/CSharpInlineMethodRefactoringProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected override SyntaxNode GenerateTypeSyntax(ITypeSymbol symbol, bool allowV
=> symbol.GenerateTypeSyntax(allowVar);

protected override ExpressionSyntax GenerateLiteralExpression(ITypeSymbol typeSymbol, object? value)
=> ExpressionGenerator.GenerateExpression(CSharpSyntaxGenerator.Instance, typeSymbol, value, canUseFieldReference: true);
=> ExpressionGenerator.GenerateExpression(typeSymbol, value, canUseFieldReference: true);

protected override bool IsFieldDeclarationSyntax(SyntaxNode node)
=> node.IsKind(SyntaxKind.FieldDeclaration);
Expand Down
13 changes: 5 additions & 8 deletions ...res/CSharp/Portable/IntroduceParameter/CSharpIntroduceParameterCodeRefactoringProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,19 @@
namespace Microsoft.CodeAnalysis.CSharp.IntroduceParameter;

[ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.IntroduceParameter), Shared]
internal sealed partial class CSharpIntroduceParameterCodeRefactoringProvider : AbstractIntroduceParameterCodeRefactoringProvider<
[method: ImportingConstructor]
[method: SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification = "Used in test code: https://github.com/dotnet/roslyn/issues/42814")]
internal sealed partial class CSharpIntroduceParameterCodeRefactoringProvider()
: AbstractIntroduceParameterCodeRefactoringProvider<
ExpressionSyntax,
InvocationExpressionSyntax,
ObjectCreationExpressionSyntax,
IdentifierNameSyntax,
ArgumentSyntax>
{
[ImportingConstructor]
[SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification = "Used in test code: https://github.com/dotnet/roslyn/issues/42814")]
public CSharpIntroduceParameterCodeRefactoringProvider()
{
}

protected override SyntaxNode GenerateExpressionFromOptionalParameter(IParameterSymbol parameterSymbol)
{
return ExpressionGenerator.GenerateExpression(CSharpSyntaxGenerator.Instance, parameterSymbol.Type, parameterSymbol.ExplicitDefaultValue, canUseFieldReference: true);
return ExpressionGenerator.GenerateExpression(parameterSymbol.Type, parameterSymbol.ExplicitDefaultValue, canUseFieldReference: true);
}

protected override SyntaxNode? GetLocalDeclarationFromDeclarator(SyntaxNode variableDecl)
Expand Down
100 changes: 5 additions & 95 deletions src/Workspaces/CSharp/Portable/CodeGeneration/CSharpSyntaxGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3134,17 +3134,6 @@ private static StatementSyntax AsStatement(SyntaxNode node)
public override SyntaxNode ExpressionStatement(SyntaxNode expression)
=> SyntaxFactory.ExpressionStatement((ExpressionSyntax)expression);

internal override SyntaxNode MemberAccessExpressionWorker(SyntaxNode? expression, SyntaxNode simpleName)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lots of impls moved to CSharpSyntaxGeneratorInternal.

{
// can only be null in VB
Contract.ThrowIfNull(expression);

return SyntaxFactory.MemberAccessExpression(
SyntaxKind.SimpleMemberAccessExpression,
ParenthesizeLeft((ExpressionSyntax)expression),
(SimpleNameSyntax)simpleName);
}

public override SyntaxNode ConditionalAccessExpression(SyntaxNode expression, SyntaxNode whenNotNull)
=> SyntaxGeneratorInternal.ConditionalAccessExpression(expression, whenNotNull);

Expand All @@ -3155,27 +3144,6 @@ public override SyntaxNode ElementBindingExpression(IEnumerable<SyntaxNode> argu
=> SyntaxFactory.ElementBindingExpression(
SyntaxFactory.BracketedArgumentList([.. arguments.Cast<ArgumentSyntax>()]));

/// <summary>
/// Parenthesize the left hand size of a member access, invocation or element access expression
/// </summary>
private static ExpressionSyntax ParenthesizeLeft(ExpressionSyntax expression)
{
if (expression is TypeSyntax ||
expression.Kind()
is SyntaxKind.ThisExpression
or SyntaxKind.BaseExpression
or SyntaxKind.ParenthesizedExpression
or SyntaxKind.SimpleMemberAccessExpression
or SyntaxKind.InvocationExpression
or SyntaxKind.ElementAccessExpression
or SyntaxKind.MemberBindingExpression)
{
return expression;
}

return (ExpressionSyntax)Parenthesize(expression);
}

private static SeparatedSyntaxList<ExpressionSyntax> AsExpressionList(IEnumerable<SyntaxNode> expressions)
=> [.. expressions.OfType<ExpressionSyntax>()];

Expand Down Expand Up @@ -3212,52 +3180,17 @@ private static ArgumentSyntax AsArgument(SyntaxNode argOrExpression)
=> argOrExpression as ArgumentSyntax ?? SyntaxFactory.Argument((ExpressionSyntax)argOrExpression);

public override SyntaxNode InvocationExpression(SyntaxNode expression, IEnumerable<SyntaxNode> arguments)
=> SyntaxFactory.InvocationExpression(ParenthesizeLeft((ExpressionSyntax)expression), CreateArgumentList(arguments));
=> SyntaxFactory.InvocationExpression(CSharpSyntaxGeneratorInternal.ParenthesizeLeft((ExpressionSyntax)expression), CreateArgumentList(arguments));

public override SyntaxNode ElementAccessExpression(SyntaxNode expression, IEnumerable<SyntaxNode> arguments)
=> SyntaxFactory.ElementAccessExpression(ParenthesizeLeft((ExpressionSyntax)expression), SyntaxFactory.BracketedArgumentList(CreateArguments(arguments)));
=> SyntaxFactory.ElementAccessExpression(CSharpSyntaxGeneratorInternal.ParenthesizeLeft((ExpressionSyntax)expression), SyntaxFactory.BracketedArgumentList(CreateArguments(arguments)));

internal override SyntaxToken NumericLiteralToken(string text, ulong value)
=> SyntaxFactory.Literal(text, value);

public override SyntaxNode DefaultExpression(SyntaxNode type)
=> SyntaxFactory.DefaultExpression((TypeSyntax)type).WithAdditionalAnnotations(Simplifier.Annotation);

public override SyntaxNode DefaultExpression(ITypeSymbol type)
{
// If it's just a reference type, then "null" is the default expression for it. Note:
// this counts for actual reference type, or a type parameter with a 'class' constraint.
// Also, if it's a nullable type, then we can use "null".
if (type.IsReferenceType ||
type is IPointerTypeSymbol ||
type.IsNullable())
{
return SyntaxFactory.LiteralExpression(SyntaxKind.NullLiteralExpression);
}

switch (type.SpecialType)
{
case SpecialType.System_Boolean:
return SyntaxFactory.LiteralExpression(SyntaxKind.FalseLiteralExpression);
case SpecialType.System_SByte:
case SpecialType.System_Byte:
case SpecialType.System_Int16:
case SpecialType.System_UInt16:
case SpecialType.System_Int32:
case SpecialType.System_UInt32:
case SpecialType.System_Int64:
case SpecialType.System_UInt64:
case SpecialType.System_Decimal:
case SpecialType.System_Single:
case SpecialType.System_Double:
return SyntaxFactory.LiteralExpression(
SyntaxKind.NumericLiteralExpression, SyntaxFactory.Literal("0", 0));
}

// Default to a "default(<typename>)" expression.
return DefaultExpression(type.GenerateTypeSyntax());
}

private static SyntaxNode Parenthesize(SyntaxNode expression, bool includeElasticTrivia = true, bool addSimplifierAnnotation = true)
=> CSharpSyntaxGeneratorInternal.Parenthesize(expression, includeElasticTrivia, addSimplifierAnnotation);

Expand All @@ -3270,17 +3203,11 @@ public override SyntaxNode TypeOfExpression(SyntaxNode type)
public override SyntaxNode TryCastExpression(SyntaxNode expression, SyntaxNode type)
=> SyntaxFactory.BinaryExpression(SyntaxKind.AsExpression, (ExpressionSyntax)Parenthesize(expression), (TypeSyntax)type);

public override SyntaxNode CastExpression(SyntaxNode type, SyntaxNode expression)
=> SyntaxFactory.CastExpression((TypeSyntax)type, (ExpressionSyntax)Parenthesize(expression)).WithAdditionalAnnotations(Simplifier.Annotation);

public override SyntaxNode ConvertExpression(SyntaxNode type, SyntaxNode expression)
=> SyntaxFactory.CastExpression((TypeSyntax)type, (ExpressionSyntax)Parenthesize(expression)).WithAdditionalAnnotations(Simplifier.Annotation);

public override SyntaxNode AssignmentStatement(SyntaxNode left, SyntaxNode right)
=> SyntaxFactory.AssignmentExpression(SyntaxKind.SimpleAssignmentExpression, (ExpressionSyntax)left, (ExpressionSyntax)Parenthesize(right));

private static SyntaxNode CreateBinaryExpression(SyntaxKind syntaxKind, SyntaxNode left, SyntaxNode right)
=> SyntaxFactory.BinaryExpression(syntaxKind, (ExpressionSyntax)Parenthesize(left), (ExpressionSyntax)Parenthesize(right));
=> CSharpSyntaxGeneratorInternal.CreateBinaryExpression(syntaxKind, left, right);

public override SyntaxNode ValueEqualsExpression(SyntaxNode left, SyntaxNode right)
=> CreateBinaryExpression(SyntaxKind.EqualsExpression, left, right);
Expand Down Expand Up @@ -3327,9 +3254,6 @@ public override SyntaxNode ModuloExpression(SyntaxNode left, SyntaxNode right)
public override SyntaxNode BitwiseAndExpression(SyntaxNode left, SyntaxNode right)
=> CreateBinaryExpression(SyntaxKind.BitwiseAndExpression, left, right);

public override SyntaxNode BitwiseOrExpression(SyntaxNode left, SyntaxNode right)
=> CreateBinaryExpression(SyntaxKind.BitwiseOrExpression, left, right);

public override SyntaxNode BitwiseNotExpression(SyntaxNode operand)
=> SyntaxFactory.PrefixUnaryExpression(SyntaxKind.BitwiseNotExpression, (ExpressionSyntax)Parenthesize(operand));

Expand All @@ -3355,13 +3279,10 @@ public override SyntaxNode BaseExpression()
=> SyntaxFactory.BaseExpression();

public override SyntaxNode TypedConstantExpression(TypedConstant value)
=> ExpressionGenerator.GenerateExpression(this, value);
=> ExpressionGenerator.GenerateExpression(value);

private protected override SyntaxNode GenerateExpression(ITypeSymbol? type, object? value, bool canUseFieldReference)
=> ExpressionGenerator.GenerateExpression(this, type, value, canUseFieldReference);

public override SyntaxNode IdentifierName(string identifier)
=> identifier.ToIdentifierName();
=> ExpressionGenerator.GenerateExpression(type, value, canUseFieldReference);

public override SyntaxNode GenericName(string identifier, IEnumerable<SyntaxNode> typeArguments)
=> GenericName(identifier.ToIdentifierToken(), typeArguments);
Expand Down Expand Up @@ -3411,17 +3332,6 @@ internal override SyntaxNode GlobalAliasedName(SyntaxNode name)
public override SyntaxNode NameExpression(INamespaceOrTypeSymbol namespaceOrTypeSymbol)
=> namespaceOrTypeSymbol.GenerateNameSyntax();

private protected override SyntaxNode TypeExpression(ITypeSymbol typeSymbol, RefKind refKind)
{
var type = typeSymbol.GenerateTypeSyntax();
return refKind switch
{
RefKind.Ref => SyntaxFactory.RefType(type),
RefKind.RefReadOnly => SyntaxFactory.RefType(RefKeyword, ReadOnlyKeyword, type),
_ => type,
};
}

public override SyntaxNode TypeExpression(SpecialType specialType)
=> SyntaxFactory.PredefinedType(specialType switch
{
Expand Down
Loading
Loading