MA0051 exclude local functions's trivia when skipping local functions (…

…#581)
meziantou · Jul 27, 2023 · a888667 · a888667
1 parent 37c14b6
commit a888667
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/src/Meziantou.Analyzer/Rules/MethodShouldNotBeTooLongAnalyzer.cs b/src/Meziantou.Analyzer/Rules/MethodShouldNotBeTooLongAnalyzer.cs
@@ -90,12 +90,37 @@ private static void AnalyzeNode(SyntaxNodeAnalysisContext context, SyntaxNode? n
                 var localFunctions = node.DescendantNodes(node => !node.IsKind(SyntaxKind.LocalFunctionStatement)).Where(node => node.IsKind(SyntaxKind.LocalFunctionStatement));
                 foreach (var localFunction in localFunctions)
                 {
-                    var functionLocation = localFunction.GetLocation().GetLineSpan();
-                    lines -= functionLocation.EndLinePosition.Line - functionLocation.StartLinePosition.Line;
+                    var firstLine = -1;
+                    var lastLine = -1;
+
+                    if (localFunction.HasLeadingTrivia)
+                    {
+                        firstLine = localFunction.GetLeadingTrivia()[0].GetLocation().GetLineSpan().StartLinePosition.Line;
+                    }
+
+                    if (localFunction.HasTrailingTrivia)
+                    {
+                        lastLine = localFunction.GetTrailingTrivia()[^1].GetLocation().GetLineSpan().EndLinePosition.Line;
+                    }
+
+                    if (firstLine < 0 || lastLine < 0)
+                    {
+                        var functionLocation = localFunction.GetLocation().GetLineSpan();
+                        if (firstLine < 0)
+                        {
+                            firstLine = functionLocation.StartLinePosition.Line;
+                        }
+
+                        if (lastLine < 0)
+                        {
+                            lastLine = functionLocation.EndLinePosition.Line;
+                        }
+                    }
+
+                    lines -= lastLine - firstLine;
                 }
             }
 
-
             if (lines > maximumLines)
             {
                 context.ReportDiagnostic(s_rule, reportNode, $"{lines} lines; maximum allowed: {maximumLines}");

diff --git a/tests/Meziantou.Analyzer.Test/Rules/MethodShouldNotBeTooLongAnalyzerTests.cs b/tests/Meziantou.Analyzer.Test/Rules/MethodShouldNotBeTooLongAnalyzerTests.cs
@@ -90,7 +90,7 @@ await CreateProjectBuilder()
     }
 
     [Fact]
-    public async Task TooLong_SkipLocalFunction()
+    public async Task TooLong_SkipLocalFunction_False()
     {
         const string SourceCode = @"
 public class Test
@@ -100,6 +100,7 @@ public class Test
         var a = 0;
         var b = 0;
         var c = 0;
+
         void A()
         {
             void B() { }
@@ -114,7 +115,7 @@ await CreateProjectBuilder()
     }
 
     [Fact]
-    public async Task ValidMethod_SkipLocalFunction()
+    public async Task ValidMethod_SkipLocalFunction_True()
     {
         const string SourceCode = @"
 public class Test
@@ -124,6 +125,7 @@ void Method()
         var a = 0;
         var b = 0;
         var c = 0;
+
         void A()
         {
             void B() { }
@@ -136,7 +138,7 @@ await CreateProjectBuilder()
               .AddAnalyzerConfiguration("MA0051.skip_local_functions", "true")
               .ValidateAsync();
     }
-    
+
     [Fact]
     public async Task ValidMethod_Statements_SkipLocalFunction()
     {