Added some additional nullable annotations

david-driscoll · david-driscoll · commit ca8e18664894 · 2020-10-03T15:04:58.000-04:00
diff --git a/src/Client/Configuration/ChainedConfigurationProvider.cs b/src/Client/Configuration/ChainedConfigurationProvider.cs
@@ -72,7 +72,7 @@ public void Load() { }
         /// <returns>The child keys.</returns>
         public IEnumerable<string> GetChildKeys(
             IEnumerable<string> earlierKeys,
-            string parentPath)
+            string? parentPath)
         {
             IConfiguration section = parentPath == null ? _config : _config.GetSection(parentPath);
             var children = section.GetChildren();
diff --git a/src/Client/Configuration/ChainedConfigurationSource.cs b/src/Client/Configuration/ChainedConfigurationSource.cs
@@ -13,7 +13,7 @@ internal class ChainedConfigurationSource : IConfigurationSource
         /// <summary>
         /// The chained configuration.
         /// </summary>
-        public IConfiguration Configuration { get; set; }
+        public IConfiguration Configuration { get; set; } = null!;
 
         /// <summary>
         /// Whether the chained configuration should be disposed when the
diff --git a/src/Client/DefaultLanguageClientFacade.cs b/src/Client/DefaultLanguageClientFacade.cs
@@ -19,8 +19,8 @@ internal class DefaultLanguageClientFacade : LanguageProtocolProxy, ILanguageCli
         private readonly Lazy<IWorkspaceLanguageClient> _workspace;
         private readonly Lazy<IHandlersManager> _handlersManager;
         private readonly TextDocumentIdentifiers _textDocumentIdentifiers;
-        private readonly IInsanceHasStarted _insanceHasStarted;
-        private ILanguageClient _languageClient;
+        private readonly IInsanceHasStarted _instanceHasStarted;
+        private ILanguageClient? _languageClient;
 
         public DefaultLanguageClientFacade(
             IResponseRouter requestRouter,
@@ -34,7 +34,7 @@ public DefaultLanguageClientFacade(
             Lazy<IWorkspaceLanguageClient> workspace,
             Lazy<IHandlersManager> handlersManager,
             TextDocumentIdentifiers textDocumentIdentifiers,
-            IInsanceHasStarted insanceHasStarted
+            IInsanceHasStarted instanceHasStarted
         ) : base(requestRouter, resolverContext, progressManager, languageProtocolSettings)
         {
             _textDocument = textDocument;
@@ -44,7 +44,7 @@ IInsanceHasStarted insanceHasStarted
             _workspace = workspace;
             _handlersManager = handlersManager;
             _textDocumentIdentifiers = textDocumentIdentifiers;
-            _insanceHasStarted = insanceHasStarted;
+            _instanceHasStarted = instanceHasStarted;
         }
 
         public ITextDocumentLanguageClient TextDocument => _textDocument.Value;
@@ -58,7 +58,7 @@ public IDisposable Register(Action<ILanguageClientRegistry> registryAction)
             var manager = new CompositeHandlersManager(_handlersManager.Value);
             registryAction(new LangaugeClientRegistry(ResolverContext, manager, _textDocumentIdentifiers));
             var result = manager.GetDisposable();
-            if (_insanceHasStarted.Started)
+            if (_instanceHasStarted.Started)
             {
                 if (_languageClient == null) throw new NotSupportedException("Language client has not yet started... you shouldn't be here.");
                 LanguageClientHelpers.InitHandlers(_languageClient, result);
diff --git a/src/Client/LanguageClientServiceCollectionExtensions.cs b/src/Client/LanguageClientServiceCollectionExtensions.cs
@@ -80,7 +80,7 @@ internal static IContainer AddLanguageClientInternals(this IContainer container,
 
                     if (providedConfiguration != null)
                     {
-                        builder.CustomAddConfiguration(providedConfiguration.ImplementationInstance as IConfiguration);
+                        builder.CustomAddConfiguration((providedConfiguration.ImplementationInstance as IConfiguration)!);
                     }
 
                     //var didChangeConfigurationProvider = _.GetRequiredService<DidChangeConfigurationProvider>();
diff --git a/src/Dap.Client/Configuration/ChainedConfigurationProvider.cs b/src/Dap.Client/Configuration/ChainedConfigurationProvider.cs
@@ -72,7 +72,7 @@ public void Load() { }
         /// <returns>The child keys.</returns>
         public IEnumerable<string> GetChildKeys(
             IEnumerable<string> earlierKeys,
-            string parentPath)
+            string? parentPath)
         {
             IConfiguration section = parentPath == null ? _config : _config.GetSection(parentPath);
             var children = section.GetChildren();
diff --git a/src/Dap.Client/Configuration/ChainedConfigurationSource.cs b/src/Dap.Client/Configuration/ChainedConfigurationSource.cs
@@ -13,7 +13,7 @@ internal class ChainedConfigurationSource : IConfigurationSource
         /// <summary>
         /// The chained configuration.
         /// </summary>
-        public IConfiguration Configuration { get; set; }
+        public IConfiguration Configuration { get; set; } = null!;
 
         /// <summary>
         /// Whether the chained configuration should be disposed when the
diff --git a/src/Dap.Client/DebugAdapterClientServiceCollectionExtensions.cs b/src/Dap.Client/DebugAdapterClientServiceCollectionExtensions.cs
@@ -75,7 +75,7 @@ internal static IContainer AddDebugAdapterClientInternals(this IContainer contai
 
                     if (providedConfiguration != null)
                     {
-                        builder.CustomAddConfiguration(providedConfiguration.ImplementationInstance as IConfiguration);
+                        builder.CustomAddConfiguration((providedConfiguration.ImplementationInstance as IConfiguration)!);
                     }
 
                     return builder.Build();
diff --git a/src/Dap.Server/Configuration/ChainedConfigurationProvider.cs b/src/Dap.Server/Configuration/ChainedConfigurationProvider.cs
@@ -72,7 +72,7 @@ public void Load() { }
         /// <returns>The child keys.</returns>
         public IEnumerable<string> GetChildKeys(
             IEnumerable<string> earlierKeys,
-            string parentPath)
+            string? parentPath)
         {
             IConfiguration section = parentPath == null ? _config : _config.GetSection(parentPath);
             var children = section.GetChildren();
diff --git a/src/Dap.Server/Configuration/ChainedConfigurationSource.cs b/src/Dap.Server/Configuration/ChainedConfigurationSource.cs
@@ -13,7 +13,7 @@ internal class ChainedConfigurationSource : IConfigurationSource
         /// <summary>
         /// The chained configuration.
         /// </summary>
-        public IConfiguration Configuration { get; set; }
+        public IConfiguration Configuration { get; set; } = null!;
 
         /// <summary>
         /// Whether the chained configuration should be disposed when the
diff --git a/src/Dap.Server/DebugAdapterServerServiceCollectionExtensions.cs b/src/Dap.Server/DebugAdapterServerServiceCollectionExtensions.cs
@@ -59,7 +59,7 @@ internal static IContainer AddDebugAdapterServerInternals(this IContainer contai
 
                     if (providedConfiguration != null)
                     {
-                        builder.CustomAddConfiguration(providedConfiguration.ImplementationInstance as IConfiguration);
+                        builder.CustomAddConfiguration((providedConfiguration.ImplementationInstance as IConfiguration)!);
                     }
 
                     return builder.Build();
diff --git a/src/JsonRpc.Generators/GenerateHandlerMethodsGenerator.cs b/src/JsonRpc.Generators/GenerateHandlerMethodsGenerator.cs
@@ -49,7 +49,7 @@ public Task<RichGenerationResult> GenerateRichAsync(TransformationContext contex
                 {
                     var requestType = GetRequestType(symbol);
                     var responseType = GetResponseType(handlerInterface);
-                    methods.AddRange(HandleRequest(handlerInterface, symbol, requestType, responseType, registry, additionalUsings));
+                    methods.AddRange(HandleRequest(handlerInterface, symbol, requestType, responseType!, registry, additionalUsings));
                 }
             }
 
diff --git a/src/JsonRpc/NoopResponseRouter.cs b/src/JsonRpc/NoopResponseRouter.cs
@@ -33,12 +33,12 @@ public void SendNotification(IRequest request)
 
         public IResponseRouterReturns SendRequest(string method) => new Impl();
 
-        public Task<TResponse> SendRequest<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken) => Task.FromResult<TResponse>(default);
+        public Task<TResponse> SendRequest<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken) => Task.FromResult<TResponse>(default!);
 
         bool IResponseRouter.TryGetRequest(long id, [NotNullWhen(true)] out string method, [NotNullWhen(true)] out TaskCompletionSource<JToken> pendingTask)
         {
-            method = default;
-            pendingTask = default;
+            method = default!;
+            pendingTask = default!;
             return false;
         }
 
diff --git a/src/JsonRpc/RequestRouterBase.cs b/src/JsonRpc/RequestRouterBase.cs
@@ -64,7 +64,7 @@ static async Task InnerRoute(IServiceScopeFactory serviceScopeFactory, TDescript
                 context.Descriptor = descriptor;
                 var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
 
-                await HandleNotification(mediator, descriptor, @params ?? Activator.CreateInstance(descriptor.Params), token).ConfigureAwait(false);
+                await HandleNotification(mediator, descriptor, @params ?? Activator.CreateInstance(descriptor.Params!), token).ConfigureAwait(false);
             }
         }
 
diff --git a/src/Protocol/DocumentUri.Internal.cs b/src/Protocol/DocumentUri.Internal.cs
@@ -39,7 +39,7 @@ private static void _validateUri(DocumentUri ret, bool? strict)
 
             // scheme, https://tools.ietf.org/html/rfc3986#section-3.1
             // ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
-            if (!string.IsNullOrWhiteSpace(ret.Scheme) && !SchemePattern.IsMatch(ret.Scheme))
+            if (!string.IsNullOrWhiteSpace(ret.Scheme) && !SchemePattern.IsMatch(ret.Scheme!))
             {
                 throw new UriFormatException("Scheme contains illegal characters.");
             }
@@ -170,11 +170,7 @@ private static string EncodeUriComponentFast(string uriComponent, bool allowSlas
                     }
 
                     // check if we write into a new string (by default we try to return the param)
-                    if (res != null)
-                    {
-                        res ??= new StringBuilder();
-                        res.Append(uriComponent[pos]);
-                    }
+                    res?.Append(uriComponent[pos]);
                 }
                 else
                 {
diff --git a/src/Protocol/LanguageProtocolDelegatingHandlers.cs b/src/Protocol/LanguageProtocolDelegatingHandlers.cs
@@ -401,7 +401,7 @@ CancellationToken cancellationToken
 
                 var subject = new AsyncSubject<TItem>();
                 // in the event nothing is emitted...
-                subject.OnNext(default);
+                subject.OnNext(default!);
                 _handler(request, subject, _capability, cancellationToken);
                 return await subject.Select(_factory).ToTask(cancellationToken).ConfigureAwait(false);
             }
@@ -471,7 +471,7 @@ async Task<TResponse> IRequestHandler<TParams, TResponse>.Handle(TParams request
 
                 var subject = new AsyncSubject<TItem>();
                 // in the event nothing is emitted...
-                subject.OnNext(default);
+                subject.OnNext(default!);
                 _handler(request, subject, cancellationToken);
                 return await subject.Select(_factory).ToTask(cancellationToken).ConfigureAwait(false);
             }
@@ -533,7 +533,7 @@ async Task<TResponse> IRequestHandler<TParams, TResponse>.Handle(TParams request
 
                 var subject = new AsyncSubject<TItem>();
                 // in the event nothing is emitted...
-                subject.OnNext(default);
+                subject.OnNext(default!);
                 _handler(request, _capability, subject, cancellationToken);
                 return await subject.Select(_factory).ToTask(cancellationToken).ConfigureAwait(false);
             }
@@ -591,7 +591,7 @@ async Task<TResponse> IRequestHandler<TParams, TResponse>.Handle(TParams request
 
                 var subject = new AsyncSubject<TItem>();
                 // in the event nothing is emitted...
-                subject.OnNext(default);
+                subject.OnNext(default!);
                 _handler(request, subject, cancellationToken);
                 return await subject.Select(_factory).ToTask(cancellationToken).ConfigureAwait(false);
             }
diff --git a/src/Protocol/LanguageProtocolRpcOptionsBase.cs b/src/Protocol/LanguageProtocolRpcOptionsBase.cs
@@ -35,7 +35,7 @@ public T AddTextDocumentIdentifier<TI>() where TI : ITextDocumentIdentifier
 
         public ISerializer Serializer { get; set; } = new Serializer(ClientVersion.Lsp3);
         internal bool AddDefaultLoggingProvider { get; set; }
-        internal Action<ILoggingBuilder> LoggingBuilderAction { get; set; } = _ => { };
-        internal Action<IConfigurationBuilder> ConfigurationBuilderAction { get; set; } = _ => { };
+        internal Action<ILoggingBuilder>? LoggingBuilderAction { get; set; } = _ => { };
+        internal Action<IConfigurationBuilder>? ConfigurationBuilderAction { get; set; } = _ => { };
     }
 }
