make all integration tests retryable. nullability clean up (#460)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: david-driscoll

sample/SampleServer/FoldingRangeHandler.cs

@@ -13,11 +13,11 @@ public FoldingRangeRegistrationOptions GetRegistrationOptions() =>
                 DocumentSelector = DocumentSelector.ForLanguage("csharp")
             };
 
-        public Task<Container<FoldingRange>> Handle(
+        public Task<Container<FoldingRange>?> Handle(
             FoldingRangeRequestParam request,
             CancellationToken cancellationToken
         ) =>
-            Task.FromResult(
+            Task.FromResult<Container<FoldingRange>?>(
                 new Container<FoldingRange>(
                     new FoldingRange {
                         StartLine = 10,

src/Client/ILspClientReceiver.cs

@@ -33,7 +33,7 @@ public class LanguageClient : JsonRpcServerBase, ILanguageClient
     {
         private readonly Connection _connection;
         private readonly ClientInfo _clientInfo;
-        private readonly ILspClientReceiver _receiver;
+        private readonly IReceiver _receiver;
         private readonly TextDocumentIdentifiers _textDocumentIdentifiers;
 
         private readonly SharedHandlerCollection _collection;
@@ -128,7 +128,7 @@ internal LanguageClient(
             IEnumerable<ICapability> capabilities,
             ClientInfo clientInfo,
             ClientCapabilities clientCapabilities,
-            ILspClientReceiver lspClientReceiver,
+            IReceiver lspClientReceiver,
             TextDocumentIdentifiers textDocumentIdentifiers,
             IResolverContext resolverContext,
             IEnumerable<OnLanguageClientStartedDelegate> startedDelegates,

src/Client/LanguageClient.cs

@@ -2,11 +2,11 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
 
 namespace OmniSharp.Extensions.LanguageServer.Client
 {
@@ -20,7 +20,7 @@ public static LanguageClientOptions WithSerializer(this LanguageClientOptions op
 
         public static LanguageClientOptions WithReceiver(
             this LanguageClientOptions options,
-            ILspClientReceiver serverReceiver
+            IReceiver serverReceiver
         )
         {
             options.Services.AddSingleton(serverReceiver);

src/Client/LanguageClientOptionsExtensions.cs

@@ -9,10 +9,10 @@
 using MediatR;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
+using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Shared;
 using OmniSharp.Extensions.LanguageServer.Shared;
@@ -93,7 +93,7 @@ public void RegisterCapabilities(ServerCapabilities serverCapabilities)
                         Method = method,
                         RegisterOptions = registrationOptions
                     };
-                    _registrations.AddOrUpdate(registrationOptions.Id, x => reg, (a, b) => reg);
+                    _registrations.AddOrUpdate(registrationOptions.Id, _ => reg, (_, _) => reg);
                 }
             }
 
@@ -115,7 +115,7 @@ public void RegisterCapabilities(ServerCapabilities serverCapabilities)
                             Method = method,
                             RegisterOptions = registrationOptions
                         };
-                        _registrations.AddOrUpdate(registrationOptions.Id, x => reg, (a, b) => reg);
+                        _registrations.AddOrUpdate(registrationOptions.Id, _ => reg, (_, _) => reg);
                     }
                 }
             }
@@ -133,7 +133,7 @@ private void Register(params Registration[] registrations)
 
             foreach (var reg in newRegistrations)
             {
-                _registrations.AddOrUpdate(reg.Id, reg, (a, b) => reg);
+                _registrations.AddOrUpdate(reg.Id, reg, (_, _) => reg);
             }
         }
 
@@ -177,8 +177,7 @@ public IEnumerable<Registration> GetRegistrationsMatchingSelector(DocumentSelect
             _registrations
                .Select(z => z.Value)
                .Where(
-                    x => x.RegisterOptions is ITextDocumentRegistrationOptions ro &&
-                         ro.DocumentSelector != null &&
+                    x => x.RegisterOptions is ITextDocumentRegistrationOptions { DocumentSelector: { } } ro &&
                          ro.DocumentSelector
                            .Join(
                                 documentSelector,
@@ -187,7 +186,7 @@ public IEnumerable<Registration> GetRegistrationsMatchingSelector(DocumentSelect
                                     z.HasPattern ? z.Pattern : string.Empty,
                                 z => z.HasLanguage ? z.Language :
                                     z.HasScheme ? z.Scheme :
-                                    z.HasPattern ? z.Pattern : string.Empty, (a, b) => a
+                                    z.HasPattern ? z.Pattern : string.Empty, (a, _) => a
                             )
                            .Any(y => y.HasLanguage || y.HasPattern || y.HasScheme)
                 );

src/Client/LanguageClientRegistrationManager.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Reflection;
 using DryIoc;
-using MediatR;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;

src/Client/LanguageClientServiceCollectionExtensions.cs

@@ -4,12 +4,10 @@
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.JsonRpc.Server;
 using OmniSharp.Extensions.LanguageServer.Protocol;
-using OmniSharp.Extensions.LanguageServer.Protocol.Shared;
-using OmniSharp.Extensions.LanguageServer.Protocol.Window;
 
 namespace OmniSharp.Extensions.LanguageServer.Client
 {
-    public class LspClientReceiver : Receiver, ILspClientReceiver
+    public class LspClientReceiver : Receiver
     {
         private readonly ILogger<LspClientReceiver> _logger;
 

src/Client/LspClientReceiver.cs

@@ -25,7 +25,7 @@ internal static IContainer AddDebugAdapterClientInternals(this IContainer contai
             }
             else
             {
-                container.RegisterDelegate(_ => new OnUnhandledExceptionHandler(e => { }), Reuse.Singleton);
+                container.RegisterDelegate(_ => new OnUnhandledExceptionHandler(_ => { }), Reuse.Singleton);
             }
 
             container.RegisterInstance<IOptionsFactory<DebugAdapterClientOptions>>(new ValueOptionsFactory<DebugAdapterClientOptions>(options));

src/Dap.Client/DebugAdapterClientServiceCollectionExtensions.cs

@@ -1,15 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Reactive.Threading.Tasks;
-using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
-using OmniSharp.Extensions.DebugAdapter.Protocol.Events;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
 using OmniSharp.Extensions.JsonRpc;
-using OmniSharp.Extensions.JsonRpc.Client;
 using OmniSharp.Extensions.JsonRpc.Server;
 using OmniSharp.Extensions.JsonRpc.Server.Messages;
 

src/Dap.Protocol/DapReceiver.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using OmniSharp.Extensions.DebugAdapter.Protocol.DebugAdapterConverters;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
-using OmniSharp.Extensions.JsonRpc.Serialization;
 
 namespace OmniSharp.Extensions.DebugAdapter.Protocol
 {

src/Dap.Protocol/DapSerializer.cs

@@ -2,7 +2,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
 using OmniSharp.Extensions.JsonRpc;
 using ISerializer = OmniSharp.Extensions.JsonRpc.ISerializer;
 
@@ -17,7 +16,7 @@ protected DebugAdapterRpcOptionsBase()
             RequestProcessIdentifier = new ParallelRequestProcessIdentifier();
         }
 
-        public ISerializer Serializer { get; set; } = new DapProtocolSerializer();
+        public ISerializer Serializer { get; set; } = new DapSerializer();
         internal bool AddDefaultLoggingProvider { get; set; }
         internal Action<ILoggingBuilder> LoggingBuilderAction { get; set; } = _ => { };
         internal Action<IConfigurationBuilder> ConfigurationBuilderAction { get; set; } = _ => { };

src/Dap.Protocol/DebugAdapterRpcOptionsBase.cs

@@ -1,5 +1,3 @@
-using System.Threading;
-using System.Threading.Tasks;
 using MediatR;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;

src/Dap.Protocol/Feature/Events/BreakpointFeature.cs

@@ -1,6 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
+using MediatR;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
 using OmniSharp.Extensions.JsonRpc;

src/Dap.Protocol/Feature/Events/CapabilitiesFeature.cs

@@ -1,6 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
+using MediatR;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.JsonRpc.Generation;

src/Dap.Protocol/Feature/Events/ContinuedFeature.cs

@@ -1,6 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
+using MediatR;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.JsonRpc.Generation;
 

src/Dap.Protocol/Feature/Events/ExitedFeature.cs

@@ -1,6 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
+using MediatR;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.JsonRpc.Generation;
 

src/Dap.Protocol/Feature/Events/InitializedFeature.cs

@@ -1,17 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
-using Newtonsoft.Json;
+using MediatR;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.JsonRpc.Generation;
-using OmniSharp.Extensions.JsonRpc.Serialization.Converters;
 
 // ReSharper disable once CheckNamespace
 namespace OmniSharp.Extensions.DebugAdapter.Protocol

src/Dap.Protocol/Feature/Events/InvalidatedFeature.cs

@@ -1,8 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
+using MediatR;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.JsonRpc.Generation;

src/Dap.Protocol/Feature/Events/LoadedSourceFeature.cs

@@ -1,8 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
+using MediatR;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.JsonRpc.Generation;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;

src/Dap.Protocol/Feature/Events/ModuleFeature.cs

@@ -1,6 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
+using MediatR;
 using Newtonsoft.Json.Linq;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;

src/Dap.Protocol/Feature/Events/OutputFeature.cs

@@ -1,8 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
+using MediatR;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.JsonRpc.Generation;

src/Dap.Protocol/Feature/Events/ProcessFeature.cs

@@ -1,7 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
-using OmniSharp.Extensions.DebugAdapter.Protocol.Events;
+using MediatR;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
 using OmniSharp.Extensions.JsonRpc;

src/Dap.Protocol/Feature/Events/ProgressFeature.cs

@@ -1,16 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
-using Newtonsoft.Json;
+using MediatR;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.JsonRpc.Generation;
-using OmniSharp.Extensions.JsonRpc.Serialization.Converters;
 
 // ReSharper disable once CheckNamespace
 namespace OmniSharp.Extensions.DebugAdapter.Protocol

src/Dap.Protocol/Feature/Events/StoppedFeature.cs

@@ -1,6 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
+using MediatR;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;

src/Dap.Protocol/Feature/Events/TerminatedFeature.cs

@@ -1,16 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
-using Newtonsoft.Json;
-using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
+using MediatR;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.JsonRpc.Generation;
-using OmniSharp.Extensions.JsonRpc.Serialization.Converters;
 
 // ReSharper disable once CheckNamespace
 namespace OmniSharp.Extensions.DebugAdapter.Protocol

src/Dap.Protocol/Feature/Events/ThreadFeature.cs

@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using MediatR;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

src/Dap.Protocol/Feature/Requests/AttachFeature.cs

@@ -1,6 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
+using MediatR;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
 using OmniSharp.Extensions.JsonRpc;

src/Dap.Protocol/Feature/Requests/BreakpointLocationsFeature.cs

@@ -1,6 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR;
+using MediatR;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
 using OmniSharp.Extensions.JsonRpc;

src/Dap.Protocol/Feature/Requests/CancelFeature.cs

@@ -1,5 +1,3 @@
-using System.Threading;
-using System.Threading.Tasks;
 using MediatR;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;

src/Dap.Protocol/Feature/Requests/CompletionsFeature.cs

@@ -1,5 +1,3 @@
-using System.Threading;
-using System.Threading.Tasks;
 using MediatR;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.JsonRpc.Generation;

src/Dap.Protocol/Feature/Requests/ConfigurationDoneFeature.cs

@@ -1,5 +1,3 @@
-using System.Threading;
-using System.Threading.Tasks;
 using MediatR;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
 using OmniSharp.Extensions.JsonRpc;

src/Dap.Protocol/Feature/Requests/ContinueFeature.cs

@@ -1,8 +1,4 @@
-using System.Threading;
-using System.Threading.Tasks;
 using MediatR;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
 using OmniSharp.Extensions.JsonRpc;

src/Dap.Protocol/Feature/Requests/DataBreakpointInfoFeature.cs

@@ -1,5 +1,3 @@
-using System.Threading;
-using System.Threading.Tasks;
 using MediatR;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;