Update all places that dereference SyntaxTrivia.SyntaxTree to make sure it can't be null

bjornhellander · bjornhellander · commit 145b958244d5 · 2023-12-03T11:19:21.000+01:00
#2354
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1025CodeMustNotContainMultipleWhitespaceInARow.cs b/StyleCop.Analyzers/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/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1028CodeMustNotContainTrailingWhitespace.cs b/StyleCop.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()));

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ private static void HandleWhitespaceTrivia(SyntaxTreeAnalysisContext context, Sy`
`81`	`81`	`return;`
`82`	`82`	`}`
`83`	`83`
`84`		`- if (trivia.SyntaxTree.GetMappedLineSpan(trivia.Span).StartLinePosition.Character == 0)`
	`84`	`+ if (trivia.SyntaxTree == null \|\| trivia.SyntaxTree.GetMappedLineSpan(trivia.Span).StartLinePosition.Character == 0)`
`85`	`85`	`{`
`86`	`86`	`return;`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context)`
`159`	`159`	`previousTrivia = trivia;`
`160`	`160`	`}`
`161`	`161`
`162`		`- if (previousTrivia.IsKind(SyntaxKind.WhitespaceTrivia) && previousTrivia.Span.End == previousTrivia.SyntaxTree.Length)`
	`162`	`+ if (previousTrivia.IsKind(SyntaxKind.WhitespaceTrivia) && previousTrivia.Span.End == previousTrivia.SyntaxTree?.Length)`
`163`	`163`	`{`
`164`	`164`	`// Report whitespace at the end of the last line in the document`
`165`	`165`	`context.ReportDiagnostic(Diagnostic.Create(Descriptor, previousTrivia.GetLocation()));`