diff --git a/src/Protocol/Models/DocumentSelector.cs b/src/Protocol/Models/DocumentSelector.cs
@@ -30,7 +30,7 @@ public DocumentSelector(params DocumentFilter[] items) : base(items)
 
         public static implicit operator DocumentSelector(List<DocumentFilter> items) => new DocumentSelector(items);
 
-        public static implicit operator string(DocumentSelector documentSelector) =>
+        public static implicit operator string(DocumentSelector? documentSelector) =>
             documentSelector is not null ? string.Join(", ", documentSelector.Select(x => (string) x)) : string.Empty;
 
         public bool IsMatch(TextDocumentAttributes attributes) => this.Any(z => z.IsMatch(attributes));
diff --git a/src/Protocol/Models/Position.cs b/src/Protocol/Models/Position.cs
@@ -34,15 +34,15 @@ other is not null &&
             Line == other.Line &&
             Character == other.Character;
 
-        public int CompareTo(Position other)
+        public int CompareTo(Position? other)
         {
             if (ReferenceEquals(this, other)) return 0;
             if (ReferenceEquals(null, other)) return 1;
             var lineComparison = Line.CompareTo(other.Line);
             return lineComparison != 0 ? lineComparison : Character.CompareTo(other.Character);
         }
 
-        public int CompareTo(object obj)
+        public int CompareTo(object? obj)
         {
             if (ReferenceEquals(null, obj)) return 1;
             if (ReferenceEquals(this, obj)) return 0;
diff --git a/src/Protocol/Models/Proposals/ISemanticTokenResult.cs b/src/Protocol/Models/Proposals/ISemanticTokenResult.cs
@@ -13,6 +13,6 @@ public interface ISemanticTokenResult
         /// send a delta.
         /// </summary>
         [Optional]
-        public string ResultId { get; set; }
+        public string? ResultId { get; set; }
     }
 }
