Skip to content

Commit 0b9561b

Browse files
david-driscollmergify[bot]
david-driscoll
and
mergify[bot]
authored
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

+1
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

+3-3
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

+6-6
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

+3-3
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

-1
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

-1
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

+2-2
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

-1
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

+2
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

+1-1
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

‎src/JsonRpc.Testing/JsonRpcServerTestBase.cs

+2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,10 @@ Action<JsonRpcServerOptions> serverOptionsAction
7272
);
7373

7474
await Task.WhenAll(clientTask, serverTask).ConfigureAwait(false);
75+
#pragma warning disable VSTHRD103
7576
_client = clientTask.Result;
7677
_server = serverTask.Result;
78+
#pragma warning restore VSTHRD103
7779

7880
Disposable.Add(_client);
7981
Disposable.Add(_server);

‎src/JsonRpc/HandlerCollection.cs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Reflection;
88
using DryIoc;
99
using MediatR;
10-
using Microsoft.Extensions.DependencyInjection;
1110

1211
namespace OmniSharp.Extensions.JsonRpc
1312
{

‎src/JsonRpc/JsonRpcHandlerCollectionExtensions.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
using System;
21
using System.Collections.Generic;
32
using DryIoc;
4-
using Microsoft.Extensions.DependencyInjection;
53

64
namespace OmniSharp.Extensions.JsonRpc
75
{

‎src/JsonRpc/JsonRpcServer.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace OmniSharp.Extensions.JsonRpc
99
{
10-
public class JsonRpcServer : JsonRpcServerBase, IJsonRpcServer, IServiceProvider
10+
public class JsonRpcServer : JsonRpcServerBase, IJsonRpcServer
1111
{
1212
private readonly Connection _connection;
1313
private readonly IServiceProvider _serviceProvider;

‎src/JsonRpc/RequestRouterBase.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ ILogger logger
150150
{
151151
var property = typeof(Task<>)
152152
.MakeGenericType(result.GetType().GetTypeInfo().GetGenericArguments()[0]).GetTypeInfo()
153-
.GetProperty(nameof(Task<object>.Result), BindingFlags.Public | BindingFlags.Instance)!;
153+
.GetProperty("Result"
154+
, BindingFlags.Public | BindingFlags.Instance)!;
154155

155156
responseValue = property.GetValue(result);
156157
if (responseValue?.GetType() == typeof(Unit))

‎src/JsonRpc/ResponseRouter.cs

-4
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,6 @@ public async Task<TResponse> Returning<TResponse>(CancellationToken cancellation
105105

106106
return result.ToObject<TResponse>(_router.Serializer.JsonSerializer);
107107
}
108-
catch (ObjectDisposedException)
109-
{
110-
throw;
111-
}
112108
finally
113109
{
114110
_router.Requests.TryRemove(nextId, out _);

‎src/JsonRpc/Server/ServerResponse.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace OmniSharp.Extensions.JsonRpc.Server
44
{
55
public class ServerResponse : ResponseBase
66
{
7-
public ServerResponse(object id, JToken result) : base(id) => Result = result;
7+
public ServerResponse(object id, JToken? result) : base(id) => Result = result ?? JValue.CreateNull();
88

99
public JToken Result { get; set; }
1010
}

‎src/Protocol/AbstractHandlers.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public abstract class PartialResults<TParams, TResponse, TItem, TCapability, TRe
9090
IJsonRpcRequestHandler<TParams, TResponse>,
9191
IRegistration<TRegistrationOptions>, ICapability<TCapability>
9292
where TParams : IPartialItemsRequest<TResponse, TItem>
93-
where TResponse : IEnumerable<TItem>, new()
93+
where TResponse : IEnumerable<TItem>?, new()
9494
where TRegistrationOptions : class, new()
9595
where TCapability : ICapability
9696
{

‎src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs

+1
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ public class TextDocumentClientCapabilities : CapabilitiesBase
142142
///
143143
/// @since 3.16.0
144144
/// </summary>
145+
[Obsolete(Constants.Proposal)]
145146
public Supports<MonikerCapability?> Moniker { get; set; }
146147
}
147148
}

‎src/Protocol/Client/ClientLanguageClient.cs

-1
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.Progress;

‎src/Protocol/Client/GeneralLanguageClient.cs

-1
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.Progress;

‎src/Protocol/Client/ILanguageClient.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Threading;
33
using System.Threading.Tasks;
4-
using OmniSharp.Extensions.JsonRpc;
54
using OmniSharp.Extensions.LanguageServer.Protocol.Client.WorkDone;
65

76
namespace OmniSharp.Extensions.LanguageServer.Protocol.Client

‎src/Protocol/Client/TextDocumentLanguageClient.cs

-1
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.Progress;

‎src/Protocol/Client/WindowLanguageClient.cs

-1
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.Progress;

‎src/Protocol/Client/WorkspaceLanguageClient.cs

-1
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.Progress;

‎src/Protocol/Document/IDocumentLinkHandler.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ public static ILanguageServerRegistry OnDocumentLink<T>(
480480
);
481481
}
482482

483-
private class DelegatingDocumentLinkHandler<T> : DocumentLinkHandlerBase<T>, ICanBeIdentifiedHandler where T : HandlerIdentity?, new()
483+
private class DelegatingDocumentLinkHandler<T> : DocumentLinkHandlerBase<T> where T : HandlerIdentity?, new()
484484
{
485485
private readonly Func<DocumentLinkParams, DocumentLinkCapability, CancellationToken, Task<DocumentLinkContainer<T>>> _handleParams;
486486
private readonly Func<DocumentLink<T>, DocumentLinkCapability, CancellationToken, Task<DocumentLink<T>>> _handleResolve;
@@ -502,7 +502,7 @@ protected override Task<DocumentLink<T>> HandleResolve(DocumentLink<T> request,
502502
_handleResolve(request, Capability, cancellationToken);
503503
}
504504

505-
private class DelegatingPartialDocumentLinkHandler<T> : PartialDocumentLinkHandlerBase<T>, ICanBeIdentifiedHandler where T : HandlerIdentity?, new()
505+
private class DelegatingPartialDocumentLinkHandler<T> : PartialDocumentLinkHandlerBase<T> where T : HandlerIdentity?, new()
506506
{
507507
private readonly Action<DocumentLinkParams, IObserver<IEnumerable<DocumentLink<T>>>, DocumentLinkCapability, CancellationToken> _handleParams;
508508
private readonly Func<DocumentLink<T>, DocumentLinkCapability, CancellationToken, Task<DocumentLink<T>>> _handleResolve;

‎src/Protocol/Document/Proposals/IMonikerHandler.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Threading;
43
using System.Threading.Tasks;
54
using OmniSharp.Extensions.JsonRpc;
@@ -42,7 +41,7 @@ protected MonikerHandlerBase(MonikerRegistrationOptions registrationOptions)
4241

4342
[Obsolete(Constants.Proposal)]
4443
public abstract class PartialMonikerHandlerBase :
45-
AbstractHandlers.PartialResults<MonikerParams, Container<Moniker>, Moniker, MonikerCapability, MonikerRegistrationOptions>, IMonikerHandler
44+
AbstractHandlers.PartialResults<MonikerParams, Container<Moniker>?, Moniker, MonikerCapability, MonikerRegistrationOptions>, IMonikerHandler
4645
{
4746
protected PartialMonikerHandlerBase(MonikerRegistrationOptions registrationOptions, IProgressManager progressManager) : base(
4847
registrationOptions, progressManager,

‎src/Protocol/Document/Proposals/ISemanticTokensHandler.cs

-14
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System;
2-
using System.Reactive.Subjects;
32
using System.Threading;
43
using System.Threading.Tasks;
5-
using MediatR;
64
using OmniSharp.Extensions.JsonRpc;
75
using OmniSharp.Extensions.JsonRpc.Generation;
86
using OmniSharp.Extensions.LanguageServer.Protocol.Client;
@@ -172,18 +170,6 @@ SemanticTokensRegistrationOptions registrationOptions
172170
_getSemanticTokensDocument = getSemanticTokensDocument;
173171
}
174172

175-
public DelegatingHandlerBase(
176-
Func<SemanticTokensBuilder, ITextDocumentIdentifierParams, SemanticTokensCapability, Task> tokenize,
177-
Func<ITextDocumentIdentifierParams, SemanticTokensCapability, Task<SemanticTokensDocument>> getSemanticTokensDocument,
178-
SemanticTokensRegistrationOptions registrationOptions
179-
) : this(
180-
(s, t, c, ct) => tokenize(s, t, c),
181-
(t, c, ct) => getSemanticTokensDocument(t, c),
182-
registrationOptions
183-
)
184-
{
185-
}
186-
187173
protected override Task Tokenize(SemanticTokensBuilder builder, ITextDocumentIdentifierParams identifier, CancellationToken cancellationToken)
188174
=> _tokenize(builder, identifier, _capability, cancellationToken);
189175

‎src/Protocol/Document/Proposals/SemanticTokensBuilder.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ public void Push(Range range, int tokenType, int tokenModifiers)
171171
/// </summary>
172172
public SemanticTokensDocument Commit()
173173
{
174-
_document._dataLen = _dataLen;
175-
_document._data = _data.ToImmutable();
174+
_document.DataLen = _dataLen;
175+
_document.Data = _data.ToImmutable();
176176
return _document;
177177
}
178178
}

0 commit comments

Comments
 (0)