Fix initialization

Author: rjmholt

src/PowerShellEditorServices/Server/PsesServiceCollectionExtensions.cs

@@ -26,13 +26,11 @@ public static IServiceCollection AddPsesLanguageServices(
             this IServiceCollection collection,
             HostStartupInfo hostStartupInfo)
         {
-            return collection.AddSingleton<WorkspaceService>()
+            return collection
+                .AddSingleton<HostStartupInfo>(hostStartupInfo)
+                .AddSingleton<WorkspaceService>()
                 .AddSingleton<SymbolsService>()
-                .AddSingleton<EditorServicesConsolePSHost>(
-                    (provider) => EditorServicesConsolePSHost.Create(
-                        provider.GetService<ILoggerFactory>(),
-                        provider.GetService<ILanguageServer>(),
-                        hostStartupInfo))
+                .AddSingleton<EditorServicesConsolePSHost>()
                 .AddSingleton<IRunspaceContext>(
                     (provider) => provider.GetService<EditorServicesConsolePSHost>())
                 .AddSingleton<PowerShellExecutionService>(
@@ -43,16 +41,16 @@ public static IServiceCollection AddPsesLanguageServices(
                 .AddSingleton<TemplateService>()
                 .AddSingleton<EditorOperationsService>()
                 .AddSingleton<RemoteFileManagerService>()
-                .AddSingleton(
-                    (provider) =>
+                .AddSingleton(async (provider) =>
                     {
                         var extensionService = new ExtensionService(
                             provider.GetService<PowerShellExecutionService>(),
-                            provider.GetService<OmniSharp.Extensions.LanguageServer.Protocol.Server.ILanguageServer>());
-                        extensionService.InitializeAsync(
+                            provider.GetService<ILanguageServer>());
+
+                        await extensionService.InitializeAsync(
                             serviceProvider: provider,
-                            editorOperations: provider.GetService<EditorOperationsService>())
-                            .Wait();
+                            editorOperations: provider.GetService<EditorOperationsService>()).ConfigureAwait(false);
+
                         return extensionService;
                     })
                 .AddSingleton<AnalysisService>();

src/PowerShellEditorServices/Services/PowerShell/Execution/PipelineThreadExecutor.cs

@@ -106,6 +106,7 @@ public IDisposable TakeTaskWriterLock()
 
         private void Run()
         {
+            _psesHost.PushInitialPowerShell();
             RunTopLevelConsumerLoop();
         }
 

src/PowerShellEditorServices/Services/PowerShell/Host/EditorServicesConsolePSHost.cs

@@ -22,16 +22,6 @@ namespace Microsoft.PowerShell.EditorServices.Services.PowerShell.Host
 
     internal class EditorServicesConsolePSHost : PSHost, IHostSupportsInteractiveSession, IRunspaceContext
     {
-        public static EditorServicesConsolePSHost Create(
-            ILoggerFactory loggerFactory,
-            ILanguageServer languageServer,
-            HostStartupInfo hostInfo)
-        {
-            var host = new EditorServicesConsolePSHost(loggerFactory, languageServer, hostInfo);
-            host.PushInitialPowerShell();
-            return host;
-        }
-
         private readonly ILogger _logger;
 
         private readonly Stack<PowerShellContextFrame> _psFrameStack;
@@ -145,7 +135,7 @@ public override void SetShouldExit(int exitCode)
             SetExit();
         }
 
-        private void PushInitialPowerShell()
+        public void PushInitialPowerShell()
         {
             SMA.PowerShell pwsh = _psFactory.CreateInitialPowerShell(_hostInfo, _readLineProvider);
             var runspaceInfo = RunspaceInfo.CreateFromLocalPowerShell(_logger, pwsh);