diff --git a/src/Protocol/Models/Proposals/SemanticTokensFullOrDelta.cs b/src/Protocol/Models/Proposals/SemanticTokensFullOrDelta.cs
@@ -27,14 +27,14 @@ public SemanticTokensFullOrDelta(SemanticTokensFullOrDeltaPartialResult partialR
 
             if (partialResult.IsDelta)
             {
-                Delta = new SemanticTokensDelta(partialResult.Delta) {
-                    Edits = partialResult.Delta.Edits
+                Delta = new SemanticTokensDelta(partialResult.Delta!) {
+                    Edits = partialResult.Delta!.Edits
                 };
             }
 
             if (partialResult.IsFull)
             {
-                Full = new SemanticTokens(partialResult.Full);
+                Full = new SemanticTokens(partialResult.Full!);
             }
         }
 
diff --git a/src/Protocol/Models/Proposals/SemanticTokensFullOrDeltaPartialResult.cs b/src/Protocol/Models/Proposals/SemanticTokensFullOrDeltaPartialResult.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Diagnostics.CodeAnalysis;
 using Newtonsoft.Json;
 using OmniSharp.Extensions.LanguageServer.Protocol.Serialization.Converters;
 
diff --git a/src/Protocol/Models/TextDocumentIdentifier.cs b/src/Protocol/Models/TextDocumentIdentifier.cs
@@ -42,7 +42,7 @@ public override bool Equals(object? obj)
 
         public static implicit operator TextDocumentIdentifier(string uri) => new TextDocumentIdentifier { Uri = uri };
 
-        private string DebuggerDisplay => Uri?.ToString()!;
+        private string DebuggerDisplay => Uri.ToString()!;
 
         /// <inheritdoc />
         public override string ToString() => DebuggerDisplay;
diff --git a/src/Protocol/Progress/IProgressManager.cs b/src/Protocol/Progress/IProgressManager.cs
@@ -22,14 +22,14 @@ IRequestProgressObservable<TItem, TResult> MonitorUntil<TItem, TResult>(
         IRequestProgressObservable<IEnumerable<TItem>, TResponse> MonitorUntil<TResponse, TItem>(
             IPartialItemsRequest<TResponse, TItem> request, Func<IEnumerable<TItem>, TResponse> factory, CancellationToken cancellationToken
         )
-            where TResponse : IEnumerable<TItem>;
+            where TResponse : IEnumerable<TItem>?;
 
         IRequestProgressObservable<TItem> MonitorUntil<TItem>(IPartialItemsRequest<Container<TItem>, TItem> request, CancellationToken cancellationToken);
 
         IProgressObserver<T> For<T>(ProgressToken token, CancellationToken cancellationToken);
         IProgressObserver<TItem> For<TResponse, TItem>(IPartialItemRequest<TResponse, TItem> request, CancellationToken cancellationToken);
 
         IProgressObserver<IEnumerable<TItem>> For<TResponse, TItem>(IPartialItemsRequest<TResponse, TItem> request, CancellationToken cancellationToken)
-            where TResponse : IEnumerable<TItem>;
+            where TResponse : IEnumerable<TItem>?;
     }
 }
