Move execution service to an interface

Author: rjmholt

src/PowerShellEditorServices/Server/PsesServiceCollectionExtensions.cs

@@ -31,7 +31,8 @@ public static IServiceCollection AddPsesLanguageServices(
                 .AddSingleton<PsesInternalHost>()
                 .AddSingleton<IRunspaceContext>(
                     (provider) => provider.GetService<PsesInternalHost>())
-                .AddSingleton<PowerShellExecutionService>()
+                .AddSingleton<IInternalPowerShellExecutionService>(
+                    (provider) => provider.GetService<PsesInternalHost>())
                 .AddSingleton<ConfigurationService>()
                 .AddSingleton<IPowerShellDebugContext>(
                     (provider) => provider.GetService<PsesInternalHost>().DebugContext)
@@ -44,7 +45,7 @@ public static IServiceCollection AddPsesLanguageServices(
                             provider.GetService<ILanguageServerFacade>(),
                             provider,
                             provider.GetService<EditorOperationsService>(),
-                            provider.GetService<PowerShellExecutionService>());
+                            provider.GetService<IInternalPowerShellExecutionService>());
 
                         // This is where we create the $psEditor variable
                         // so that when the console is ready, it will be available
@@ -70,7 +71,7 @@ public static IServiceCollection AddPsesDebugServices(
                 .AddSingleton<PsesInternalHost>(internalHost)
                 .AddSingleton<IRunspaceContext>(internalHost)
                 .AddSingleton<IPowerShellDebugContext>(internalHost.DebugContext)
-                .AddSingleton(languageServiceProvider.GetService<PowerShellExecutionService>())
+                .AddSingleton(languageServiceProvider.GetService<IInternalPowerShellExecutionService>())
                 .AddSingleton(languageServiceProvider.GetService<WorkspaceService>())
                 .AddSingleton(languageServiceProvider.GetService<RemoteFileManagerService>())
                 .AddSingleton<PsesDebugServer>(psesDebugServer)

src/PowerShellEditorServices/Services/DebugAdapter/BreakpointService.cs

@@ -19,7 +19,7 @@ namespace Microsoft.PowerShell.EditorServices.Services
     internal class BreakpointService
     {
         private readonly ILogger<BreakpointService> _logger;
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
         private readonly PsesInternalHost _editorServicesHost;
         private readonly DebugStateService _debugStateService;
 
@@ -32,7 +32,7 @@ internal class BreakpointService
 
         public BreakpointService(
             ILoggerFactory factory,
-            PowerShellExecutionService executionService,
+            IInternalPowerShellExecutionService executionService,
             PsesInternalHost editorServicesHost,
             DebugStateService debugStateService)
         {

src/PowerShellEditorServices/Services/DebugAdapter/DebugEventHandlerService.cs

@@ -17,7 +17,7 @@ namespace Microsoft.PowerShell.EditorServices.Services
     internal class DebugEventHandlerService
     {
         private readonly ILogger<DebugEventHandlerService> _logger;
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
         private readonly DebugService _debugService;
         private readonly DebugStateService _debugStateService;
         private readonly IDebugAdapterServerFacade _debugAdapterServer;
@@ -26,7 +26,7 @@ internal class DebugEventHandlerService
 
         public DebugEventHandlerService(
             ILoggerFactory factory,
-            PowerShellExecutionService executionService,
+            IInternalPowerShellExecutionService executionService,
             DebugService debugService,
             DebugStateService debugStateService,
             IDebugAdapterServerFacade debugAdapterServer,

src/PowerShellEditorServices/Services/DebugAdapter/DebugService.cs

@@ -34,7 +34,7 @@ internal class DebugService
         private readonly BreakpointDetails[] s_emptyBreakpointDetailsArray = Array.Empty<BreakpointDetails>();
 
         private readonly ILogger _logger;
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
         private readonly BreakpointService _breakpointService;
         private readonly RemoteFileManagerService remoteFileManager;
 
@@ -104,7 +104,7 @@ internal class DebugService
         //// </param>
         /// <param name="logger">An ILogger implementation used for writing log messages.</param>
         public DebugService(
-            PowerShellExecutionService executionService,
+            IInternalPowerShellExecutionService executionService,
             IPowerShellDebugContext debugContext,
             RemoteFileManagerService remoteFileManager,
             BreakpointService breakpointService,

src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ConfigurationDoneHandler.cs

@@ -38,7 +38,7 @@ internal class ConfigurationDoneHandler : IConfigurationDoneHandler
         private readonly DebugService _debugService;
         private readonly DebugStateService _debugStateService;
         private readonly DebugEventHandlerService _debugEventHandlerService;
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
         private readonly WorkspaceService _workspaceService;
 
         private readonly IPowerShellDebugContext _debugContext;
@@ -50,7 +50,7 @@ public ConfigurationDoneHandler(
             DebugService debugService,
             DebugStateService debugStateService,
             DebugEventHandlerService debugEventHandlerService,
-            PowerShellExecutionService executionService,
+            IInternalPowerShellExecutionService executionService,
             WorkspaceService workspaceService,
             IPowerShellDebugContext debugContext,
             IRunspaceContext runspaceContext)

src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DebugEvaluateHandler.cs

@@ -19,13 +19,13 @@ internal class DebugEvaluateHandler : IEvaluateHandler
     {
         private readonly ILogger _logger;
         private readonly IPowerShellDebugContext _debugContext;
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
         private readonly DebugService _debugService;
 
         public DebugEvaluateHandler(
             ILoggerFactory factory,
             IPowerShellDebugContext debugContext,
-            PowerShellExecutionService executionService,
+            IInternalPowerShellExecutionService executionService,
             DebugService debugService)
         {
             _logger = factory.CreateLogger<DebugEvaluateHandler>();

src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DisconnectHandler.cs

@@ -20,7 +20,7 @@ namespace Microsoft.PowerShell.EditorServices.Handlers
     internal class DisconnectHandler : IDisconnectHandler
     {
         private readonly ILogger<DisconnectHandler> _logger;
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
         private readonly DebugService _debugService;
         private readonly DebugStateService _debugStateService;
         private readonly DebugEventHandlerService _debugEventHandlerService;
@@ -31,7 +31,7 @@ public DisconnectHandler(
             ILoggerFactory factory,
             PsesDebugServer psesDebugServer,
             IRunspaceContext runspaceContext,
-            PowerShellExecutionService executionService,
+            IInternalPowerShellExecutionService executionService,
             DebugService debugService,
             DebugStateService debugStateService,
             DebugEventHandlerService debugEventHandlerService)

src/PowerShellEditorServices/Services/DebugAdapter/Handlers/LaunchAndAttachHandler.cs

@@ -92,7 +92,7 @@ internal class LaunchAndAttachHandler : ILaunchHandler<PsesLaunchRequestArgument
         private readonly BreakpointService _breakpointService;
         private readonly DebugService _debugService;
         private readonly IRunspaceContext _runspaceContext;
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
         private readonly DebugStateService _debugStateService;
         private readonly DebugEventHandlerService _debugEventHandlerService;
         private readonly IDebugAdapterServerFacade _debugAdapterServer;
@@ -105,7 +105,7 @@ public LaunchAndAttachHandler(
             DebugEventHandlerService debugEventHandlerService,
             DebugService debugService,
             IRunspaceContext runspaceContext,
-            PowerShellExecutionService executionService,
+            IInternalPowerShellExecutionService executionService,
             DebugStateService debugStateService,
             RemoteFileManagerService remoteFileManagerService)
         {

src/PowerShellEditorServices/Services/Extension/EditorOperationsService.cs

@@ -21,12 +21,12 @@ internal class EditorOperationsService : IEditorOperations
 
         private readonly ILanguageServerFacade _languageServer;
 
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
 
         public EditorOperationsService(
             PsesInternalHost psesHost,
             WorkspaceService workspaceService,
-            PowerShellExecutionService executionService,
+            IInternalPowerShellExecutionService executionService,
             ILanguageServerFacade languageServer)
         {
             _psesHost = psesHost;

src/PowerShellEditorServices/Services/Extension/ExtensionService.cs

@@ -50,7 +50,7 @@ internal sealed class ExtensionService
         /// <summary>
         /// Gets the PowerShellContext in which extension code will be executed.
         /// </summary>
-        internal PowerShellExecutionService ExecutionService { get; private set; }
+        internal IInternalPowerShellExecutionService ExecutionService { get; private set; }
 
         #endregion
 
@@ -68,7 +68,7 @@ internal ExtensionService(
             ILanguageServerFacade languageServer,
             IServiceProvider serviceProvider,
             IEditorOperations editorOperations,
-            PowerShellExecutionService executionService)
+            IInternalPowerShellExecutionService executionService)
         {
             ExecutionService = executionService;
             _languageServer = languageServer;

src/PowerShellEditorServices/Services/PowerShell/Debugging/DscBreakpointCapability.cs

@@ -29,7 +29,7 @@ internal class DscBreakpointCapability
             new Dictionary<string, int[]>();
 
         public async Task<BreakpointDetails[]> SetLineBreakpointsAsync(
-            PowerShellExecutionService executionService,
+            IInternalPowerShellExecutionService executionService,
             string scriptPath,
             BreakpointDetails[] breakpoints)
         {

src/PowerShellEditorServices/Services/PowerShell/Handlers/EvaluateHandler.cs

@@ -17,11 +17,11 @@ namespace Microsoft.PowerShell.EditorServices.Handlers
     internal class EvaluateHandler : IEvaluateHandler
     {
         private readonly ILogger _logger;
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
 
         public EvaluateHandler(
             ILoggerFactory factory,
-            PowerShellExecutionService executionService)
+            IInternalPowerShellExecutionService executionService)
         {
             _logger = factory.CreateLogger<EvaluateHandler>();
             _executionService = executionService;

src/PowerShellEditorServices/Services/PowerShell/Handlers/ExpandAliasHandler.cs

@@ -30,9 +30,9 @@ internal class ExpandAliasResult
     internal class ExpandAliasHandler : IExpandAliasHandler
     {
         private readonly ILogger _logger;
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
 
-        public ExpandAliasHandler(ILoggerFactory factory, PowerShellExecutionService executionService)
+        public ExpandAliasHandler(ILoggerFactory factory, IInternalPowerShellExecutionService executionService)
         {
             _logger = factory.CreateLogger<ExpandAliasHandler>();
             _executionService = executionService;

src/PowerShellEditorServices/Services/PowerShell/Handlers/GetCommandHandler.cs

@@ -35,9 +35,9 @@ internal class PSCommandMessage
     internal class GetCommandHandler : IGetCommandHandler
     {
         private readonly ILogger<GetCommandHandler> _logger;
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
 
-        public GetCommandHandler(ILoggerFactory factory, PowerShellExecutionService executionService)
+        public GetCommandHandler(ILoggerFactory factory, IInternalPowerShellExecutionService executionService)
         {
             _logger = factory.CreateLogger<GetCommandHandler>();
             _executionService = executionService;

src/PowerShellEditorServices/Services/PowerShell/Handlers/GetVersionHandler.cs

@@ -26,14 +26,14 @@ internal class GetVersionHandler : IGetVersionHandler
 
         private readonly ILogger<GetVersionHandler> _logger;
         private IRunspaceContext _runspaceContext;
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
         private readonly ILanguageServerFacade _languageServer;
         private readonly ConfigurationService _configurationService;
 
         public GetVersionHandler(
             ILoggerFactory factory,
             IRunspaceContext runspaceContext,
-            PowerShellExecutionService executionService,
+            IInternalPowerShellExecutionService executionService,
             ILanguageServerFacade languageServer,
             ConfigurationService configurationService)
         {

src/PowerShellEditorServices/Services/PowerShell/Handlers/PSHostProcessAndRunspaceHandlers.cs

@@ -18,9 +18,9 @@ namespace Microsoft.PowerShell.EditorServices.Handlers
     internal class PSHostProcessAndRunspaceHandlers : IGetPSHostProcessesHandler, IGetRunspaceHandler
     {
         private readonly ILogger<PSHostProcessAndRunspaceHandlers> _logger;
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
 
-        public PSHostProcessAndRunspaceHandlers(ILoggerFactory factory, PowerShellExecutionService executionService)
+        public PSHostProcessAndRunspaceHandlers(ILoggerFactory factory, IInternalPowerShellExecutionService executionService)
         {
             _logger = factory.CreateLogger<PSHostProcessAndRunspaceHandlers>();
             _executionService = executionService;

src/PowerShellEditorServices/Services/PowerShell/Handlers/ShowHelpHandler.cs

@@ -24,9 +24,9 @@ internal class ShowHelpParams : IRequest
     internal class ShowHelpHandler : IShowHelpHandler
     {
         private readonly ILogger _logger;
-        private readonly PowerShellExecutionService _executionService;
+        private readonly IInternalPowerShellExecutionService _executionService;
 
-        public ShowHelpHandler(ILoggerFactory factory, PowerShellExecutionService executionService)
+        public ShowHelpHandler(ILoggerFactory factory, IInternalPowerShellExecutionService executionService)
         {
             _logger = factory.CreateLogger<ShowHelpHandler>();
             _executionService = executionService;