Merge pull request #8898 from davkean/dev/davkean/LazyWorkspace

Avoid instantiating Roslyn package via RenamerProjectTreeActionHandler

Author: tmeschter

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Rename/RenamerProjectTreeActionHandler.cs

@@ -31,15 +31,15 @@ internal partial class RenamerProjectTreeActionHandler : ProjectTreeActionHandle
         private readonly IUserNotificationServices _userNotificationServices;
         private readonly IWaitIndicator _waitService;
         private readonly IRoslynServices _roslynServices;
-        private readonly Workspace _workspace;
+        private readonly Lazy<Workspace> _workspace;
         private readonly IVsService<SVsOperationProgress, IVsOperationProgressStatusService> _operationProgressService;
         private readonly IVsService<SVsSettingsPersistenceManager, ISettingsManager> _settingsManagerService;
 
         [ImportingConstructor]
         public RenamerProjectTreeActionHandler(
             UnconfiguredProject unconfiguredProject,
             IUnconfiguredProjectVsServices projectVsServices,
-            [Import(typeof(VisualStudioWorkspace))] Workspace workspace,
+            [Import(typeof(VisualStudioWorkspace))]Lazy<Workspace> workspace,
             IEnvironmentOptions environmentOptions,
             IUserNotificationServices userNotificationServices,
             IRoslynServices roslynServices,
@@ -155,7 +155,7 @@ private async Task<Solution> PublishLatestSolutionAsync(CancellationToken cancel
             await stageStatus.WaitForCompletionAsync().WithCancellation(cancellationToken);
 
             // The result of that wait, is basically a "new" published Solution, so grab it
-            return _workspace.CurrentSolution;
+            return _workspace.Value.CurrentSolution;
         }
 
         private static async Task<(bool, Renamer.RenameDocumentActionSet?)> GetRenameSymbolsActionsAsync(CodeAnalysis.Project project, string? oldFilePath, string newFileWithExtension)
@@ -220,7 +220,7 @@ protected virtual async Task<bool> IsAutomationFunctionAsync()
         }
 
         private CodeAnalysis.Project? GetCurrentProject() =>
-            _workspace.CurrentSolution.Projects.FirstOrDefault(proj => StringComparers.Paths.Equals(proj.FilePath, _projectVsServices.Project.FullPath));
+            _workspace.Value.CurrentSolution.Projects.FirstOrDefault(proj => StringComparers.Paths.Equals(proj.FilePath, _projectVsServices.Project.FullPath));
 
         private static CodeAnalysis.Document GetDocument(CodeAnalysis.Project project, string? filePath) =>
             project.Documents.FirstOrDefault(d => StringComparers.Paths.Equals(d.FilePath, filePath));

tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Rename/RenamerTestsBase.cs

@@ -50,7 +50,7 @@ internal class TestRenamerProjectTreeActionHandler : RenamerProjectTreeActionHan
             public TestRenamerProjectTreeActionHandler(
                 UnconfiguredProject unconfiguredProject,
                 IUnconfiguredProjectVsServices projectVsServices,
-                [Import(typeof(VisualStudioWorkspace))] Workspace workspace,
+                [Import(typeof(VisualStudioWorkspace))]Lazy<Workspace> workspace,
                 IEnvironmentOptions environmentOptions,
                 IUserNotificationServices userNotificationServices,
                 IRoslynServices roslynServices,
@@ -108,7 +108,7 @@ internal async Task RenameAsync(string sourceCode, string oldFilePath, string ne
 
             var renamer = new TestRenamerProjectTreeActionHandler(unconfiguredProject,
                                                               projectServices,
-                                                              ws,
+                                                              new Lazy<Workspace>(() => ws),
                                                               environmentOptionsFactory,
                                                               userNotificationServices,
                                                               roslynServices,