apply comments

Author: mary-georgiou-sonarsource

analyzers/src/SonarAnalyzer.CSharp/Rules/InfiniteRecursion.RoslynCfg.cs

@@ -30,18 +30,12 @@ private sealed class RoslynChecker : IChecker
         public void CheckForNoExitProperty(SonarSyntaxNodeReportingContext c, PropertyDeclarationSyntax property, IPropertySymbol propertySymbol) =>
             CheckForNoExit(c,
                 propertySymbol,
-                property.ExpressionBody,
-                property.AccessorList,
-                property.Identifier.GetLocation(),
                 "property's recursion",
                 "property accessor's recursion");
 
         public void CheckForNoExitIndexer(SonarSyntaxNodeReportingContext c, IndexerDeclarationSyntax indexer, IPropertySymbol propertySymbol) =>
             CheckForNoExit(c,
                 propertySymbol,
-                indexer.ExpressionBody,
-                indexer.AccessorList,
-                indexer.ThisKeyword.GetLocation(),
                 "indexer's recursion",
                 "indexer accessor's recursion");
 
@@ -71,12 +65,26 @@ public void CheckForNoExitMethod(SonarSyntaxNodeReportingContext c, SyntaxNode b
 
         private static void CheckForNoExit(SonarSyntaxNodeReportingContext c,
                                    IPropertySymbol propertySymbol,
-                                   ArrowExpressionClauseSyntax expressionBody,
-                                   AccessorListSyntax accessorList,
-                                   Location location,
                                    string arrowExpressionMessageArg,
                                    string accessorMessageArg)
         {
+            ArrowExpressionClauseSyntax expressionBody = null;
+            AccessorListSyntax accessorList = null;
+            Location location = null;
+
+            if (c.Node is PropertyDeclarationSyntax propertyDeclaration)
+            {
+                expressionBody = propertyDeclaration.ExpressionBody;
+                accessorList = propertyDeclaration.AccessorList;
+                location = propertyDeclaration.Identifier.GetLocation();
+            }
+            else if (c.Node is IndexerDeclarationSyntax indexerDeclaration)
+            {
+                expressionBody = indexerDeclaration.ExpressionBody;
+                accessorList = indexerDeclaration.AccessorList;
+                location = indexerDeclaration.ThisKeyword.GetLocation();
+            }
+
             if (expressionBody?.Expression is not null)
             {
                 var cfg = ControlFlowGraph.Create(expressionBody, c.SemanticModel, c.Cancel);

analyzers/src/SonarAnalyzer.CSharp/Rules/InfiniteRecursion.cs

@@ -74,32 +74,23 @@ protected override void Initialize(SonarAnalysisContext context)
             c =>
             {
                 var property = (PropertyDeclarationSyntax)c.Node;
-                if (c.SemanticModel.GetDeclaredSymbol(property) is { } propertySymbol)
-                {
-                    checker.CheckForNoExitProperty(c, property, propertySymbol);
-                }
+                checker.CheckForNoExitProperty(c, property, c.SemanticModel.GetDeclaredSymbol(property));
             },
             SyntaxKind.PropertyDeclaration);
 
         context.RegisterNodeAction(
             c =>
             {
                 var indexer = (IndexerDeclarationSyntax)c.Node;
-                if (c.SemanticModel.GetDeclaredSymbol(indexer) is { } indexerSymbol)
-                {
-                    checker.CheckForNoExitIndexer(c, indexer, indexerSymbol);
-                }
+                checker.CheckForNoExitIndexer(c, indexer, c.SemanticModel.GetDeclaredSymbol(indexer));
             },
             SyntaxKind.IndexerDeclaration);
 
         context.RegisterNodeAction(
             c =>
             {
                 var eventDeclaration = (EventDeclarationSyntax)c.Node;
-                if (c.SemanticModel.GetDeclaredSymbol(eventDeclaration) is { } eventSymbol)
-                {
-                    checker.CheckForNoExitEvent(c, eventDeclaration, eventSymbol);
-                }
+                checker.CheckForNoExitEvent(c, eventDeclaration, c.SemanticModel.GetDeclaredSymbol(eventDeclaration));
             },
             SyntaxKind.EventDeclaration);
     }