diff --git a/src/Protocol/Progress/ProgressManager.cs b/src/Protocol/Progress/ProgressManager.cs
@@ -179,7 +179,7 @@ public IProgressObserver<TItem> For<TResponse, TItem>(IPartialItemRequest<TRespo
         }
 
         public IProgressObserver<IEnumerable<TItem>> For<TResponse, TItem>(IPartialItemsRequest<TResponse, TItem> request, CancellationToken cancellationToken)
-            where TResponse : IEnumerable<TItem>
+            where TResponse : IEnumerable<TItem>?
         {
             if (request.PartialResultToken == null) return ProgressObserver<IEnumerable<TItem>>.Noop;
             if (_activeObservers.TryGetValue(request.PartialResultToken, out var o) && o is IProgressObserver<IEnumerable<TItem>> observer)
diff --git a/src/Protocol/Serialization/Converters/ProgressTokenConverter.cs b/src/Protocol/Serialization/Converters/ProgressTokenConverter.cs
@@ -4,16 +4,16 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Serialization.Converters
 {
-    internal class ProgressTokenConverter : JsonConverter<ProgressToken>
+    internal class ProgressTokenConverter : JsonConverter<ProgressToken?>
     {
-        public override void WriteJson(JsonWriter writer, ProgressToken value, JsonSerializer serializer)
+        public override void WriteJson(JsonWriter writer, ProgressToken? value, JsonSerializer serializer)
         {
             if (value.IsLong) serializer.Serialize(writer, value.Long);
             else if (value.IsString) serializer.Serialize(writer, value.String);
             else writer.WriteNull();
         }
 
-        public override ProgressToken ReadJson(JsonReader reader, Type objectType, ProgressToken existingValue, bool hasExistingValue, JsonSerializer serializer)
+        public override ProgressToken? ReadJson(JsonReader reader, Type objectType, ProgressToken? existingValue, bool hasExistingValue, JsonSerializer serializer)
         {
             if (reader.TokenType == JsonToken.Integer)
             {
diff --git a/src/Protocol/Serialization/Converters/RangeOrPlaceholderRangeConverter.cs b/src/Protocol/Serialization/Converters/RangeOrPlaceholderRangeConverter.cs
@@ -6,15 +6,15 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Serialization.Converters
 {
-    internal class RangeOrPlaceholderRangeConverter : JsonConverter<RangeOrPlaceholderRange>
+    internal class RangeOrPlaceholderRangeConverter : JsonConverter<RangeOrPlaceholderRange?>
     {
-        public override void WriteJson(JsonWriter writer, RangeOrPlaceholderRange value, JsonSerializer serializer)
+        public override void WriteJson(JsonWriter writer, RangeOrPlaceholderRange? value, JsonSerializer serializer)
         {
-            if (value.IsRange)
+            if (value?.IsRange == true)
             {
                 serializer.Serialize(writer, value.Range);
             }
-            else if (value.IsPlaceholderRange)
+            else if (value?.IsPlaceholderRange == true)
             {
                 serializer.Serialize(writer, value.PlaceholderRange);
             }
@@ -24,13 +24,13 @@ public override void WriteJson(JsonWriter writer, RangeOrPlaceholderRange value,
             }
         }
 
-        public override RangeOrPlaceholderRange ReadJson(
-            JsonReader reader, Type objectType, RangeOrPlaceholderRange existingValue, bool hasExistingValue, JsonSerializer serializer
+        public override RangeOrPlaceholderRange? ReadJson(
+            JsonReader reader, Type objectType, RangeOrPlaceholderRange? existingValue, bool hasExistingValue, JsonSerializer serializer
         )
         {
             if (reader.TokenType is JsonToken.StartObject)
             {
-                var obj = JToken.ReadFrom(reader) as JObject;
+                var obj = (JToken.ReadFrom(reader) as JObject)!;
                 return obj.ContainsKey("placeholder")
                     ? new RangeOrPlaceholderRange(obj.ToObject<PlaceholderRange>())
                     : new RangeOrPlaceholderRange(obj.ToObject<Range>());
diff --git a/src/Protocol/Serialization/Converters/TextDocumentSyncConverter.cs b/src/Protocol/Serialization/Converters/TextDocumentSyncConverter.cs
diff --git a/src/Protocol/Shared/LspHandlerTypeDescriptor.cs b/src/Protocol/Shared/LspHandlerTypeDescriptor.cs
diff --git a/src/Protocol/Workspace/Proposals/ISemanticTokensRefreshHandler.cs b/src/Protocol/Workspace/Proposals/ISemanticTokensRefreshHandler.cs
diff --git a/src/Server/Configuration/ChainedConfigurationProvider.cs b/src/Server/Configuration/ChainedConfigurationProvider.cs
diff --git a/src/Server/Configuration/ChainedConfigurationSource.cs b/src/Server/Configuration/ChainedConfigurationSource.cs
diff --git a/src/Server/LanguageServerServiceCollectionExtensions.cs b/src/Server/LanguageServerServiceCollectionExtensions.cs
diff --git a/src/Server/LanguageServerWorkspaceFolderManager.cs b/src/Server/LanguageServerWorkspaceFolderManager.cs
diff --git a/src/Server/Pipelines/SemanticTokensDeltaPipeline.cs b/src/Server/Pipelines/SemanticTokensDeltaPipeline.cs
diff --git a/src/Shared/SharedHandlerCollection.cs b/src/Shared/SharedHandlerCollection.cs
diff --git a/src/Testing/LanguageProtocolTestBase.cs b/src/Testing/LanguageProtocolTestBase.cs
diff --git a/test/Lsp.Tests/Matchers/ResolveCommandMatcherTests.cs b/test/Lsp.Tests/Matchers/ResolveCommandMatcherTests.cs
diff --git a/test/Lsp.Tests/SemanticTokensDocumentTests.cs b/test/Lsp.Tests/SemanticTokensDocumentTests.cs
diff --git a/test/TestingUtils/AutoNSubstitute/TestLoggerFactory.cs b/test/TestingUtils/AutoNSubstitute/TestLoggerFactory.cs

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public void Load() { }`
`72`	`72`	`/// <returns>The child keys.</returns>`
`73`	`73`	`public IEnumerable<string> GetChildKeys(`
`74`	`74`	`IEnumerable<string> earlierKeys,`
`75`		`- string parentPath)`
	`75`	`+ string? parentPath)`
`76`	`76`	`{`
`77`	`77`	`IConfiguration section = parentPath == null ? _config : _config.GetSection(parentPath);`
`78`	`78`	`var children = section.GetChildren();`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ internal static IContainer AddLanguageClientInternals(this IContainer container,`
`80`	`80`
`81`	`81`	`if (providedConfiguration != null)`
`82`	`82`	`{`
`83`		`- builder.CustomAddConfiguration(providedConfiguration.ImplementationInstance as IConfiguration);`
	`83`	`+ builder.CustomAddConfiguration((providedConfiguration.ImplementationInstance as IConfiguration)!);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`//var didChangeConfigurationProvider = _.GetRequiredService<DidChangeConfigurationProvider>();`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ internal static IContainer AddDebugAdapterClientInternals(this IContainer contai`
`75`	`75`
`76`	`76`	`if (providedConfiguration != null)`
`77`	`77`	`{`
`78`		`- builder.CustomAddConfiguration(providedConfiguration.ImplementationInstance as IConfiguration);`
	`78`	`+ builder.CustomAddConfiguration((providedConfiguration.ImplementationInstance as IConfiguration)!);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`return builder.Build();`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ internal static IContainer AddDebugAdapterServerInternals(this IContainer contai`
`59`	`59`
`60`	`60`	`if (providedConfiguration != null)`
`61`	`61`	`{`
`62`		`- builder.CustomAddConfiguration(providedConfiguration.ImplementationInstance as IConfiguration);`
	`62`	`+ builder.CustomAddConfiguration((providedConfiguration.ImplementationInstance as IConfiguration)!);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`return builder.Build();`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public Task<RichGenerationResult> GenerateRichAsync(TransformationContext contex`
`49`	`49`	`{`
`50`	`50`	`var requestType = GetRequestType(symbol);`
`51`	`51`	`var responseType = GetResponseType(handlerInterface);`
`52`		`- methods.AddRange(HandleRequest(handlerInterface, symbol, requestType, responseType, registry, additionalUsings));`
	`52`	`+ methods.AddRange(HandleRequest(handlerInterface, symbol, requestType, responseType!, registry, additionalUsings));`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,12 @@ public void SendNotification(IRequest request)`
`33`	`33`
`34`	`34`	`public IResponseRouterReturns SendRequest(string method) => new Impl();`
`35`	`35`
`36`		`- public Task<TResponse> SendRequest<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken) => Task.FromResult<TResponse>(default);`
	`36`	`+ public Task<TResponse> SendRequest<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken) => Task.FromResult<TResponse>(default!);`
`37`	`37`
`38`	`38`	`bool IResponseRouter.TryGetRequest(long id, [NotNullWhen(true)] out string method, [NotNullWhen(true)] out TaskCompletionSource<JToken> pendingTask)`
`39`	`39`	`{`
`40`		`- method = default;`
`41`		`- pendingTask = default;`
	`40`	`+ method = default!;`
	`41`	`+ pendingTask = default!;`
`42`	`42`	`return false;`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ static async Task InnerRoute(IServiceScopeFactory serviceScopeFactory, TDescript`
`64`	`64`	`context.Descriptor = descriptor;`
`65`	`65`	`var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();`
`66`	`66`
`67`		`- await HandleNotification(mediator, descriptor, @params ?? Activator.CreateInstance(descriptor.Params), token).ConfigureAwait(false);`
	`67`	`+ await HandleNotification(mediator, descriptor, @params ?? Activator.CreateInstance(descriptor.Params!), token).ConfigureAwait(false);`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ private static void _validateUri(DocumentUri ret, bool? strict)`
`39`	`39`
`40`	`40`	`// scheme, https://tools.ietf.org/html/rfc3986#section-3.1`
`41`	`41`	`// ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )`
`42`		`- if (!string.IsNullOrWhiteSpace(ret.Scheme) && !SchemePattern.IsMatch(ret.Scheme))`
	`42`	`+ if (!string.IsNullOrWhiteSpace(ret.Scheme) && !SchemePattern.IsMatch(ret.Scheme!))`
`43`	`43`	`{`
`44`	`44`	`throw new UriFormatException("Scheme contains illegal characters.");`
`45`	`45`	`}`
`@@ -170,11 +170,7 @@ private static string EncodeUriComponentFast(string uriComponent, bool allowSlas`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`// check if we write into a new string (by default we try to return the param)`
`173`		`- if (res != null)`
`174`		`- {`
`175`		`- res ??= new StringBuilder();`
`176`		`- res.Append(uriComponent[pos]);`
`177`		`- }`
	`173`	`+ res?.Append(uriComponent[pos]);`
`178`	`174`	`}`
`179`	`175`	`else`
`180`	`176`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public T AddTextDocumentIdentifier<TI>() where TI : ITextDocumentIdentifier`
`35`	`35`
`36`	`36`	`public ISerializer Serializer { get; set; } = new Serializer(ClientVersion.Lsp3);`
`37`	`37`	`internal bool AddDefaultLoggingProvider { get; set; }`
`38`		`- internal Action<ILoggingBuilder> LoggingBuilderAction { get; set; } = _ => { };`
`39`		`- internal Action<IConfigurationBuilder> ConfigurationBuilderAction { get; set; } = _ => { };`
	`38`	`+ internal Action<ILoggingBuilder>? LoggingBuilderAction { get; set; } = _ => { };`
	`39`	`+ internal Action<IConfigurationBuilder>? ConfigurationBuilderAction { get; set; } = _ => { };`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,15 @@ other is not null &&`
`34`	`34`	`Line == other.Line &&`
`35`	`35`	`Character == other.Character;`
`36`	`36`
`37`		`- public int CompareTo(Position other)`
	`37`	`+ public int CompareTo(Position? other)`
`38`	`38`	`{`
`39`	`39`	`if (ReferenceEquals(this, other)) return 0;`
`40`	`40`	`if (ReferenceEquals(null, other)) return 1;`
`41`	`41`	`var lineComparison = Line.CompareTo(other.Line);`
`42`	`42`	`return lineComparison != 0 ? lineComparison : Character.CompareTo(other.Character);`
`43`	`43`	`}`
`44`	`44`
`45`		`- public int CompareTo(object obj)`
	`45`	`+ public int CompareTo(object? obj)`
`46`	`46`	`{`
`47`	`47`	`if (ReferenceEquals(null, obj)) return 1;`
`48`	`48`	`if (ReferenceEquals(this, obj)) return 0;`