Update all places that dereference SyntaxTrivia.SyntaxTree to make su…

…re it can't be null #2354
DotNetAnalyzers · Dec 3, 2023 · 145b958 · 145b958
1 parent 349ec90
commit 145b958
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...yzers/StyleCop.Analyzers/SpacingRules/SA1025CodeMustNotContainMultipleWhitespaceInARow.cs b/...yzers/StyleCop.Analyzers/SpacingRules/SA1025CodeMustNotContainMultipleWhitespaceInARow.cs
@@ -81,7 +81,7 @@ private static void HandleWhitespaceTrivia(SyntaxTreeAnalysisContext context, Sy
                 return;
             }
 
-            if (trivia.SyntaxTree.GetMappedLineSpan(trivia.Span).StartLinePosition.Character == 0)
+            if (trivia.SyntaxTree == null || trivia.SyntaxTree.GetMappedLineSpan(trivia.Span).StartLinePosition.Character == 0)
             {
                 return;
             }

diff --git a/...p.Analyzers/StyleCop.Analyzers/SpacingRules/SA1028CodeMustNotContainTrailingWhitespace.cs b/...p.Analyzers/StyleCop.Analyzers/SpacingRules/SA1028CodeMustNotContainTrailingWhitespace.cs
@@ -159,7 +159,7 @@ private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context)
                 previousTrivia = trivia;
             }
 
-            if (previousTrivia.IsKind(SyntaxKind.WhitespaceTrivia) && previousTrivia.Span.End == previousTrivia.SyntaxTree.Length)
+            if (previousTrivia.IsKind(SyntaxKind.WhitespaceTrivia) && previousTrivia.Span.End == previousTrivia.SyntaxTree?.Length)
             {
                 // Report whitespace at the end of the last line in the document
                 context.ReportDiagnostic(Diagnostic.Create(Descriptor, previousTrivia.GetLocation()));