Skip to content

Mark 'Use expr body' as a syntax-only fixer #79971

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

Merged
merged 1 commit into from
Aug 20, 2025
Merged

Mark 'Use expr body' as a syntax-only fixer #79971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions src/Analyzers/CSharp/CodeFixes/UseExpressionBody/UseExpressionBodyCodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,17 @@
namespace Microsoft.CodeAnalysis.CSharp.UseExpressionBody;

[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.UseExpressionBody), Shared]
internal sealed partial class UseExpressionBodyCodeFixProvider : SyntaxEditorBasedCodeFixProvider
[method: ImportingConstructor]
[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
internal sealed partial class UseExpressionBodyCodeFixProvider() : SyntaxEditorBasedCodeFixProvider
{
public sealed override ImmutableArray<string> FixableDiagnosticIds { get; }
private static readonly ImmutableArray<UseExpressionBodyHelper> s_helpers = UseExpressionBodyHelper.Helpers;

private static readonly ImmutableArray<UseExpressionBodyHelper> _helpers = UseExpressionBodyHelper.Helpers;
public sealed override ImmutableArray<string> FixableDiagnosticIds { get; } = s_helpers.SelectAsArray(h => h.DiagnosticId);

[ImportingConstructor]
[Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
public UseExpressionBodyCodeFixProvider()
=> FixableDiagnosticIds = _helpers.SelectAsArray(h => h.DiagnosticId);
#if WORKSPACE
protected override CodeActionCleanup Cleanup => CodeActionCleanup.SyntaxOnly;
#endif

protected override bool IncludeDiagnosticDuringFixAll(Diagnostic diagnostic)
=> !diagnostic.IsSuppressed ||
Expand Down Expand Up @@ -77,7 +78,7 @@ private static void AddEdits(
CancellationToken cancellationToken)
{
var declarationLocation = diagnostic.AdditionalLocations[0];
var helper = _helpers.Single(h => h.DiagnosticId == diagnostic.Id);
var helper = s_helpers.Single(h => h.DiagnosticId == diagnostic.Id);
var declaration = declarationLocation.FindNode(getInnermostNodeForTie: true, cancellationToken);
var useExpressionBody = diagnostic.Properties.ContainsKey(nameof(UseExpressionBody));

Expand Down
2 changes: 2 additions & 0 deletions src/Features/CSharp/Portable/UseExpressionBody/UseExpressionBodyCodeRefactoringProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ internal sealed class UseExpressionBodyCodeRefactoringProvider() : SyntaxEditorB
private static readonly BidirectionalMap<(UseExpressionBodyHelper helper, bool useExpressionBody), string> s_equivalenceKeyMap
= CreateEquivalanceKeyMap(UseExpressionBodyHelper.Helpers);

protected override CodeActionCleanup Cleanup => CodeActionCleanup.SyntaxOnly;

private static BidirectionalMap<(UseExpressionBodyHelper helper, bool useExpressionBody), string> CreateEquivalanceKeyMap(
ImmutableArray<UseExpressionBodyHelper> helpers)
{
Expand Down
Loading