Merge branch 'addUsingOOP6' into addUsingOOP7

src/Features/Core/Portable/AddImport/AbstractAddImportCodeFixProvider.cs

@@ -48,7 +48,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
                 : null;
 
             var packageSources = symbolSearchService != null && searchNuGetPackages
-                ? GetPackageInstallerService(document).PackageSources
+                ? GetPackageSources(document)
                 : ImmutableArray<PackageSource>.Empty;
 
             // We might have multiple different diagnostics covering the same span.  Have to
@@ -82,6 +82,9 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
         private IPackageInstallerService GetPackageInstallerService(Document document)
             => _packageInstallerService ?? document.Project.Solution.Workspace.Services.GetService<IPackageInstallerService>();
 
+        private ImmutableArray<PackageSource> GetPackageSources(Document document)
+            => GetPackageInstallerService(document)?.PackageSources ?? ImmutableArray<PackageSource>.Empty;
+
         private CodeAction TryCreateCodeAction(Document document, AddImportFixData fixData)
         {
             if (fixData == null)