more serial changes

Author: david-driscoll

src/Protocol/Features/Window/WorkDoneProgressFeature.cs

@@ -11,7 +11,7 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol
 {
     namespace Models
     {
-        [Parallel]
+        [Serial]
         [Method(WindowNames.WorkDoneProgressCreate, Direction.ServerToClient)]
         [GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Window"), GenerateHandlerMethods,
          GenerateRequestMethods(typeof(IWindowLanguageServer), typeof(ILanguageServer))]
@@ -23,7 +23,7 @@ public partial record WorkDoneProgressCreateParams : IRequest
             public ProgressToken? Token { get; init; }
         }
 
-        [Parallel]
+        [Serial]
         [Method(WindowNames.WorkDoneProgressCancel, Direction.ClientToServer)]
         [GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Window"), GenerateHandlerMethods,
          GenerateRequestMethods(typeof(IWindowLanguageClient), typeof(ILanguageClient))]

test/Lsp.Tests/Integration/Fixtures/LanguageProtocolFixture.cs

@@ -14,20 +14,30 @@ public class LanguageProtocolFixture<TConfigureFixture, TConfigureClient, TConfi
         where TConfigureClient : IConfigureLanguageClientOptions, new()
         where TConfigureServer : IConfigureLanguageServerOptions, new()
     {
-        private readonly TestLoggerFactory _loggerFactory;
+        private readonly TestLoggerFactory _loggerServerFactory;
+        private readonly TestLoggerFactory _loggerClientFactory;
 
         public LanguageProtocolFixture() :
-            base(new TConfigureFixture().Configure(new JsonRpcTestOptions(new TestLoggerFactory(null))))
+            base(
+                new TConfigureFixture().Configure(
+                    new JsonRpcTestOptions(
+                        new TestLoggerFactory(null, "{Timestamp:yyyy-MM-dd HH:mm:ss} [Server] [{Level}] {Message}{NewLine}{Exception}"),
+                        new TestLoggerFactory(null, "{Timestamp:yyyy-MM-dd HH:mm:ss} [Client] [{Level}] {Message}{NewLine}{Exception}")
+                    )
+                )
+            )
         {
-            _loggerFactory = (TestOptions.ServerLoggerFactory as TestLoggerFactory)!;
+            _loggerServerFactory = ( TestOptions.ServerLoggerFactory as TestLoggerFactory )!;
+            _loggerClientFactory = ( TestOptions.ClientLoggerFactory as TestLoggerFactory )!;
         }
 
         public void Swap(ITestOutputHelper testOutputHelper)
         {
-            _loggerFactory.Swap(testOutputHelper);
+            _loggerServerFactory.Swap(testOutputHelper);
+            _loggerClientFactory.Swap(testOutputHelper);
         }
 
-        public ILanguageClient Client { get; private set; }= null!;
+        public ILanguageClient Client { get; private set; } = null!;
         public ILanguageServer Server { get; private set; } = null!;
 
         public async Task InitializeAsync()

test/Lsp.Tests/Integration/ProgressTests.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
@@ -266,8 +268,8 @@ public async Task Should_Support_Cancelling_Work_Done_From_Client_To_Server_Requ
             var token = new ProgressToken(Guid.NewGuid().ToString());
 
             var workDoneObservable = Client.WorkDoneManager.Monitor(token);
-            var observable = workDoneObservable.Replay();
-            using var _ = observable.Connect();
+            var data = new List<WorkDoneProgress>();
+            using var _ = workDoneObservable.Subscribe(x => data.Add(x));
 
             using var workDoneObserver = await Server.WorkDoneManager.Create(
                 token, new WorkDoneProgressBegin {
@@ -294,7 +296,7 @@ public async Task Should_Support_Cancelling_Work_Done_From_Client_To_Server_Requ
                 }
             );
 
-            await observable.Take(3).ToTask(CancellationToken);
+            await TestHelper.DelayUntil(() => data.Count >= 3, CancellationToken);
 
             workDoneObservable.Dispose();
 
@@ -314,14 +316,16 @@ public async Task Should_Support_Cancelling_Work_Done_From_Client_To_Server_Requ
 
             workDoneObserver.OnCompleted();
 
-            var results = await observable.Select(
-                z => z switch {
-                    WorkDoneProgressBegin begin  => begin.Message,
-                    WorkDoneProgressReport begin => begin.Message,
-                    WorkDoneProgressEnd begin    => begin.Message,
-                    _                            => throw new NotSupportedException()
-                }
-            ).ToArray().ToTask(CancellationToken);
+            var results = data
+                         .Select(
+                              z => z switch {
+                                  WorkDoneProgressBegin begin  => begin.Message,
+                                  WorkDoneProgressReport begin => begin.Message,
+                                  WorkDoneProgressEnd begin    => begin.Message,
+                                  _                            => throw new NotSupportedException()
+                              }
+                          )
+                         .ToArray();
 
             results.Should().ContainInOrder("Begin", "Report 1", "Report 2");
         }