From 1cd0bb63d9b91c38282204f41fd8243317ca6e58 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 26 Apr 2021 13:25:52 -0700 Subject: [PATCH 1/3] Bump OmniSharp to `0.19.2-beta0001` Which contains our two DAP fixes. --- src/PowerShellEditorServices/PowerShellEditorServices.csproj | 4 ++-- .../PowerShellEditorServices.Test.E2E.csproj | 4 ++-- .../PowerShellEditorServices.Test.csproj | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PowerShellEditorServices/PowerShellEditorServices.csproj b/src/PowerShellEditorServices/PowerShellEditorServices.csproj index 5f04edec0..edad364d6 100644 --- a/src/PowerShellEditorServices/PowerShellEditorServices.csproj +++ b/src/PowerShellEditorServices/PowerShellEditorServices.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj b/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj index e78a9d322..3216871ea 100644 --- a/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj +++ b/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj index aff271a6a..5a4d8f990 100644 --- a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj +++ b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj @@ -27,7 +27,7 @@ - + From 4483c3727fbb67f33c4b9c565a1f0161652fabad Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Mon, 26 Apr 2021 13:50:44 -0700 Subject: [PATCH 2/3] Fix `ThreadsHandler` to use singular pipeline thread --- .../DebugAdapter/Handlers/ThreadsHandler.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ThreadsHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ThreadsHandler.cs index f788f3b9c..32657db0d 100644 --- a/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ThreadsHandler.cs +++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ThreadsHandler.cs @@ -7,17 +7,26 @@ using System.Threading.Tasks; using OmniSharp.Extensions.DebugAdapter.Protocol.Models; using OmniSharp.Extensions.DebugAdapter.Protocol.Requests; +using Thread = OmniSharp.Extensions.DebugAdapter.Protocol.Models.Thread; namespace Microsoft.PowerShell.EditorServices.Handlers { internal class ThreadsHandler : IThreadsHandler { + internal static Thread PipelineThread { get; } = + new Thread { Id = 1, Name = "PowerShell Pipeline Thread" }; + public Task Handle(ThreadsArguments request, CancellationToken cancellationToken) { return Task.FromResult(new ThreadsResponse { - // TODO: This is an empty container of threads...do we need to make a thread? - Threads = new Container() + // TODO: OmniSharp supports multithreaded debugging (where + // multiple threads can be debugged at once), but we don't. This + // means we always need to set AllThreadsStoppped and + // AllThreadsContinued in our events. But if we one day support + // multithreaded debugging, we'd need a way to associate + // debugged runspaces with .NET threads in a consistent way. + Threads = new Container(PipelineThread) }); } } From 21c351bd0c158f4b96a0e9eb991aaa489d00eb26 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 26 Apr 2021 13:51:23 -0700 Subject: [PATCH 3/3] Fix namespace conflict --- .../Extensions/Api/EditorExtensionServiceProvider.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PowerShellEditorServices/Extensions/Api/EditorExtensionServiceProvider.cs b/src/PowerShellEditorServices/Extensions/Api/EditorExtensionServiceProvider.cs index 582543663..da14f0650 100644 --- a/src/PowerShellEditorServices/Extensions/Api/EditorExtensionServiceProvider.cs +++ b/src/PowerShellEditorServices/Extensions/Api/EditorExtensionServiceProvider.cs @@ -11,7 +11,7 @@ using Microsoft.PowerShell.EditorServices.Utility; using OmniSharp.Extensions.LanguageServer.Protocol.Server; -using Internal = Microsoft.PowerShell.EditorServices.Services; +using InternalServices = Microsoft.PowerShell.EditorServices.Services; namespace Microsoft.PowerShell.EditorServices.Extensions.Services { @@ -46,7 +46,7 @@ internal EditorExtensionServiceProvider(IServiceProvider serviceProvider) LanguageServer = new LanguageServerService(_serviceProvider.GetService()); //DocumentSymbols = new DocumentSymbolService(_serviceProvider.GetService()); ExtensionCommands = new ExtensionCommandService(_serviceProvider.GetService()); - Workspace = new WorkspaceService(_serviceProvider.GetService()); + Workspace = new WorkspaceService(_serviceProvider.GetService()); EditorContext = new EditorContextService(_serviceProvider.GetService()); EditorUI = new EditorUIService(_serviceProvider.GetService()); }