Merge pull request #42878 from CyrusNajmabadi/useExprBody

Use expression-bodies for very simple members.

Author: CyrusNajmabadi

src/Analyzers/CSharp/Analyzers/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionDiagnosticAnalyzer.Analyzer.cs

@@ -115,9 +115,7 @@ private static bool IsDefaultSwitchLabel(SwitchLabelSyntax node)
             }
 
             public override SyntaxKind VisitSwitchStatement(SwitchStatementSyntax node)
-            {
-                return AnalyzeSwitchStatement(node, out _);
-            }
+                => AnalyzeSwitchStatement(node, out _);
 
             private SyntaxKind AnalyzeSwitchStatement(SwitchStatementSyntax switchStatement, out bool shouldRemoveNextStatement)
             {

src/Analyzers/CSharp/Analyzers/UseExpressionBody/Helpers/UseExpressionBodyForIndexersHelper.cs

@@ -54,9 +54,7 @@ protected override IndexerDeclarationSyntax WithBody(IndexerDeclarationSyntax de
         }
 
         protected override IndexerDeclarationSyntax WithGenerateBody(SemanticModel semanticModel, IndexerDeclarationSyntax declaration)
-        {
-            return WithAccessorList(semanticModel, declaration);
-        }
+            => WithAccessorList(semanticModel, declaration);
 
         protected override bool CreateReturnStatementForExpression(SemanticModel semanticModel, IndexerDeclarationSyntax declaration) => true;
 

src/Analyzers/CSharp/Analyzers/UseExpressionBody/Helpers/UseExpressionBodyForPropertiesHelper.cs

@@ -54,9 +54,7 @@ protected override PropertyDeclarationSyntax WithBody(PropertyDeclarationSyntax
         }
 
         protected override PropertyDeclarationSyntax WithGenerateBody(SemanticModel semanticModel, PropertyDeclarationSyntax declaration)
-        {
-            return WithAccessorList(semanticModel, declaration);
-        }
+            => WithAccessorList(semanticModel, declaration);
 
         protected override bool CreateReturnStatementForExpression(SemanticModel semanticModel, PropertyDeclarationSyntax declaration) => true;
 

src/Analyzers/CSharp/Analyzers/UseExpressionBody/Helpers/UseExpressionBodyHelper`1.cs

@@ -295,8 +295,6 @@ protected TDeclaration WithAccessorList(SemanticModel semanticModel, TDeclaratio
         }
 
         protected virtual TDeclaration WithAccessorList(TDeclaration declaration, AccessorListSyntax accessorListSyntax)
-        {
-            throw new NotImplementedException();
-        }
+            => throw new NotImplementedException();
     }
 }

src/Analyzers/CSharp/CodeFixes/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionCodeFixProvider.Rewriter.cs

@@ -22,9 +22,7 @@ private sealed class Rewriter : CSharpSyntaxVisitor<ExpressionSyntax>
             private readonly bool _isAllThrowStatements;
 
             private Rewriter(bool isAllThrowStatements)
-            {
-                _isAllThrowStatements = isAllThrowStatements;
-            }
+                => _isAllThrowStatements = isAllThrowStatements;
 
             public static StatementSyntax Rewrite(
                 SwitchStatementSyntax switchStatement,
@@ -145,9 +143,7 @@ private ExpressionSyntax RewriteStatements(SyntaxList<StatementSyntax> statement
             }
 
             public override ExpressionSyntax VisitSwitchStatement(SwitchStatementSyntax node)
-            {
-                return RewriteSwitchStatement(node);
-            }
+                => RewriteSwitchStatement(node);
 
             private static SwitchLabelSyntax SingleOrDefaultSwitchLabel(SyntaxList<SwitchLabelSyntax> labels)
             {
@@ -204,14 +200,10 @@ public override ExpressionSyntax VisitThrowStatement(ThrowStatementSyntax node)
             }
 
             public override ExpressionSyntax VisitExpressionStatement(ExpressionStatementSyntax node)
-            {
-                return Visit(node.Expression);
-            }
+                => Visit(node.Expression);
 
             public override ExpressionSyntax DefaultVisit(SyntaxNode node)
-            {
-                throw ExceptionUtilities.UnexpectedValue(node.Kind());
-            }
+                => throw ExceptionUtilities.UnexpectedValue(node.Kind());
         }
     }
 }

src/Analyzers/CSharp/CodeFixes/UseExpressionBody/UseExpressionBodyCodeFixProvider.cs

@@ -32,9 +32,7 @@ internal partial class UseExpressionBodyCodeFixProvider : SyntaxEditorBasedCodeF
         [ImportingConstructor]
         [SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification = "Used in test code: https://github.com/dotnet/roslyn/issues/42814")]
         public UseExpressionBodyCodeFixProvider()
-        {
-            FixableDiagnosticIds = _helpers.SelectAsArray(h => h.DiagnosticId);
-        }
+            => FixableDiagnosticIds = _helpers.SelectAsArray(h => h.DiagnosticId);
 
         protected override bool IncludeDiagnosticDuringFixAll(Diagnostic diagnostic)
             => !diagnostic.IsSuppressed ||

src/Analyzers/CSharp/Tests/QualifyMemberAccess/QualifyMemberAccessTests.cs

@@ -21,19 +21,13 @@ internal override (DiagnosticAnalyzer, CodeFixProvider) CreateDiagnosticProvider
             => (new CSharpQualifyMemberAccessDiagnosticAnalyzer(), new CSharpQualifyMemberAccessCodeFixProvider());
 
         private Task TestAsyncWithOption(string code, string expected, PerLanguageOption2<CodeStyleOption2<bool>> option)
-        {
-            return TestAsyncWithOptionAndNotificationOption(code, expected, option, NotificationOption2.Error);
-        }
+            => TestAsyncWithOptionAndNotificationOption(code, expected, option, NotificationOption2.Error);
 
         private Task TestAsyncWithOptionAndNotificationOption(string code, string expected, PerLanguageOption2<CodeStyleOption2<bool>> option, NotificationOption2 notification)
-        {
-            return TestInRegularAndScriptAsync(code, expected, options: Option(option, true, notification));
-        }
+            => TestInRegularAndScriptAsync(code, expected, options: Option(option, true, notification));
 
         private Task TestMissingAsyncWithOption(string code, PerLanguageOption2<CodeStyleOption2<bool>> option)
-        {
-            return TestMissingAsyncWithOptionAndNotificationOption(code, option, NotificationOption2.Error);
-        }
+            => TestMissingAsyncWithOptionAndNotificationOption(code, option, NotificationOption2.Error);
 
         private Task TestMissingAsyncWithOptionAndNotificationOption(string code, PerLanguageOption2<CodeStyleOption2<bool>> option, NotificationOption2 notification)
             => TestMissingInRegularAndScriptAsync(code, new TestParameters(options: Option(option, true, notification)));

src/Analyzers/CSharp/Tests/UsePatternMatching/CSharpAsAndNullCheckTests.cs

@@ -50,9 +50,7 @@ public async Task InlineTypeCheck1(string input, string output)
         [InlineData("(x = o as string) == null", "!(o is string x)")]
         [InlineData("null == (x = o as string)", "!(o is string x)")]
         public async Task InlineTypeCheck2(string input, string output)
-        {
-            await TestStatement($"while ({input}) {{ }}", $"while ({output}) {{ }}");
-        }
+            => await TestStatement($"while ({input}) {{ }}", $"while ({output}) {{ }}");
 
         private async Task TestStatement(string input, string output)
         {

src/Analyzers/Core/Analyzers/AbstractBuiltInCodeStyleDiagnosticAnalyzer.cs

@@ -200,14 +200,10 @@ private static void AddDiagnosticIdToOptionMapping(string diagnosticId, ILanguag
         }
 
         private static void AddDiagnosticIdToOptionMapping(string diagnosticId, ImmutableHashSet<IPerLanguageOption> options)
-        {
-            IDEDiagnosticIdToOptionMappingHelper.AddOptionMapping(diagnosticId, options);
-        }
+            => IDEDiagnosticIdToOptionMappingHelper.AddOptionMapping(diagnosticId, options);
 
         private static void AddDiagnosticIdToOptionMapping(string diagnosticId, ImmutableHashSet<ILanguageSpecificOption> options, string language)
-        {
-            IDEDiagnosticIdToOptionMappingHelper.AddOptionMapping(diagnosticId, options, language);
-        }
+            => IDEDiagnosticIdToOptionMappingHelper.AddOptionMapping(diagnosticId, options, language);
 
         public abstract DiagnosticAnalyzerCategory GetAnalyzerCategory();
 

src/Analyzers/Core/Analyzers/Helpers/DiagnosticHelper.cs

@@ -162,9 +162,7 @@ public sealed class LocalizableStringWithArguments : LocalizableString, IObjectW
             private readonly string[] _formatArguments;
 
             static LocalizableStringWithArguments()
-            {
-                ObjectBinder.RegisterTypeReader(typeof(LocalizableStringWithArguments), reader => new LocalizableStringWithArguments(reader));
-            }
+                => ObjectBinder.RegisterTypeReader(typeof(LocalizableStringWithArguments), reader => new LocalizableStringWithArguments(reader));
 
             public LocalizableStringWithArguments(LocalizableString messageFormat, params object[] formatArguments)
             {