Add Host factory

Author: rjmholt

test/PowerShellEditorServices.Test/Language/LanguageServiceTests.cs

@@ -10,6 +10,7 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.PowerShell.EditorServices.Handlers;
 using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.PowerShell.Host;
 using Microsoft.PowerShell.EditorServices.Services.Symbols;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Test.Shared;
@@ -26,13 +27,12 @@
 
 namespace Microsoft.PowerShell.EditorServices.Test.Language
 {
-    /*
     public class LanguageServiceTests : IDisposable
     {
         private readonly WorkspaceService workspace;
         private readonly SymbolsService symbolsService;
         private readonly PsesCompletionHandler completionHandler;
-        private readonly PowerShellContextService powerShellContext;
+        private readonly PsesInternalHost _psesHost;
         private static readonly string s_baseSharedScriptPath =
             Path.Combine(
                     Path.GetDirectoryName(VersionUtils.IsWindows
@@ -45,16 +45,16 @@ public class LanguageServiceTests : IDisposable
 
         public LanguageServiceTests()
         {
-            var logger = NullLogger.Instance;
-            powerShellContext = PowerShellContextFactory.Create(logger);
+            _psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
+
             workspace = new WorkspaceService(NullLoggerFactory.Instance);
-            symbolsService = new SymbolsService(NullLoggerFactory.Instance, powerShellContext, workspace, new ConfigurationService());
-            completionHandler = new PsesCompletionHandler(NullLoggerFactory.Instance, powerShellContext, workspace);
+            symbolsService = new SymbolsService(NullLoggerFactory.Instance, _psesHost, _psesHost, workspace, new ConfigurationService());
+            completionHandler = new PsesCompletionHandler(NullLoggerFactory.Instance, _psesHost, _psesHost, workspace);
         }
 
         public void Dispose()
         {
-            this.powerShellContext.Close();
+            // TODO: Dispose of the host
         }
 
         [Trait("Category", "Completions")]
@@ -464,14 +464,12 @@ await this.completionHandler.GetCompletionsInFileAsync(
                     scriptRegion.StartColumnNumber).ConfigureAwait(false);
         }
 
-        private async Task<ParameterSetSignatures> GetParamSetSignatures(ScriptRegion scriptRegion)
+        private Task<ParameterSetSignatures> GetParamSetSignatures(ScriptRegion scriptRegion)
         {
-            return
-                await this.symbolsService.FindParameterSetsInFileAsync(
+            return this.symbolsService.FindParameterSetsInFileAsync(
                     GetScriptFile(scriptRegion),
                     scriptRegion.StartLineNumber,
-                    scriptRegion.StartColumnNumber,
-                    powerShellContext).ConfigureAwait(false);
+                    scriptRegion.StartColumnNumber);
         }
 
         private async Task<SymbolReference> GetDefinition(ScriptRegion scriptRegion)
@@ -527,5 +525,4 @@ private List<SymbolReference> FindSymbolsInFile(ScriptRegion scriptRegion)
                     GetScriptFile(scriptRegion));
         }
     }
-    */
 }

test/PowerShellEditorServices.Test/PowerShellContextFactory.cs renamed to test/PowerShellEditorServices.Test/PsesHostFactory.cs

@@ -3,21 +3,24 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
+using System.Management.Automation;
+using System.Management.Automation.Host;
 using System.Management.Automation.Runspaces;
+using System.Security;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.PowerShell.EditorServices.Hosting;
-using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.PowerShell.Host;
 using Microsoft.PowerShell.EditorServices.Test.Shared;
 using Microsoft.PowerShell.EditorServices.Utility;
 
 namespace Microsoft.PowerShell.EditorServices.Test
 {
-    /*
-    internal static class PowerShellContextFactory
+    internal static class PsesHostFactory
     {
         // NOTE: These paths are arbitrarily chosen just to verify that the profile paths
         //       can be set to whatever they need to be for the given host.
@@ -38,10 +41,8 @@ internal static class PowerShellContextFactory
 
         public static System.Management.Automation.Runspaces.Runspace InitialRunspace;
 
-        public static PowerShellContextService Create(ILogger logger)
+        public static PsesInternalHost Create(ILoggerFactory loggerFactory)
         {
-            PowerShellContextService powerShellContext = new PowerShellContextService(logger, null, isPSReadLineEnabled: false);
-
             // We intentionally use `CreateDefault2()` as it loads `Microsoft.PowerShell.Core` only,
             // which is a more minimal and therefore safer state.
             var initialSessionState = InitialSessionState.CreateDefault2();
@@ -60,67 +61,23 @@ public static PowerShellContextService Create(ILogger logger)
                 "PowerShell Editor Services Test Host",
                 "Test.PowerShellEditorServices",
                 new Version("1.0.0"),
-                null,
+                psHost: null,
                 TestProfilePaths,
-                new List<string>(),
-                new List<string>(),
+                featureFlags: Array.Empty<string>(),
+                additionalModules: Array.Empty<string>(),
                 initialSessionState,
-                null,
-                0,
+                logPath: null,
+                (int)LogLevel.None,
                 consoleReplEnabled: false,
                 usesLegacyReadLine: false,
                 bundledModulePath: BundledModulePath);
 
-            InitialRunspace = PowerShellContextService.CreateTestRunspace(
-                    testHostDetails,
-                    powerShellContext,
-                    new TestPSHostUserInterface(powerShellContext, logger),
-                    logger);
+            var psesHost = new PsesInternalHost(loggerFactory, null, testHostDetails);
 
-            powerShellContext.Initialize(
-                TestProfilePaths,
-                InitialRunspace,
-                ownsInitialRunspace: true,
-                consoleHost: null);
+            psesHost.StartAsync(new HostStartOptions { LoadProfiles = true }, CancellationToken.None).GetAwaiter().GetResult();
 
-            return powerShellContext;
+            return psesHost;
         }
     }
-
-    internal class TestPSHostUserInterface : EditorServicesPSHostUserInterface
-    {
-        public TestPSHostUserInterface(
-            PowerShellContextService powerShellContext,
-            ILogger logger)
-            : base(
-                powerShellContext,
-                new SimplePSHostRawUserInterface(logger),
-                NullLogger.Instance)
-        {
-        }
-
-        public override void WriteOutput(string outputString, bool includeNewLine, OutputType outputType, ConsoleColor foregroundColor, ConsoleColor backgroundColor)
-        {
-        }
-
-        protected override ChoicePromptHandler OnCreateChoicePromptHandler()
-        {
-            throw new NotImplementedException();
-        }
-
-        protected override InputPromptHandler OnCreateInputPromptHandler()
-        {
-            throw new NotImplementedException();
-        }
-
-        protected override Task<string> ReadCommandLineAsync(CancellationToken cancellationToken)
-        {
-            return Task.FromResult("USER COMMAND");
-        }
-
-        protected override void UpdateProgress(long sourceId, ProgressDetails progressDetails)
-        {
-        }
-    }
-    */
 }
+