additional nullable annotation cleanup (#384)

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

Author: david-driscoll

.editorconfig

@@ -128,6 +128,7 @@ resharper_web_config_module_not_resolved_highlighting=warning
 resharper_web_config_type_not_resolved_highlighting=warning
 resharper_web_config_wrong_module_highlighting=warning
 
+dotnet_diagnostic.VSTHRD200.severity = none
 
 [*.{cs,cshtml}]
 charset=utf-8

Directory.Build.props

@@ -5,7 +5,7 @@
  <Authors>David Driscoll</Authors>
  <LangVersion>preview</LangVersion>
  <Features>strict</Features>
- <!-- <Nullable>enable</Nullable> -->
+ <Nullable>enable</Nullable>
  <SignAssembly>true</SignAssembly>
  <DelaySign>false</DelaySign>
  <PackageIcon>images/packageicon.png</PackageIcon>
@@ -24,7 +24,7 @@
  </PropertyGroup>
  <ItemGroup>
  <None Include="$(MSBuildThisFileDirectory)/.tmp/packageicon.png" Condition="Exists('$(MSBuildThisFileDirectory)/.tmp/packageicon.png')" Pack="true" PackagePath="/images/"
- Visible="false" />
- <None Include="$(MSBuildThisFileDirectory)/LICENSE" Pack="true" PackagePath="/" Visible="false" />
+ Visible="false"/>
+ <None Include="$(MSBuildThisFileDirectory)/LICENSE" Pack="true" PackagePath="/" Visible="false"/>
  </ItemGroup>
 </Project>

benchmarks/Pipeline/Class1.cs

@@ -17,19 +17,19 @@ namespace Pipeline
  [SimpleJob(RuntimeMoniker.NetCoreApp21)]
  public class ClassicVsPipelines
  {
- private const string sampleCommand =
+ private const string SampleCommand =
  "Content-Length: 88\r\n\r\n{\"seq\":1,\"type\":\"response\",\"request_seq\":1,\"success\":true,\"command\":\"command\",\"body\":{}}";
 
- private const string anotherPayload =
+ private const string AnotherPayload =
  "Content-Length: 894\r\n\r\n{\"edit\":{\"documentChanges\":[{\"textDocument\":{\"version\":1,\"uri\":\"file:///abc/123/d.cs\"},\"edits\":[{\"range\":{\"start\":{\"line\":1,\"character\":1},\"end\":{\"line\":2,\"character\":2}},\"newText\":\"new text\"},{\"range\":{\"start\":{\"line\":3,\"character\":3},\"end\":{\"line\":4,\"character\":4}},\"newText\":\"new text2\"}]},{\"textDocument\":{\"version\":1,\"uri\":\"file:///abc/123/b.cs\"},\"edits\":[{\"range\":{\"start\":{\"line\":1,\"character\":1},\"end\":{\"line\":2,\"character\":2}},\"newText\":\"new text2\"},{\"range\":{\"start\":{\"line\":3,\"character\":3},\"end\":{\"line\":4,\"character\":4}},\"newText\":\"new text3\"}]},{\"kind\":\"create\",\"uri\":\"file:///abc/123/b.cs\",\"options\":{\"overwrite\":true,\"ignoreIfExists\":true}},{\"kind\":\"rename\",\"oldUri\":\"file:///abc/123/b.cs\",\"newUri\":\"file:///abc/123/c.cs\",\"options\":{\"overwrite\":true,\"ignoreIfExists\":true}},{\"kind\":\"delete\",\"uri\":\"file:///abc/123/c.cs\",\"options\":{\"recursive\":false,\"ignoreIfNotExists\":true}}]}}";
 
 
- private ClassicHandler _classic;
- private PipelinesBased _pipelines;
+ private ClassicHandler? _classic;
+ private PipelinesBased? _pipelines;
 
  [Params(
- sampleCommand,
- anotherPayload
+ SampleCommand,
+ AnotherPayload
  )]
  public string Payload { get; set; }
 

sample/SampleServer/TextDocumentHandler.cs

@@ -13,6 +13,7 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server.WorkDone;
 using OmniSharp.Extensions.LanguageServer.Protocol.Workspace;
+#pragma warning disable CS0618
 
 namespace SampleServer
 {
@@ -154,17 +155,16 @@ CancellationToken cancellationToken
 
  internal class MyWorkspaceSymbolsHandler : WorkspaceSymbolsHandler
  {
- private readonly IServerWorkDoneManager _manager;
  private readonly IServerWorkDoneManager _serverWorkDoneManager;
  private readonly IProgressManager _progressManager;
- private readonly ILogger<MyWorkspaceSymbolsHandler> logger;
+ private readonly ILogger<MyWorkspaceSymbolsHandler> _logger;
 
  public MyWorkspaceSymbolsHandler(IServerWorkDoneManager serverWorkDoneManager, IProgressManager progressManager, ILogger<MyWorkspaceSymbolsHandler> logger) :
  base(new WorkspaceSymbolRegistrationOptions())
  {
  _serverWorkDoneManager = serverWorkDoneManager;
  _progressManager = progressManager;
- this.logger = logger;
+ this._logger = logger;
  }
 
  public override async Task<Container<SymbolInformation>> Handle(

src/Client/LangaugeClientRegistry.cs

@@ -1,4 +1,3 @@
-using System;
 using DryIoc;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client;

src/Client/LanguageClientServiceCollectionExtensions.cs

@@ -7,7 +7,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Primitives;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Client.Configuration;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client;

src/Dap.Client/DebugAdapterClient.cs

@@ -161,11 +161,11 @@ await DebugAdapterEventingHelper.Run(
  _instanceHasStarted.Started = true;
  }
 
- async Task<Unit> IRequestHandler<InitializedEvent, Unit>.Handle(InitializedEvent request, CancellationToken cancellationToken)
+ Task<Unit> IRequestHandler<InitializedEvent, Unit>.Handle(InitializedEvent request, CancellationToken cancellationToken)
  {
  _initializedComplete.OnNext(request);
  _initializedComplete.OnCompleted();
- return Unit.Value;
+ return Unit.Task;
  }
 
  private void RegisterCapabilities(InitializeRequestArguments capabilities)

src/Dap.Client/DefaultDebugAdapterClientFacade.cs

@@ -1,7 +1,6 @@
 using DryIoc;
 using OmniSharp.Extensions.DebugAdapter.Protocol;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Client;
-using OmniSharp.Extensions.DebugAdapter.Protocol.Server;
 using OmniSharp.Extensions.JsonRpc;
 
 namespace OmniSharp.Extensions.DebugAdapter.Client

src/Dap.Shared/DapResponseRouter.cs

@@ -110,7 +110,9 @@ public async Task<TResponse> Returning<TResponse>(CancellationToken cancellation
  cancellationToken.Register(
  () => {
  if (tcs.Task.IsCompleted) return;
+#pragma warning disable VSTHRD110
  _router.SendRequest(RequestNames.Cancel, new { requestId = nextId }).Returning<CancelArguments>(CancellationToken.None);
+#pragma warning restore VSTHRD110
  }
  );
  }

src/JsonRpc.Generators/GenerateRequestMethodsGenerator.cs

@@ -65,7 +65,7 @@ public Task<RichGenerationResult> GenerateRichAsync(TransformationContext contex
  {
  var requestType = GetRequestType(handlerInterface);
  var responseType = GetResponseType(handlerInterface);
- methods.AddRange(HandleRequests(handlerInterface, symbol, requestType, responseType, registry, additionalUsings));
+ methods.AddRange(HandleRequests(handlerInterface, symbol, requestType, responseType!, registry, additionalUsings));
  }
  }