Improvement

Author: marinasundstrom

CheckedExceptions/CheckedExceptionsAnalyzer.Shared.cs

@@ -1,5 +1,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
 
 namespace Sundstrom.CheckedExceptions;
 
@@ -124,11 +125,20 @@ private IEnumerable<INamedTypeSymbol> GetExceptionTypes(AttributeSyntax attribut
         return node.Ancestors().OfType<CatchClauseSyntax>().FirstOrDefault();
     }
 
-    private static SyntaxNode GetSignificantNode(SyntaxNode expression)
+    private static Location GetSignificantLocation(SyntaxNode expression)
+    {
+        if (expression is InvocationExpressionSyntax)
+            return GetSignificantInvocationLocation(expression);
+
+        var node = GetSignificantNodeCore(expression);
+        return node.GetLocation();
+    }
+
+    private static SyntaxNode GetSignificantNodeCore(SyntaxNode expression)
     {
         if (expression is InvocationExpressionSyntax ie)
         {
-            return GetSignificantNode(ie.Expression);
+            return GetSignificantNodeCore(ie.Expression);
         }
 
         if (expression is MemberAccessExpressionSyntax mae)
@@ -138,4 +148,22 @@ private static SyntaxNode GetSignificantNode(SyntaxNode expression)
 
         return expression;
     }
+
+    private static Location GetSignificantInvocationLocation(SyntaxNode expression)
+    {
+        if (expression is InvocationExpressionSyntax invocation)
+        {
+            // Get the name part (e.g., bar in foo.bar(s))
+            var nameNode = GetSignificantNodeCore(invocation.Expression);
+
+            // Compute the span from name start to the full invocation end
+            var start = nameNode.SpanStart;
+            var end = invocation.Span.End;
+
+            var span = TextSpan.FromBounds(start, end);
+            return Location.Create(invocation.SyntaxTree, span);
+        }
+
+        return expression.GetLocation();
+    }
 }

CheckedExceptions/CheckedExceptionsAnalyzer.cs

@@ -351,7 +351,7 @@ private void AnalyzeExceptionsInTryBlock(SyntaxNodeAnalysisContext context, TryS
                 if (ShouldIgnore(throwStatement, mode))
                 {
                     // Report as THROW002 (Info level)
-                    var diagnostic = Diagnostic.Create(RuleIgnoredException, throwStatement.GetLocation(), exceptionType.Name);
+                    var diagnostic = Diagnostic.Create(RuleIgnoredException, GetSignificantLocation(throwStatement), exceptionType.Name);
                     context.ReportDiagnostic(diagnostic);
                     continue;
                 }
@@ -368,7 +368,7 @@ private void AnalyzeExceptionsInTryBlock(SyntaxNodeAnalysisContext context, TryS
                 // Report diagnostic for unhandled exception
                 var diagnostic = Diagnostic.Create(
                     RuleUnhandledException,
-                    throwStatement.GetLocation(),
+                    GetSignificantLocation(throwStatement),
                     exceptionType.Name,
                     THROW001Verbs.MightBe);
 
@@ -1195,7 +1195,7 @@ private void AnalyzeExceptionThrowingNode(
             if (ShouldIgnore(node, mode))
             {
                 // Report as THROW002 (Info level)
-                var diagnostic = Diagnostic.Create(RuleIgnoredException, GetSignificantNode(node).GetLocation(), exceptionType.Name);
+                var diagnostic = Diagnostic.Create(RuleIgnoredException, GetSignificantLocation(node), exceptionType.Name);
                 context.ReportDiagnostic(diagnostic);
                 return;
             }
@@ -1204,7 +1204,7 @@ private void AnalyzeExceptionThrowingNode(
         // Check for general exceptions
         if (IsGeneralException(exceptionType))
         {
-            context.ReportDiagnostic(Diagnostic.Create(RuleGeneralThrow, GetSignificantNode(node).GetLocation()));
+            context.ReportDiagnostic(Diagnostic.Create(RuleGeneralThrow, GetSignificantLocation(node)));
         }
 
         // Check if the exception is declared via [Throws]
@@ -1223,7 +1223,7 @@ private void AnalyzeExceptionThrowingNode(
 
             var verb = isThrowingConstruct ? THROW001Verbs.Is : THROW001Verbs.MightBe;
 
-            var diagnostic = Diagnostic.Create(RuleUnhandledException, GetSignificantNode(node).GetLocation(), properties, exceptionType.Name, verb);
+            var diagnostic = Diagnostic.Create(RuleUnhandledException, GetSignificantLocation(node), properties, exceptionType.Name, verb);
             context.ReportDiagnostic(diagnostic);
         }
     }