Reinstate debug service tests

.vsts-ci/azure-pipelines-ci.yml

@@ -8,14 +8,6 @@ variables:
   - name: DOTNET_CLI_TELEMETRY_OPTOUT
     value: 'true'
 
-trigger:
-  branches:
-    include:
-      - master
-
-pr:
-- master
-
 jobs:
 - job: PS51_Win2016
   displayName: PowerShell 5.1 - Windows Server 2016

src/PowerShellEditorServices.Hosting/EditorServicesLoader.cs

@@ -120,6 +120,11 @@ public static EditorServicesLoader Create(
             {
                 AppDomain.CurrentDomain.AssemblyLoad += (object sender, AssemblyLoadEventArgs args) =>
                 {
+                    if (args.LoadedAssembly.IsDynamic)
+                    {
+                        return;
+                    }
+
                     logger.Log(
                         PsesLogLevel.Diagnostic,
                         $"Loaded '{args.LoadedAssembly.GetName()}' from '{args.LoadedAssembly.Location}'");

src/PowerShellEditorServices/Extensions/Api/EditorContextService.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.PowerShell.EditorServices.Handlers;
+using Microsoft.PowerShell.EditorServices.Services.Extension;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
 namespace Microsoft.PowerShell.EditorServices.Extensions.Services

src/PowerShellEditorServices/Extensions/Api/EditorExtensionServiceProvider.cs

@@ -5,7 +5,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.Extension;
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 

src/PowerShellEditorServices/Extensions/Api/EditorUIService.cs

@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services.Extension;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
 namespace Microsoft.PowerShell.EditorServices.Extensions.Services
@@ -116,7 +116,9 @@ public async Task<string> PromptInputAsync(string message)
                 new ShowInputPromptRequest
                 {
                     Name = message,
-                }).Returning<ShowInputPromptResponse>(CancellationToken.None).ConfigureAwait(false);
+                })
+                .Returning<ShowInputPromptResponse>(CancellationToken.None)
+                .ConfigureAwait(false);
 
             if (response.PromptCancelled)
             {
@@ -142,7 +144,9 @@ public async Task<IReadOnlyList<string>> PromptMultipleSelectionAsync(string mes
                     Message = message,
                     Choices = choiceDetails,
                     DefaultChoices = defaultChoiceIndexes?.ToArray(),
-                }).Returning<ShowChoicePromptResponse>(CancellationToken.None).ConfigureAwait(false);
+                })
+                .Returning<ShowChoicePromptResponse>(CancellationToken.None)
+                .ConfigureAwait(false);
 
             if (response.PromptCancelled)
             {
@@ -168,7 +172,9 @@ public async Task<string> PromptSelectionAsync(string message, IReadOnlyList<Pro
                     Message = message,
                     Choices = choiceDetails,
                     DefaultChoices = defaultChoiceIndex > -1 ? new[] { defaultChoiceIndex } : null,
-                }).Returning<ShowChoicePromptResponse>(CancellationToken.None).ConfigureAwait(false);
+                })
+                .Returning<ShowChoicePromptResponse>(CancellationToken.None)
+                .ConfigureAwait(false);
 
             if (response.PromptCancelled)
             {

src/PowerShellEditorServices/Extensions/Api/ExtensionCommandService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.Extension;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;

src/PowerShellEditorServices/Extensions/Api/LanguageServerService.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using MediatR;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 using System.Threading;
 using System.Threading.Tasks;

src/PowerShellEditorServices/Extensions/Api/WorkspaceService.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Management.Automation.Language;
-using System.Threading.Tasks;
 
 namespace Microsoft.PowerShell.EditorServices.Extensions.Services
 {

src/PowerShellEditorServices/Extensions/EditorContext.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
 namespace Microsoft.PowerShell.EditorServices.Extensions

src/PowerShellEditorServices/Extensions/EditorFileRanges.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using Microsoft.PowerShell.EditorServices.Handlers;
+using Microsoft.PowerShell.EditorServices.Services.Extension;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using System;

src/PowerShellEditorServices/Extensions/EditorObject.cs

@@ -5,7 +5,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.PowerShell.EditorServices.Extensions.Services;
-using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.Extension;
 
 namespace Microsoft.PowerShell.EditorServices.Extensions
 {

src/PowerShellEditorServices/Extensions/EditorWorkspace.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.Threading.Tasks;
-
 namespace Microsoft.PowerShell.EditorServices.Extensions
 {
     /// <summary>

src/PowerShellEditorServices/Hosting/EditorServicesServerFactory.cs

@@ -8,10 +8,10 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Logging;
 using Microsoft.PowerShell.EditorServices.Server;
-using Microsoft.PowerShell.EditorServices.Services;
 using Serilog;
 using Serilog.Events;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
+using Microsoft.PowerShell.EditorServices.Services.Extension;
 
 #if DEBUG
 using Serilog.Debugging;

src/PowerShellEditorServices/Logging/HostLoggerAdapter.cs

@@ -3,8 +3,6 @@
 
 using Microsoft.Extensions.Logging;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Microsoft.PowerShell.EditorServices.Logging
 {

src/PowerShellEditorServices/PowerShellEditorServices.csproj

@@ -42,6 +42,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Remove="Extensions\Api\DocumentSymbolService.cs"/>
+    <Compile Remove="Extensions\Api\DocumentSymbolService.cs" />
+    <Compile Remove="Services\Extension\Templating\**" />
+    <EmbeddedResource Remove="Services\Extension\Templating\**" />
+    <None Remove="Services\Extension\Templating\**" />
   </ItemGroup>
 </Project>

src/PowerShellEditorServices/Server/PsesDebugServer.cs

@@ -3,18 +3,15 @@
 
 using System;
 using System.IO;
-using System.Management.Automation;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Handlers;
 using Microsoft.PowerShell.EditorServices.Services;
-using Microsoft.PowerShell.EditorServices.Utility;
-using OmniSharp.Extensions.DebugAdapter.Protocol;
-using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
+using Microsoft.PowerShell.EditorServices.Services.PowerShell.Debugging;
+using Microsoft.PowerShell.EditorServices.Services.PowerShell.Host;
 using OmniSharp.Extensions.DebugAdapter.Server;
-using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Server;
 
 namespace Microsoft.PowerShell.EditorServices.Server
@@ -24,25 +21,17 @@ namespace Microsoft.PowerShell.EditorServices.Server
     /// </summary>
     internal class PsesDebugServer : IDisposable
     {
-        /// <summary>
-        /// This is a bool but must be an int, since Interlocked.Exchange can't handle a bool
-        /// </summary>
-        private static int s_hasRunPsrlStaticCtor = 0;
-
-        private static readonly Lazy<CmdletInfo> s_lazyInvokeReadLineConstructorCmdletInfo = new Lazy<CmdletInfo>(() =>
-        {
-            var type = Type.GetType("Microsoft.PowerShell.EditorServices.Commands.InvokeReadLineConstructorCommand, Microsoft.PowerShell.EditorServices.Hosting");
-            return new CmdletInfo("__Invoke-ReadLineConstructor", type);
-        });
-
         private readonly Stream _inputStream;
         private readonly Stream _outputStream;
         private readonly bool _useTempSession;
         private readonly bool _usePSReadLine;
         private readonly TaskCompletionSource<bool> _serverStopped;
 
         private DebugAdapterServer _debugAdapterServer;
-        private PowerShellContextService _powerShellContextService;
+
+        private PsesInternalHost _psesHost;
+
+        private bool _startedPses;
 
         protected readonly ILoggerFactory _loggerFactory;
 
@@ -75,30 +64,17 @@ public async Task StartAsync()
             {
                 // We need to let the PowerShell Context Service know that we are in a debug session
                 // so that it doesn't send the powerShell/startDebugger message.
-                _powerShellContextService = ServiceProvider.GetService<PowerShellContextService>();
-                _powerShellContextService.IsDebugServerActive = true;
-
-                // Needed to make sure PSReadLine's static properties are initialized in the pipeline thread.
-                // This is only needed for Temp sessions who only have a debug server.
-                if (_usePSReadLine && _useTempSession && Interlocked.Exchange(ref s_hasRunPsrlStaticCtor, 1) == 0)
-                {
-                    var command = new PSCommand()
-                        .AddCommand(s_lazyInvokeReadLineConstructorCmdletInfo.Value);
-
-                    // This must be run synchronously to ensure debugging works
-                    _powerShellContextService
-                        .ExecuteCommandAsync<object>(command, sendOutputToHost: true, sendErrorToHost: true)
-                        .GetAwaiter()
-                        .GetResult();
-                }
+                _psesHost = ServiceProvider.GetService<PsesInternalHost>();
+                _psesHost.DebugContext.IsDebugServerActive = true;
 
                 options
                     .WithInput(_inputStream)
                     .WithOutput(_outputStream)
-                    .WithServices(serviceCollection => serviceCollection
-                        .AddLogging()
-                        .AddOptions()
-                        .AddPsesDebugServices(ServiceProvider, this, _useTempSession))
+                    .WithServices(serviceCollection =>
+                        serviceCollection
+                            .AddLogging()
+                            .AddOptions()
+                            .AddPsesDebugServices(ServiceProvider, this, _useTempSession))
                     // TODO: Consider replacing all WithHandler with AddSingleton
                     .WithHandler<LaunchAndAttachHandler>()
                     .WithHandler<DisconnectHandler>()
@@ -115,6 +91,12 @@ public async Task StartAsync()
                     // The OnInitialize delegate gets run when we first receive the _Initialize_ request:
                     // https://microsoft.github.io/debug-adapter-protocol/specification#Requests_Initialize
                     .OnInitialize(async (server, request, cancellationToken) => {
+                        // We need to make sure the host has been started
+                        _startedPses = !(await _psesHost.TryStartAsync(new HostStartOptions(), CancellationToken.None).ConfigureAwait(false));
+
+                        // Ensure the debugger mode is set correctly - this is required for remote debugging to work
+                        _psesHost.DebugContext.EnableDebugMode();
+
                         var breakpointService = server.GetService<BreakpointService>();
                         // Clear any existing breakpoints before proceeding
                         await breakpointService.RemoveAllBreakpointsAsync().ConfigureAwait(false);
@@ -136,17 +118,27 @@ public async Task StartAsync()
 
         public void Dispose()
         {
-            _powerShellContextService.IsDebugServerActive = false;
-            // TODO: If the debugger has stopped, should we clear the breakpoints?
+            // Note that the lifetime of the DebugContext is longer than the debug server;
+            // It represents the debugger on the PowerShell process we're in,
+            // while a new debug server is spun up for every debugging session
+            _psesHost.DebugContext.IsDebugServerActive = false;
             _debugAdapterServer.Dispose();
             _inputStream.Dispose();
             _outputStream.Dispose();
             _serverStopped.SetResult(true);
+            // TODO: If the debugger has stopped, should we clear the breakpoints?
         }
 
         public async Task WaitForShutdown()
         {
             await _serverStopped.Task.ConfigureAwait(false);
+
+            // If we started the host, we need to ensure any errors are marshalled back to us like this
+            if (_startedPses)
+            {
+                _psesHost.TriggerShutdown();
+                await _psesHost.Shutdown.ConfigureAwait(false);
+            }
         }
 
         #region Events