Respect diagnostic RCS0062 for RCS1016 and RR0169

dotnet · Jan 20, 2025 · c3d6fce · c3d6fce
1 parent 392c421
commit c3d6fce
Show file tree

Hide file tree

Showing 5 changed files with 201 additions and 61 deletions.
diff --git a/src/Common/CSharp/Analysis/ConvertExpressionBodyAnalysis.cs b/src/Common/CSharp/Analysis/ConvertExpressionBodyAnalysis.cs
@@ -0,0 +1,24 @@
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Roslynator.CSharp.Analysis;
+
+internal static class ConvertExpressionBodyAnalysis
+{
+    public static bool AllowPutExpressionBodyOnItsOwnLine(SyntaxKind syntaxKind)
+    {
+        // allow putting expression on new line for all method-like declarations, except for accessors.
+        switch (syntaxKind)
+        {
+            case SyntaxKind.MethodDeclaration:
+            case SyntaxKind.ConstructorDeclaration:
+            case SyntaxKind.DestructorDeclaration:
+            case SyntaxKind.PropertyDeclaration:
+            case SyntaxKind.IndexerDeclaration:
+            case SyntaxKind.OperatorDeclaration:
+            case SyntaxKind.ConversionOperatorDeclaration:
+                return true;
+            default:
+                return false;
+        }
+    }
+}
diff --git a/src/Formatting.Analyzers/CSharp/PutExpressionBodyOnItsOwnLineAnalyzer.cs b/src/Formatting.Analyzers/CSharp/PutExpressionBodyOnItsOwnLineAnalyzer.cs
@@ -6,6 +6,7 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Roslynator.CSharp;
+using Roslynator.CSharp.Analysis;
 using Roslynator.CSharp.CodeStyle;
 
 namespace Roslynator.Formatting.CSharp;
@@ -37,17 +38,9 @@ private static void AnalyzeArrowExpressionClause(SyntaxNodeAnalysisContext conte
     {
         var arrowExpressionClause = (ArrowExpressionClauseSyntax)context.Node;
 
-        switch (arrowExpressionClause.Parent.Kind())
+        if (ConvertExpressionBodyAnalysis.AllowPutExpressionBodyOnItsOwnLine(arrowExpressionClause.Parent.Kind()))
         {
-            case SyntaxKind.MethodDeclaration:
-            case SyntaxKind.ConstructorDeclaration:
-            case SyntaxKind.DestructorDeclaration:
-            case SyntaxKind.PropertyDeclaration:
-            case SyntaxKind.IndexerDeclaration:
-            case SyntaxKind.OperatorDeclaration:
-            case SyntaxKind.ConversionOperatorDeclaration:
-                AnalyzeArrowExpressionClause(arrowExpressionClause.ArrowToken, context);
-                break;
+            AnalyzeArrowExpressionClause(arrowExpressionClause.ArrowToken, context);
         }
     }