Removed unnecessary abstraction for loading PSReadline and Commands module. Removed unnecessary whitepsace changes

Author: dkattan

src/PowerShellEditorServices.Hosting/Commands/InvokeReadLineForEditorServicesCommand.cs

@@ -22,13 +22,13 @@ private delegate string ReadLineInvoker(
 
         private static Lazy<ReadLineInvoker> s_readLine = new Lazy<ReadLineInvoker>(() =>
         {
-            var allAssemblies = AppDomain.CurrentDomain.GetAssemblies();
-            var assemblies = allAssemblies.FirstOrDefault(a => a.FullName.Contains("Microsoft.PowerShell.PSReadLine2"));
-            var type = assemblies?.ExportedTypes?.FirstOrDefault(a => a.FullName == "Microsoft.PowerShell.PSConsoleReadLine");
+            Type type = Type.GetType("Microsoft.PowerShell.PSConsoleReadLine, Microsoft.PowerShell.PSReadLine2");
             MethodInfo method = type?.GetMethod(
                 "ReadLine",
                 new[] { typeof(Runspace), typeof(EngineIntrinsics), typeof(CancellationToken) });
 
+            // TODO: Handle method being null here. This shouldn't ever happen.
+
             return (ReadLineInvoker)method.CreateDelegate(typeof(ReadLineInvoker));
         });
 

src/PowerShellEditorServices.Hosting/Internal/EditorServicesRunner.cs

@@ -137,7 +137,7 @@ private async Task CreateEditorServicesAndRunUntilShutdown()
                 HostStartupInfo hostStartupInfo = CreateHostStartupInfo();
 
                 // If we just want a temp debug session, run that and do nothing else
-                if(isTempDebugSession)
+                if (isTempDebugSession)
                 {
                     await RunTempDebugSessionAsync(hostStartupInfo).ConfigureAwait(false);
                     return;
@@ -153,9 +153,9 @@ private async Task CreateEditorServicesAndRunUntilShutdown()
 
                 // Unsubscribe the host logger here so that the integrated console is not polluted with input after the first prompt
                 _logger.Log(PsesLogLevel.Verbose, "Starting server, deregistering host logger and registering shutdown listener");
-                if(_loggersToUnsubscribe != null)
+                if (_loggersToUnsubscribe != null)
                 {
-                    foreach(IDisposable loggerToUnsubscribe in _loggersToUnsubscribe)
+                    foreach (IDisposable loggerToUnsubscribe in _loggersToUnsubscribe)
                     {
                         loggerToUnsubscribe.Dispose();
                     }
@@ -166,22 +166,22 @@ private async Task CreateEditorServicesAndRunUntilShutdown()
                 PsesLanguageServer languageServer = await CreateLanguageServerAsync(hostStartupInfo).ConfigureAwait(false);
 
                 Task<PsesDebugServer> debugServerCreation = null;
-                if(creatingDebugServer)
+                if (creatingDebugServer)
                 {
                     debugServerCreation = CreateDebugServerWithLanguageServerAsync(languageServer, usePSReadLine: _config.ConsoleRepl == ConsoleReplKind.PSReadLine);
                 }
 
                 Task languageServerStart = languageServer.StartAsync();
 
                 Task debugServerStart = null;
-                if(creatingDebugServer)
+                if (creatingDebugServer)
                 {
                     // We don't need to wait for this to start, since we instead wait for it to complete later
                     debugServerStart = StartDebugServer(debugServerCreation);
                 }
 
                 await languageServerStart.ConfigureAwait(false);
-                if(debugServerStart != null)
+                if (debugServerStart != null)
                 {
                     await debugServerStart.ConfigureAwait(false);
                 }
@@ -210,7 +210,7 @@ private async Task StartDebugServer(Task<PsesDebugServer> debugServerCreation)
 
             // When the debug server shuts down, we want it to automatically restart
             // To do this, we set an event to allow it to create a new debug server as its session ends
-            if(!_alreadySubscribedDebug)
+            if (!_alreadySubscribedDebug)
             {
                 _logger.Log(PsesLogLevel.Diagnostic, "Subscribing debug server for session ended event");
                 _alreadySubscribedDebug = true;
@@ -268,7 +268,7 @@ private HostStartupInfo CreateHostStartupInfo()
             _logger.Log(PsesLogLevel.Diagnostic, "Creating startup info object");
 
             ProfilePathInfo profilePaths = null;
-            if(_config.ProfilePaths.AllUsersAllHosts != null
+            if (_config.ProfilePaths.AllUsersAllHosts != null
                 || _config.ProfilePaths.AllUsersCurrentHost != null
                 || _config.ProfilePaths.CurrentUserAllHosts != null
                 || _config.ProfilePaths.CurrentUserCurrentHost != null)
@@ -298,7 +298,7 @@ private HostStartupInfo CreateHostStartupInfo()
 
         private void WriteStartupBanner()
         {
-            if(_config.ConsoleRepl == ConsoleReplKind.None)
+            if (_config.ConsoleRepl == ConsoleReplKind.None)
             {
                 return;
             }

src/PowerShellEditorServices/Services/PowerShellContext/PowerShellContextService.cs

@@ -196,11 +196,11 @@ public PowerShellContextService(
             RunspaceChanged += PowerShellContext_RunspaceChangedAsync;
             ExecutionStatusChanged += PowerShellContext_ExecutionStatusChangedAsync;
         }
+        [SuppressMessage("Design", "CA1062:Validate arguments of public methods", Justification = "Checked by Validate call")]
         public static PowerShellContextService Create(
             ILoggerFactory factory,
             OmniSharp.Extensions.LanguageServer.Protocol.Server.ILanguageServerFacade languageServer,
-            HostStartupInfo hostStartupInfo
-            )
+            HostStartupInfo hostStartupInfo)
         {
             var logger = factory.CreateLogger<PowerShellContextService>();
 
@@ -213,9 +213,9 @@ HostStartupInfo hostStartupInfo
 
             EditorServicesPSHostUserInterface hostUserInterface =
                 hostStartupInfo.ConsoleReplEnabled
-                    ? (EditorServicesPSHostUserInterface)new TerminalPSHostUserInterface(powerShellContext, hostStartupInfo.PSHost, logger)
+                    ? (EditorServicesPSHostUserInterface) new TerminalPSHostUserInterface(powerShellContext, hostStartupInfo.PSHost, logger)
                     : new ProtocolPSHostUserInterface(languageServer, powerShellContext, logger);
-            
+
             EditorServicesPSHost psHost =
                 new EditorServicesPSHost(
                     powerShellContext,
@@ -224,13 +224,12 @@ HostStartupInfo hostStartupInfo
                     logger);
 
             logger.LogTrace("Creating initial PowerShell runspace");
-            Runspace initialRunspace = PowerShellContextService.CreateRunspace(psHost,hostStartupInfo.InitialSessionState);
+            Runspace initialRunspace = PowerShellContextService.CreateRunspace(psHost, hostStartupInfo.InitialSessionState);
             powerShellContext.Initialize(hostStartupInfo, initialRunspace, true, hostUserInterface);
 
             return powerShellContext;
         }
-        [SuppressMessage("Design", "CA1062:Validate arguments of public methods", Justification = "Checked by Validate call")]
-        
+
         /// <summary>
         /// Only used in testing. Creates a Runspace given HostStartupInfo instead of a PSHost.
         /// </summary>
@@ -300,7 +299,7 @@ public void Initialize(
             this.SessionState = PowerShellContextState.NotStarted;
             this.ConsoleWriter = consoleHost;
             this.ConsoleReader = consoleHost as IHostInput;
-            
+
             // Get the PowerShell runtime version
             this.LocalPowerShellVersion =
                 PowerShellVersionDetails.GetVersionDetails(
@@ -320,7 +319,7 @@ public void Initialize(
                     connectionString: null);
             this.CurrentRunspace = this.initialRunspace;
             // Respect a user provided bundled module path.
-            if(Directory.Exists(hostStartupInfo.BundledModulePath))
+            if (Directory.Exists(hostStartupInfo.BundledModulePath))
             {
                 logger.LogTrace($"Using new bundled module path: {hostStartupInfo.BundledModulePath}");
                 s_bundledModulePath = hostStartupInfo.BundledModulePath;
@@ -373,7 +372,7 @@ public void Initialize(
                     .PSVariable
                     .GetValue("Host")
                     as PSHost;
-            
+
             // Now that the runspace is ready, enqueue it for first use
             this.PromptNest = new PromptNest(
                 this,
@@ -384,14 +383,14 @@ public void Initialize(
 
             // Import the PowerShellEditorServices.Commands module into the runspace.
             this.ImportModuleAsync(s_commandsModulePath).GetAwaiter().GetResult();
-            if(isPSReadLineEnabled)
+            if (isPSReadLineEnabled)
             {
                 // Imports the PSReadLine2 module into the runspace.
                 ImportModuleAsync(s_psReadLineModulePath).GetAwaiter().GetResult();
             }
             // TODO: This can be moved to the point after the $psEditor object
             // gets initialized when that is done earlier than LanguageServer.Initialize
-            foreach(string module in hostStartupInfo.AdditionalModules)
+            foreach (string module in hostStartupInfo.AdditionalModules)
             {
                 this.ImportModuleAsync(module).GetAwaiter().GetResult();
             }
@@ -1697,7 +1696,7 @@ internal static string QuoteEscapeString(string escapedPath)
         internal static string WildcardEscapePath(string path, bool escapeSpaces = false)
         {
             var sb = new StringBuilder();
-            for (int i = 0; i < path.Length; i++)
+            for(int i = 0;i < path.Length;i++)
             {
                 char curr = path[i];
                 switch (curr)
@@ -1750,7 +1749,7 @@ internal static string UnescapeWildcardEscapedPath(string wildcardEscapedPath)
             }
 
             var sb = new StringBuilder(wildcardEscapedPath.Length);
-            for (int i = 0; i < wildcardEscapedPath.Length; i++)
+            for(int i = 0;i < wildcardEscapedPath.Length;i++)
             {
                 // If we see a backtick perform a lookahead
                 char curr = wildcardEscapedPath[i];
@@ -2350,7 +2349,7 @@ private static IEnumerable<string> GetLoadableProfilePaths(ProfilePathInfo profi
                 yield break;
             }
 
-            foreach (string path in new [] { profilePaths.AllUsersAllHosts, profilePaths.AllUsersCurrentHost, profilePaths.CurrentUserAllHosts, profilePaths.CurrentUserCurrentHost })
+            foreach(string path in new[] { profilePaths.AllUsersAllHosts, profilePaths.AllUsersCurrentHost, profilePaths.CurrentUserAllHosts, profilePaths.CurrentUserCurrentHost })
             {
                 if (path != null && File.Exists(path))
                 {

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

@@ -19,10 +19,8 @@ internal class PSReadLinePromptContext : IPromptContext
     {
         private static readonly Lazy<CmdletInfo> s_lazyInvokeReadLineForEditorServicesCmdletInfo = new Lazy<CmdletInfo>(() =>
         {
-            var allAssemblies = AppDomain.CurrentDomain.GetAssemblies();
-            var assemblies = allAssemblies.FirstOrDefault(a => a.FullName.Contains("Microsoft.PowerShell.EditorServices"));
-            var type = assemblies?.ExportedTypes?.FirstOrDefault(a => a.Name == "InvokeReadLineForEditorServicesCommand");
-            return new CmdletInfo("__Invoke-ReadLineForEditorServices", type ?? typeof(PSCmdlet));
+            var type = Type.GetType("Microsoft.PowerShell.EditorServices.Commands.InvokeReadLineForEditorServicesCommand, Microsoft.PowerShell.EditorServices.Hosting");
+            return new CmdletInfo("__Invoke-ReadLineForEditorServices", type);
         });
 
         private static ExecutionOptions s_psrlExecutionOptions = new ExecutionOptions

test/PowerShellEditorServices.Test/Session/PowerShellContextTests.cs

@@ -27,7 +27,7 @@ public class PowerShellContextTests : IDisposable
 
         private static readonly string s_debugTestFilePath =
             TestUtilities.NormalizePath("../../../../PowerShellEditorServices.Test.Shared/Debugging/DebugTest.ps1");
-       
+
         public PowerShellContextTests()
         {
             this.powerShellContext = PowerShellContextFactory.Create(NullLogger.Instance);
@@ -111,8 +111,8 @@ public async Task CanAbortExecution()
         [Fact]
         public async Task CanResolveAndLoadProfilesForHostId()
         {
-            string [] expectedProfilePaths =
-                new string []
+            string[] expectedProfilePaths =
+                new string[]
                 {
                     PowerShellContextFactory.TestProfilePaths.AllUsersAllHosts,
                     PowerShellContextFactory.TestProfilePaths.AllUsersCurrentHost,
@@ -132,7 +132,7 @@ public async Task CanResolveAndLoadProfilesForHostId()
                 "$($profile.CurrentUserAllHosts) " +
                 "$($profile.CurrentUserCurrentHost) " +
                 "$(Assert-ProfileLoaded)\"");
-            
+
             var result =
                 await this.powerShellContext.ExecuteCommandAsync<string>(
                     psCommand);