Diagnostics in additional files are not fixable

Fixes #578
dotnet · Aug 7, 2020 · 2d3dd7c · 2d3dd7c
1 parent 93b092f
commit 2d3dd7c
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CodeFix.Testing/CodeFixTest`1.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CodeFix.Testing/CodeFixTest`1.cs
@@ -469,8 +469,10 @@ private async Task VerifyFixAsync(
 
                 previousDiagnostics = analyzerDiagnostics;
 
-                var fixableDiagnostics = analyzerDiagnostics.Where(
-                    diagnostic => codeFixProviders.Any(provider => provider.FixableDiagnosticIds.Contains(diagnostic.Id))).ToImmutableArray();
+                var fixableDiagnostics = analyzerDiagnostics
+                    .Where(diagnostic => codeFixProviders.Any(provider => provider.FixableDiagnosticIds.Contains(diagnostic.Id)))
+                    .Where(diagnostic => project.GetDocument(diagnostic.Location.SourceTree) is object)
+                    .ToImmutableArray();
 
                 if (CodeFixTestBehaviors.HasFlag(CodeFixTestBehaviors.FixOne))
                 {
@@ -603,14 +605,15 @@ private async Task VerifyFixAsync(
 
                     foreach (var codeFixProvider in codeFixProviders)
                     {
-                        if (!codeFixProvider.FixableDiagnosticIds.Contains(diagnostic.Id))
+                        if (!codeFixProvider.FixableDiagnosticIds.Contains(diagnostic.Id)
+                            || !(project.GetDocument(diagnostic.Location.SourceTree) is { } document))
                         {
                             // do not pass unsupported diagnostics to a code fix provider
                             continue;
                         }
 
                         var actionsBuilder = ImmutableArray.CreateBuilder<CodeAction>();
-                        var context = new CodeFixContext(project.GetDocument(diagnostic.Location.SourceTree), diagnostic, (a, d) => actionsBuilder.Add(a), cancellationToken);
+                        var context = new CodeFixContext(document, diagnostic, (a, d) => actionsBuilder.Add(a), cancellationToken);
                         await codeFixProvider.RegisterCodeFixesAsync(context).ConfigureAwait(false);
                         actions.AddRange(FilterCodeActions(actionsBuilder.ToImmutable()).Select(action => (action, codeFixProvider)));
                     }