removed #if TEST from PowerShellContextService.cs and instead provided the path as a parameter to PowerShellContextService.TryGetPSReadLineProxy()

Author: dkattan

src/PowerShellEditorServices/Services/PowerShellContext/PowerShellContextService.cs

@@ -226,7 +226,7 @@ public static PowerShellContextService Create(
 
             logger.LogTrace("Creating initial PowerShell runspace");
             Runspace initialRunspace = PowerShellContextService.CreateRunspace(psHost, hostStartupInfo.LanguageMode);
-            powerShellContext.Initialize(hostStartupInfo.ProfilePaths, initialRunspace, true, hostUserInterface);
+            powerShellContext.Initialize(hostStartupInfo, initialRunspace, true, hostUserInterface);
             powerShellContext.ImportCommandsModuleAsync();
 
             // TODO: This can be moved to the point after the $psEditor object
@@ -322,7 +322,7 @@ public static Runspace CreateRunspace(PSHost psHost, PSLanguageMode languageMode
         /// <param name="ownsInitialRunspace">If true, the PowerShellContext owns this runspace.</param>
         /// <param name="consoleHost">An IHostOutput implementation.  Optional.</param>
         public void Initialize(
-            ProfilePathInfo profilePaths,
+            HostStartupInfo hostStartupInfo,
             Runspace initialRunspace,
             bool ownsInitialRunspace,
             IHostOutput consoleHost)
@@ -376,7 +376,7 @@ public void Initialize(
             this.ConfigureRunspaceCapabilities(this.CurrentRunspace);
 
             // Set the $profile variable in the runspace
-            this.profilePaths = profilePaths;
+            this.profilePaths = hostStartupInfo.ProfilePaths;
             if (profilePaths != null)
             {
                 this.SetProfileVariableInCurrentRunspace(profilePaths);
@@ -413,7 +413,7 @@ public void Initialize(
 
             if (powerShellVersion.Major >= 5 &&
                 this.isPSReadLineEnabled &&
-                PSReadLinePromptContext.TryGetPSReadLineProxy(logger, initialRunspace, out PSReadLineProxy proxy))
+                PSReadLinePromptContext.TryGetPSReadLineProxy(logger, initialRunspace, hostStartupInfo.BundledModulePath, out PSReadLineProxy proxy))
             {
                 this.PromptContext = new PSReadLinePromptContext(
                     this,

src/PowerShellEditorServices/Services/PowerShellContext/Session/PSReadLinePromptContext.cs

@@ -17,20 +17,6 @@ namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 
     internal class PSReadLinePromptContext : IPromptContext
     {
-        private static readonly string _psReadLineModulePath = Path.Combine(
-            Path.GetDirectoryName(typeof(PSReadLinePromptContext).Assembly.Location),
-            "..",
-            "..",
-            "..",
-#if TEST
-            // When using xUnit (dotnet test) the assemblies are deployed to the
-            // test project folder, invalidating our relative path assumption.
-            "..",
-            "..",
-            "module",
-#endif
-            "PSReadLine");
-
         private static readonly Lazy<CmdletInfo> s_lazyInvokeReadLineForEditorServicesCmdletInfo = new Lazy<CmdletInfo>(() =>
         {
             var type = Type.GetType("Microsoft.PowerShell.EditorServices.Commands.InvokeReadLineForEditorServicesCommand, Microsoft.PowerShell.EditorServices.Hosting");
@@ -79,9 +65,11 @@ internal PSReadLinePromptContext(
         internal static bool TryGetPSReadLineProxy(
             ILogger logger,
             Runspace runspace,
+            string bundledModulePath,
             out PSReadLineProxy readLineProxy)
         {
             readLineProxy = null;
+            string _psReadLineModulePath = Path.Combine(bundledModulePath, "PSReadLine");
             logger.LogTrace("Attempting to load PSReadLine");
             using (var pwsh = PowerShell.Create())
             {

test/PowerShellEditorServices.Test/PowerShellContextFactory.cs

@@ -63,7 +63,7 @@ public static PowerShellContextService Create(ILogger logger)
                     logger);
 
             powerShellContext.Initialize(
-                TestProfilePaths,
+                testHostDetails,
                 initialRunspace,
                 ownsInitialRunspace: true,
                 consoleHost: null);

test/PowerShellEditorServices.Test/Session/PowerShellContextTests.cs

@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Management.Automation;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -152,10 +153,18 @@ await this.powerShellContext.ExecuteCommandAsync<string>(
         public async Task CanGetPSReadLineProxy()
         {
             Skip.If(IsWindows, "This test doesn't work on Windows for some reason.");
+            string s_bundledModulesPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
+            "..",
+            "..",
+            "..",
+            "..",
+            "module"
+            );
             Assert.True(PSReadLinePromptContext.TryGetPSReadLineProxy(
-                NullLogger.Instance,
-                PowerShellContextFactory.initialRunspace,
-                out PSReadLineProxy proxy));
+                    NullLogger.Instance,
+                    PowerShellContextFactory.initialRunspace,
+                    s_bundledModulesPath,
+                    out PSReadLineProxy proxy));
         }
 
         #region Helper Methods