Fixed method names and other issues from merge.

Author: dkattan

src/PowerShellEditorServices/Services/PowerShellContext/PowerShellContextService.cs

@@ -262,7 +262,7 @@ public static Runspace CreateTestRunspace(
         /// <param name="psHost">The PSHost that will be used for this Runspace.</param>
         /// <param name="languageMode">The language mode inherited from the orginal PowerShell process. This will be used when creating runspaces so that we honor the same language mode.</param>
         /// <returns></returns>
-        public static Runspace CreateTestRunspace(PSHost psHost, InitialSessionState initialSessionState, List<string> additionalModules = null)
+        public static Runspace CreateRunspace(PSHost psHost, InitialSessionState initialSessionState, List<string> additionalModules = null)
         {
             Runspace runspace = RunspaceFactory.CreateRunspace(psHost, initialSessionState);
 
@@ -409,13 +409,12 @@ bool ownsInitialRunspace
                 hostStartupInfo.InitialSessionState.AddCommandAndAliasToInitialSessionState<OutDefaultCommand>(@"Microsoft.PowerShell.Core\Out-Default");
                 //hostStartupInfo.InitialSessionState.AddCommandAndAliasToInitialSessionState<Microsoft.PowerShell.Commands.WriteHostCommand>(@"Microsoft.PowerShell.Core\Write-Host");
 
-
-                initialRunspace = PowerShellContextService.CreateRunspace(hostStartupInfo.PSHost, hostStartupInfo.InitialSessionState);
+                initialRunspace = CreateRunspace(hostStartupInfo.PSHost, hostStartupInfo.InitialSessionState);
             }
             else
             {
                 logger.LogTrace("Creating initial PowerShell runspace");
-                initialRunspace = PowerShellContextService.CreateRunspace(psHost, hostStartupInfo.InitialSessionState);
+                initialRunspace = CreateRunspace(psHost, hostStartupInfo.InitialSessionState);
             }
             logger.LogInformation("Opening Runspace");
             initialRunspace.Open();
@@ -521,25 +520,7 @@ bool ownsInitialRunspace
             {
                 this.PromptContext = new LegacyReadLineContext(this);
             }
-        }
-
-        /// <summary>
-        /// Imports the PowerShellEditorServices.Commands module into
-        /// the runspace.  This method will be moved somewhere else soon.
-        /// </summary>
-        /// <returns></returns>
-        public Task ImportCommandsModuleAsync()
-        {
-            this.logger.LogTrace($"Importing PowershellEditorServices commands from {s_commandsModulePath}");
-
-            PSCommand importCommand = new PSCommand()
-                .AddCommand("Import-Module")
-                .AddArgument(s_commandsModulePath);
-
-            if (VersionUtils.IsWindows && initialRunspace.InitialSessionState.LanguageMode == PSLanguageMode.FullLanguage)
-            {
-                this.SetExecutionPolicy();
-            }
+        
             if(!preloadModules)
             {
                 // TODO: This can be moved to the point after the $psEditor object

test/PowerShellEditorServices.Test/PowerShellContextFactory.cs

@@ -41,7 +41,6 @@ internal static class PowerShellContextFactory
         public static System.Management.Automation.Runspaces.Runspace InitialRunspace;
         public static PowerShellContextService Create(ILogger logger, bool isPSReadLineEnabled = false)
         {
-            PowerShellContextService powerShellContext = new PowerShellContextService(logger, null, isPSReadLineEnabled: false);
             var initialSessionState = InitialSessionState.CreateDefault();
             // We set the process scope's execution policy (which is really the runspace's scope) to
             // Bypass so we can import our bundled modules. This is equivalent in scope to the CLI
@@ -65,7 +64,7 @@ public static PowerShellContextService Create(ILogger logger, bool isPSReadLineE
                 consoleReplEnabled: isPSReadLineEnabled,
                 usesLegacyReadLine: false,
                 bundledModulePath: BundledModulePath);
-
+            PowerShellContextService powerShellContext = new PowerShellContextService(logger, null, testHostDetails);
             InitialRunspace = PowerShellContextService.CreateTestRunspace(
                     testHostDetails,
                     powerShellContext,