Skip to content

Commit 0b9561b

Browse files
additional nullable annotation cleanup (#384)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 0ad2787 commit 0b9561b

File tree

171 files changed

+967
-1051
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+967
-1051
lines changed

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ resharper_web_config_module_not_resolved_highlighting=warning
128128
resharper_web_config_type_not_resolved_highlighting=warning
129129
resharper_web_config_wrong_module_highlighting=warning
130130

131+
dotnet_diagnostic.VSTHRD200.severity = none
131132

132133
[*.{cs,cshtml}]
133134
charset=utf-8

Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Authors>David Driscoll</Authors>
66
<LangVersion>preview</LangVersion>
77
<Features>strict</Features>
8-
<!-- <Nullable>enable</Nullable> -->
8+
<Nullable>enable</Nullable>
99
<SignAssembly>true</SignAssembly>
1010
<DelaySign>false</DelaySign>
1111
<PackageIcon>images/packageicon.png</PackageIcon>
@@ -24,7 +24,7 @@
2424
</PropertyGroup>
2525
<ItemGroup>
2626
<None Include="$(MSBuildThisFileDirectory)/.tmp/packageicon.png" Condition="Exists('$(MSBuildThisFileDirectory)/.tmp/packageicon.png')" Pack="true" PackagePath="/images/"
27-
Visible="false" />
28-
<None Include="$(MSBuildThisFileDirectory)/LICENSE" Pack="true" PackagePath="/" Visible="false" />
27+
Visible="false"/>
28+
<None Include="$(MSBuildThisFileDirectory)/LICENSE" Pack="true" PackagePath="/" Visible="false"/>
2929
</ItemGroup>
3030
</Project>

benchmarks/Pipeline/Class1.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ namespace Pipeline
1717
[SimpleJob(RuntimeMoniker.NetCoreApp21)]
1818
public class ClassicVsPipelines
1919
{
20-
private const string sampleCommand =
20+
private const string SampleCommand =
2121
"Content-Length: 88\r\n\r\n{\"seq\":1,\"type\":\"response\",\"request_seq\":1,\"success\":true,\"command\":\"command\",\"body\":{}}";
2222

23-
private const string anotherPayload =
23+
private const string AnotherPayload =
2424
"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}}]}}";
2525

2626

27-
private ClassicHandler _classic;
28-
private PipelinesBased _pipelines;
27+
private ClassicHandler? _classic;
28+
private PipelinesBased? _pipelines;
2929

3030
[Params(
31-
sampleCommand,
32-
anotherPayload
31+
SampleCommand,
32+
AnotherPayload
3333
)]
3434
public string Payload { get; set; }
3535

sample/SampleServer/TextDocumentHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities;
1414
using OmniSharp.Extensions.LanguageServer.Protocol.Server.WorkDone;
1515
using OmniSharp.Extensions.LanguageServer.Protocol.Workspace;
16+
#pragma warning disable CS0618
1617

1718
namespace SampleServer
1819
{
@@ -154,17 +155,16 @@ CancellationToken cancellationToken
154155

155156
internal class MyWorkspaceSymbolsHandler : WorkspaceSymbolsHandler
156157
{
157-
private readonly IServerWorkDoneManager _manager;
158158
private readonly IServerWorkDoneManager _serverWorkDoneManager;
159159
private readonly IProgressManager _progressManager;
160-
private readonly ILogger<MyWorkspaceSymbolsHandler> logger;
160+
private readonly ILogger<MyWorkspaceSymbolsHandler> _logger;
161161

162162
public MyWorkspaceSymbolsHandler(IServerWorkDoneManager serverWorkDoneManager, IProgressManager progressManager, ILogger<MyWorkspaceSymbolsHandler> logger) :
163163
base(new WorkspaceSymbolRegistrationOptions())
164164
{
165165
_serverWorkDoneManager = serverWorkDoneManager;
166166
_progressManager = progressManager;
167-
this.logger = logger;
167+
this._logger = logger;
168168
}
169169

170170
public override async Task<Container<SymbolInformation>> Handle(

src/Client/LangaugeClientRegistry.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System;
21
using DryIoc;
32
using OmniSharp.Extensions.JsonRpc;
43
using OmniSharp.Extensions.LanguageServer.Protocol.Client;

src/Client/LanguageClientServiceCollectionExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Microsoft.Extensions.DependencyInjection;
88
using Microsoft.Extensions.DependencyInjection.Extensions;
99
using Microsoft.Extensions.Options;
10-
using Microsoft.Extensions.Primitives;
1110
using OmniSharp.Extensions.JsonRpc;
1211
using OmniSharp.Extensions.LanguageServer.Client.Configuration;
1312
using OmniSharp.Extensions.LanguageServer.Protocol.Client;

src/Dap.Client/DebugAdapterClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,11 @@ await DebugAdapterEventingHelper.Run(
161161
_instanceHasStarted.Started = true;
162162
}
163163

164-
async Task<Unit> IRequestHandler<InitializedEvent, Unit>.Handle(InitializedEvent request, CancellationToken cancellationToken)
164+
Task<Unit> IRequestHandler<InitializedEvent, Unit>.Handle(InitializedEvent request, CancellationToken cancellationToken)
165165
{
166166
_initializedComplete.OnNext(request);
167167
_initializedComplete.OnCompleted();
168-
return Unit.Value;
168+
return Unit.Task;
169169
}
170170

171171
private void RegisterCapabilities(InitializeRequestArguments capabilities)

src/Dap.Client/DefaultDebugAdapterClientFacade.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using DryIoc;
22
using OmniSharp.Extensions.DebugAdapter.Protocol;
33
using OmniSharp.Extensions.DebugAdapter.Protocol.Client;
4-
using OmniSharp.Extensions.DebugAdapter.Protocol.Server;
54
using OmniSharp.Extensions.JsonRpc;
65

76
namespace OmniSharp.Extensions.DebugAdapter.Client

src/Dap.Shared/DapResponseRouter.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ public async Task<TResponse> Returning<TResponse>(CancellationToken cancellation
110110
cancellationToken.Register(
111111
() => {
112112
if (tcs.Task.IsCompleted) return;
113+
#pragma warning disable VSTHRD110
113114
_router.SendRequest(RequestNames.Cancel, new { requestId = nextId }).Returning<CancelArguments>(CancellationToken.None);
115+
#pragma warning restore VSTHRD110
114116
}
115117
);
116118
}

src/JsonRpc.Generators/GenerateRequestMethodsGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public Task<RichGenerationResult> GenerateRichAsync(TransformationContext contex
6565
{
6666
var requestType = GetRequestType(handlerInterface);
6767
var responseType = GetResponseType(handlerInterface);
68-
methods.AddRange(HandleRequests(handlerInterface, symbol, requestType, responseType, registry, additionalUsings));
68+
methods.AddRange(HandleRequests(handlerInterface, symbol, requestType, responseType!, registry, additionalUsings));
6969
}
7070
}
7171

0 commit comments

Comments
 (0)