Merge pull request dotnet#6982 from drewnoakes/fix-nullable-field-access

drewnoakes · web-flow · commit 8226af925a47 · 2021-02-22T13:53:22.000+11:00
Fix nullable field access
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/TempPE/DesignTimeInputsChangeTracker.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/TempPE/DesignTimeInputsChangeTracker.cs
@@ -229,7 +229,7 @@ void AddAllInputsToQueue(bool ignoreFileWriteTime)
         private void PublishSnapshot(DesignTimeInputSnapshot snapshot)
         {
             _version++;
-            _broadcastBlock.Post(new ProjectVersionedValue<DesignTimeInputSnapshot>(
+            _broadcastBlock?.Post(new ProjectVersionedValue<DesignTimeInputSnapshot>(
                 snapshot,
                 Empty.ProjectValueVersions.Add(DataSourceKey, _version)));
         }
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/TempPE/DesignTimeInputsFileWatcher.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/TempPE/DesignTimeInputsFileWatcher.cs
@@ -131,7 +131,7 @@ private async Task ProcessDesignTimeInputs(IProjectVersionedValue<DesignTimeInpu
         private void PublishFiles(string[] files)
         {
             _version++;
-            _broadcastBlock.Post(new ProjectVersionedValue<string[]>(
+            _broadcastBlock?.Post(new ProjectVersionedValue<string[]>(
                 files,
                 Empty.ProjectValueVersions.Add(DataSourceKey, _version)));
         }
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/IProjectTreeExtensions.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/IProjectTreeExtensions.cs
@@ -51,7 +51,7 @@ internal static class IProjectTreeExtensions
 
             IRule? properties = node.BrowseObjectProperties;
 
-            if (properties == null || properties.Schema == null || !project.Services.PropertyPagesCatalog.SourceBlock.TryReceive(null, out IProjectVersionedValue<IProjectCatalogSnapshot> catalogSnapshot))
+            if (properties?.Schema == null || !project.Services.PropertyPagesCatalog.SourceBlock.TryReceive(null, out IProjectVersionedValue<IProjectCatalogSnapshot>? catalogSnapshot))
                 return properties;
 
             // We let the snapshot be out of date with the "live" project
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Mocks/ProjectValueDataSource.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Mocks/ProjectValueDataSource.cs
@@ -59,7 +59,7 @@ public async Task SendAsync(T value)
             EnsureInitialized(true);
 
             _version++;
-            await _broadcastBlock.SendAsync(new ProjectVersionedValue<T>(
+            await _broadcastBlock!.SendAsync(new ProjectVersionedValue<T>(
                      value,
                      ImmutableDictionary<NamedIdentity, IComparable>.Empty.Add(DataSourceKey, _version)));
         }

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ void AddAllInputsToQueue(bool ignoreFileWriteTime)`
`229`	`229`	`private void PublishSnapshot(DesignTimeInputSnapshot snapshot)`
`230`	`230`	`{`
`231`	`231`	`_version++;`
`232`		`- _broadcastBlock.Post(new ProjectVersionedValue<DesignTimeInputSnapshot>(`
	`232`	`+ _broadcastBlock?.Post(new ProjectVersionedValue<DesignTimeInputSnapshot>(`
`233`	`233`	`snapshot,`
`234`	`234`	`Empty.ProjectValueVersions.Add(DataSourceKey, _version)));`
`235`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ private async Task ProcessDesignTimeInputs(IProjectVersionedValue<DesignTimeInpu`
`131`	`131`	`private void PublishFiles(string[] files)`
`132`	`132`	`{`
`133`	`133`	`_version++;`
`134`		`- _broadcastBlock.Post(new ProjectVersionedValue<string[]>(`
	`134`	`+ _broadcastBlock?.Post(new ProjectVersionedValue<string[]>(`
`135`	`135`	`files,`
`136`	`136`	`Empty.ProjectValueVersions.Add(DataSourceKey, _version)));`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public async Task SendAsync(T value)`
`59`	`59`	`EnsureInitialized(true);`
`60`	`60`
`61`	`61`	`_version++;`
`62`		`- await _broadcastBlock.SendAsync(new ProjectVersionedValue<T>(`
	`62`	`+ await _broadcastBlock!.SendAsync(new ProjectVersionedValue<T>(`
`63`	`63`	`value,`
`64`	`64`	`ImmutableDictionary<NamedIdentity, IComparable>.Empty.Add(DataSourceKey, _version)));`
`65`	`65`	`}`