Added fixes for document color provider, as well as related fixes for other resolve features. (#459)

david-driscoll · web-flow · commit 30cbd6ed69ab · 2020-12-05T11:02:40.000-05:00
diff --git a/src/JsonRpc.Generators/Helpers.cs b/src/JsonRpc.Generators/Helpers.cs
@@ -403,10 +403,10 @@ private static ArgumentListSyntax GetPartialResultArgumentList(TypeSyntax respon
                             )
                         ),
                         Argument(
-                            SimpleLambdaExpression(
-                                Parameter(Identifier("values")),
-                                ObjectCreationExpression(responseName is NullableTypeSyntax nts ? nts.ElementType : responseName)
-                                   .WithArgumentList(ArgumentList(SingletonSeparatedList(Argument(IdentifierName("values")))))
+                            MemberAccessExpression(
+                                SyntaxKind.SimpleMemberAccessExpression,
+                                responseName.EnsureNotNullable(),
+                                IdentifierName("From")
                             )
                         )
                     }
@@ -429,10 +429,10 @@ private static ArgumentListSyntax GetPartialItemsArgumentList(TypeSyntax respons
                             )
                         ),
                         Argument(
-                            SimpleLambdaExpression(
-                                Parameter(Identifier("values")),
-                                ObjectCreationExpression(responseName)
-                                   .WithArgumentList(ArgumentList(SingletonSeparatedList(Argument(IdentifierName("values")))))
+                            MemberAccessExpression(
+                                SyntaxKind.SimpleMemberAccessExpression,
+                                responseName.EnsureNotNullable(),
+                                IdentifierName("From")
                             )
                         )
                     }
@@ -591,12 +591,15 @@ TypeSyntax capabilityName
                                     itemType,
                                     capabilityName
                                 )
-                               .AddArgumentListArguments(
-                                    GetHandlerAdapterArgument(
-                                        TypeArgumentList(SeparatedList(new[] { requestName, itemType })),
-                                        HandlerArgument,
-                                        capabilityName,
-                                        true
+                               .WithArgumentList(
+                                    GetPartialResultArgumentList(
+                                        responseType,
+                                        GetHandlerAdapterArgument(
+                                            TypeArgumentList(SeparatedList(new[] { requestName, itemType })),
+                                            HandlerArgument,
+                                            capabilityName,
+                                            true
+                                        )
                                     )
                                 )
                         )
@@ -633,7 +636,7 @@ public static ArrowExpressionClauseSyntax GetPartialResultHandlerExpression(
 
         public static ArrowExpressionClauseSyntax GetPartialResultsCapabilityHandlerExpression(
             ExpressionSyntax nameExpression, TypeSyntax requestName, TypeSyntax responseType,
-            NameSyntax itemName, TypeSyntax capabilityName
+            TypeSyntax itemName, TypeSyntax capabilityName
         )
         {
             return ArrowExpressionClause(
@@ -652,12 +655,15 @@ public static ArrowExpressionClauseSyntax GetPartialResultsCapabilityHandlerExpr
                                     itemName,
                                     capabilityName
                                 )
-                               .AddArgumentListArguments(
-                                    GetHandlerAdapterArgument(
-                                        TypeArgumentList(SeparatedList(new[] { requestName, itemName })),
-                                        HandlerArgument,
-                                        capabilityName,
-                                        true
+                               .WithArgumentList(
+                                    GetPartialResultArgumentList(
+                                        responseType,
+                                        GetHandlerAdapterArgument(
+                                            TypeArgumentList(SeparatedList(new[] { requestName, itemName })),
+                                            HandlerArgument,
+                                            capabilityName,
+                                            true
+                                        )
                                     )
                                 )
                         )
@@ -686,7 +692,17 @@ TypeSyntax responseType
                                     responseType,
                                     itemName
                                 )
-                               .WithArgumentList(GetPartialItemsArgumentList(responseType, HandlerArgument))
+                               .WithArgumentList(
+                                    GetPartialItemsArgumentList(
+                                        responseType,
+                                        GetHandlerAdapterArgument(
+                                            TypeArgumentList(SeparatedList(new[] { requestName, itemName })),
+                                            HandlerArgument,
+                                            null,
+                                            true
+                                        )
+                                    )
+                                )
                         )
                     )
                 )
diff --git a/src/JsonRpc.Generators/Strategies/OnRequestMethodGeneratorWithRegistrationOptionsStrategy.cs b/src/JsonRpc.Generators/Strategies/OnRequestMethodGeneratorWithRegistrationOptionsStrategy.cs
@@ -519,7 +519,7 @@ private static ArgumentListSyntax GetPartialResultArgumentList(
                         Argument(
                             MemberAccessExpression(
                                 SyntaxKind.SimpleMemberAccessExpression,
-                                responseName is NullableTypeSyntax nts ? nts.ElementType : responseName,
+                                responseName.EnsureNotNullable(),
                                 IdentifierName("From")
                             )
                         )
diff --git a/src/JsonRpc.Generators/Strategies/OnRequestMethodGeneratorWithoutRegistrationOptionsStrategy.cs b/src/JsonRpc.Generators/Strategies/OnRequestMethodGeneratorWithoutRegistrationOptionsStrategy.cs
@@ -147,7 +147,7 @@ public IEnumerable<MemberDeclarationSyntax> Apply(ExtensionMethodContext extensi
                            .WithExpressionBody(
                                 GetPartialResultsCapabilityHandlerExpression(
                                     GetJsonRpcMethodName(extensionMethodContext.TypeDeclaration), request.Request.Syntax, request.Response.Syntax,
-                                    partialItemsSyntax, capability.Syntax
+                                    partialItems.Syntax, capability.Syntax
                                 )
                             )
                     );
diff --git a/src/JsonRpc.Generators/Strategies/OnRequestTypedResolveMethodGeneratorWithoutRegistrationOptionsStrategy.cs b/src/JsonRpc.Generators/Strategies/OnRequestTypedResolveMethodGeneratorWithoutRegistrationOptionsStrategy.cs
@@ -136,7 +136,7 @@ public IEnumerable<MemberDeclarationSyntax> Apply(ExtensionMethodContext extensi
                            .WithExpressionBody(
                                 GetPartialResultsCapabilityHandlerExpression(
                                     GetJsonRpcMethodName(extensionMethodContext.TypeDeclaration), requestType, responseType,
-                                    observerType, capability.Syntax
+                                    resolveType, capability.Syntax
                                 )
                             )
                     );
diff --git a/src/Protocol/AbstractHandlers.cs b/src/Protocol/AbstractHandlers.cs
@@ -17,7 +17,8 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol
     public static class AbstractHandlers
     {
         public abstract class Base<TRegistrationOptions, TCapability> :
-            IRegistration<TRegistrationOptions, TCapability>
+            IRegistration<TRegistrationOptions, TCapability>,
+            ICapability<TCapability>
             where TRegistrationOptions : class, new()
             where TCapability : ICapability
         {
@@ -32,6 +33,11 @@ TRegistrationOptions IRegistration<TRegistrationOptions, TCapability>.GetRegistr
                 Capability = capability;
                 return RegistrationOptions = CreateRegistrationOptions(capability, clientCapabilities);
             }
+
+            void ICapability<TCapability>.SetCapability(TCapability capability, ClientCapabilities clientCapabilities)
+            {
+                Capability = capability;
+            }
         }
 
         public abstract class BaseCapability<TCapability> :
@@ -40,7 +46,7 @@ public abstract class BaseCapability<TCapability> :
         {
             protected TCapability Capability { get; private set; } = default!;
 
-            void ICapability<TCapability>.SetCapability(TCapability capability)
+            void ICapability<TCapability>.SetCapability(TCapability capability, ClientCapabilities clientCapabilities)
             {
                 Capability = capability;
             }
diff --git a/src/Protocol/Features/Document/CodeActionFeature.cs b/src/Protocol/Features/Document/CodeActionFeature.cs
@@ -98,7 +98,7 @@ public record CodeActionContext
             GenerateTypedData,
             GenerateContainer
         ]
-        [RegistrationOptions(typeof(CodeActionRegistrationOptions)), Capability(typeof(CodeActionCapability))]
+        [Capability(typeof(CodeActionCapability))]
         public partial record CodeAction : ICanBeResolved, IRequest<CodeAction>, IDoesNotParticipateInRegistration
         {
             /// <summary>
diff --git a/src/Protocol/Features/Document/CodeLensFeature.cs b/src/Protocol/Features/Document/CodeLensFeature.cs
@@ -62,7 +62,7 @@ public partial record CodeLensParams : ITextDocumentIdentifierParams, IWorkDoneP
             GenerateTypedData,
             GenerateContainer
         ]
-        [RegistrationOptions(typeof(CodeLensRegistrationOptions)), Capability(typeof(CodeLensCapability))]
+        [Capability(typeof(CodeLensCapability))]
         public partial record CodeLens : IRequest<CodeLens>, ICanBeResolved, IDoesNotParticipateInRegistration
         {
             /// <summary>
diff --git a/src/Protocol/Features/Document/ColorFeature.cs b/src/Protocol/Features/Document/ColorFeature.cs
@@ -18,38 +18,59 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol
     namespace Models
     {
         [Parallel]
-        [Method(TextDocumentNames.ColorPresentation, Direction.ClientToServer)]
+        [Method(TextDocumentNames.DocumentColor, Direction.ClientToServer)]
         [
             GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Document"),
             GenerateHandlerMethods,
             GenerateRequestMethods(typeof(ITextDocumentLanguageClient), typeof(ILanguageClient))
         ]
         [RegistrationOptions(typeof(DocumentColorRegistrationOptions)), Capability(typeof(ColorProviderCapability))]
-        public partial record ColorPresentationParams : IRequest<Container<ColorPresentation>>
+        public partial record DocumentColorParams : IPartialItemsRequest<Container<ColorInformation>, ColorInformation>, IWorkDoneProgressParams
         {
             /// <summary>
-            /// The document to provide document links for.
+            /// The text document.
             /// </summary>
             public TextDocumentIdentifier TextDocument { get; init; }
+        }
 
+        public partial record ColorInformation
+        {
             /// <summary>
-            /// The actual color value for this color range.
+            /// The range in the document where this color appears.
             /// </summary>
-            public DocumentColor Color { get; init; }
+            public Range Range { get; init; }
 
             /// <summary>
-            /// The range in the document where this color appers.
+            /// The actual color value for this color range.
             /// </summary>
-            public Range Range { get; init; }
+            public DocumentColor Color { get; init; }
+
+            public ColorPresentationParams For(TextDocumentIdentifier textDocumentIdentifier)
+            {
+                return new ColorPresentationParams() {
+                    Color = Color,
+                    Range = Range,
+                    TextDocument = textDocumentIdentifier
+                };
+            }
         }
 
         [Parallel]
+        [Method(TextDocumentNames.ColorPresentation, Direction.ClientToServer)]
         [
             GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Document"),
             GenerateHandlerMethods,
             GenerateRequestMethods(typeof(ITextDocumentLanguageClient), typeof(ILanguageClient))
         ]
-        [RegistrationOptions(typeof(DocumentColorRegistrationOptions)), Capability(typeof(ColorProviderCapability))]
+        [Capability(typeof(ColorProviderCapability))]
+        public partial record ColorPresentationParams : ColorInformation, IRequest<Container<ColorPresentation>>, IDoesNotParticipateInRegistration
+        {
+            /// <summary>
+            /// The document to provide document links for.
+            /// </summary>
+            public TextDocumentIdentifier TextDocument { get; init; }
+        }
+
         public partial record ColorPresentation
         {
             /// <summary>
@@ -75,35 +96,6 @@ public partial record ColorPresentation
             public TextEditContainer? AdditionalTextEdits { get; init; }
         }
 
-        [Parallel]
-        [Method(TextDocumentNames.DocumentColor, Direction.ClientToServer)]
-        [
-            GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Document"),
-            GenerateHandlerMethods,
-            GenerateRequestMethods(typeof(ITextDocumentLanguageClient), typeof(ILanguageClient))
-        ]
-        [RegistrationOptions(typeof(DocumentColorRegistrationOptions)), Capability(typeof(ColorProviderCapability))]
-        public partial record DocumentColorParams : IPartialItemsRequest<Container<ColorInformation>, ColorInformation>, IWorkDoneProgressParams
-        {
-            /// <summary>
-            /// The text document.
-            /// </summary>
-            public TextDocumentIdentifier TextDocument { get; init; }
-        }
-
-        public partial record ColorInformation
-        {
-            /// <summary>
-            /// The range in the document where this color appers.
-            /// </summary>
-            public Range Range { get; init; }
-
-            /// <summary>
-            /// The actual color value for this color range.
-            /// </summary>
-            public DocumentColor Color { get; init; }
-        }
-
         /// <summary>
         /// Represents a color in RGBA space.
         /// </summary>
diff --git a/src/Protocol/Features/Document/CompletionFeature.cs b/src/Protocol/Features/Document/CompletionFeature.cs
@@ -60,7 +60,7 @@ public partial record CompletionParams : TextDocumentPositionParams, IWorkDonePr
             GenerateContainer("CompletionList"),
             GenerateTypedData
         ]
-        [RegistrationOptions(typeof(CompletionRegistrationOptions)), Capability(typeof(CompletionCapability))]
+        [Capability(typeof(CompletionCapability))]
         public partial record CompletionItem : ICanBeResolved, IRequest<CompletionItem>, IDoesNotParticipateInRegistration
         {
             /// <summary>
diff --git a/src/Protocol/Features/Document/DocumentLinkFeature.cs b/src/Protocol/Features/Document/DocumentLinkFeature.cs
@@ -59,7 +59,7 @@ public partial record DocumentLinkParams : ITextDocumentIdentifierParams, IParti
             GenerateTypedData,
             GenerateContainer
         ]
-        [RegistrationOptions(typeof(DocumentLinkRegistrationOptions)), Capability(typeof(DocumentLinkCapability))]
+        [Capability(typeof(DocumentLinkCapability))]
         public partial record DocumentLink : ICanBeResolved, IRequest<DocumentLink>, IDoesNotParticipateInRegistration
         {
             /// <summary>
diff --git a/src/Protocol/Features/Document/Proposals/CallHierarchyFeature.cs b/src/Protocol/Features/Document/Proposals/CallHierarchyFeature.cs
@@ -149,7 +149,7 @@ public abstract record CallHierarchyBaseCallParams<T> : ICanBeResolved
             GenerateHandlerMethods,
             GenerateRequestMethods(typeof(ITextDocumentLanguageClient), typeof(ILanguageClient))
         ]
-        [RegistrationOptions(typeof(CallHierarchyRegistrationOptions)), Capability(typeof(CallHierarchyCapability))]
+        [Capability(typeof(CallHierarchyCapability))]
         public partial record CallHierarchyIncomingCallsParams : CallHierarchyBaseCallParams, IWorkDoneProgressParams,
                                                                 IPartialItemsRequest<Container<CallHierarchyIncomingCall>?, CallHierarchyIncomingCall>, IDoesNotParticipateInRegistration
         {
@@ -201,7 +201,7 @@ public partial record  CallHierarchyIncomingCall
             GenerateHandlerMethods,
             GenerateRequestMethods(typeof(ITextDocumentLanguageClient), typeof(ILanguageClient))
         ]
-        [RegistrationOptions(typeof(CallHierarchyRegistrationOptions)), Capability(typeof(CallHierarchyCapability))]
+        [Capability(typeof(CallHierarchyCapability))]
         public partial record CallHierarchyOutgoingCallsParams : CallHierarchyBaseCallParams, IWorkDoneProgressParams,
                                                                 IPartialItemsRequest<Container<CallHierarchyOutgoingCall>?, CallHierarchyOutgoingCall>, IDoesNotParticipateInRegistration
 
diff --git a/src/Protocol/ICapability.cs b/src/Protocol/ICapability.cs
@@ -1,7 +1,9 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
+
 namespace OmniSharp.Extensions.LanguageServer.Protocol
 {
     public interface ICapability<in TCapability>
     {
-        void SetCapability(TCapability capability);
+        void SetCapability(TCapability capability, ClientCapabilities clientCapabilities);
     }
 }
diff --git a/src/Protocol/LanguageProtocolDelegatingHandlers.cs b/src/Protocol/LanguageProtocolDelegatingHandlers.cs
@@ -595,22 +595,22 @@ public sealed class PartialResultsCapability<TParams, TResponse, TItem, TCapabil
             where TResponse : IEnumerable<TItem>?
             where TCapability : ICapability
         {
-            private readonly Action<TParams, TCapability, IObserver<IEnumerable<TItem>>, CancellationToken> _handler;
+            private readonly Action<TParams, IObserver<IEnumerable<TItem>>, TCapability, CancellationToken> _handler;
             private readonly IProgressManager _progressManager;
             private readonly Func<IEnumerable<TItem>, TResponse?> _factory;
             private readonly Guid _id;
             Guid ICanBeIdentifiedHandler.Id => _id;
 
             public PartialResultsCapability(
-                Action<TParams, TCapability, IObserver<IEnumerable<TItem>>, CancellationToken> handler, IProgressManager progressManager,
+                Action<TParams, IObserver<IEnumerable<TItem>>, TCapability, CancellationToken> handler, IProgressManager progressManager,
                 Func<IEnumerable<TItem>, TResponse?> factory
             ) :
                 this(Guid.Empty, handler, progressManager, factory)
             {
             }
 
             public PartialResultsCapability(
-                Guid id, Action<TParams, TCapability, IObserver<IEnumerable<TItem>>, CancellationToken> handler, IProgressManager progressManager,
+                Guid id, Action<TParams, IObserver<IEnumerable<TItem>>, TCapability, CancellationToken> handler, IProgressManager progressManager,
                 Func<IEnumerable<TItem>, TResponse?> factory
             )
             {
@@ -625,7 +625,7 @@ public PartialResultsCapability(
                 var observer = _progressManager.For(request, cancellationToken);
                 if (observer != ProgressObserver<IEnumerable<TItem>>.Noop)
                 {
-                    _handler(request, Capability, observer, cancellationToken);
+                    _handler(request, observer, Capability, cancellationToken);
                     await observer;
                     return _factory(Enumerable.Empty<TItem>());
                 }
@@ -638,7 +638,7 @@ public PartialResultsCapability(
                                        }
                                    )
                                   .ToTask(cancellationToken);
-                _handler(request, Capability, subject, cancellationToken);
+                _handler(request, subject, Capability, cancellationToken);
                 var result = _factory(await task.ConfigureAwait(false));
                 return result;
             }
diff --git a/src/Server/Configuration/DidChangeConfigurationProvider.cs b/src/Server/Configuration/DidChangeConfigurationProvider.cs
@@ -76,9 +76,7 @@ public Task<Unit> Handle(DidChangeConfigurationParams request, CancellationToken
             return Unit.Task;
         }
 
-        public object GetRegistrationOptions() => new object();
-
-        public void SetCapability(DidChangeConfigurationCapability capability) => _capability = capability;
+        public void SetCapability(DidChangeConfigurationCapability capability, ClientCapabilities clientCapabilities) => _capability = capability;
         public bool IsSupported => _capability != null;
 
         Task IOnLanguageServerStarted.OnStarted(ILanguageServer server, CancellationToken cancellationToken) => GetWorkspaceConfigurationAsync(cancellationToken);
diff --git a/src/Shared/SupportedCapabilities.cs b/src/Shared/SupportedCapabilities.cs

Original file line number	Diff line number	Diff line change
`@@ -403,10 +403,10 @@ private static ArgumentListSyntax GetPartialResultArgumentList(TypeSyntax respon`
`403`	`403`	`)`
`404`	`404`	`),`
`405`	`405`	`Argument(`
`406`		`- SimpleLambdaExpression(`
`407`		`- Parameter(Identifier("values")),`
`408`		`- ObjectCreationExpression(responseName is NullableTypeSyntax nts ? nts.ElementType : responseName)`
`409`		`- .WithArgumentList(ArgumentList(SingletonSeparatedList(Argument(IdentifierName("values")))))`
	`406`	`+ MemberAccessExpression(`
	`407`	`+ SyntaxKind.SimpleMemberAccessExpression,`
	`408`	`+ responseName.EnsureNotNullable(),`
	`409`	`+ IdentifierName("From")`
`410`	`410`	`)`
`411`	`411`	`)`
`412`	`412`	`}`
`@@ -429,10 +429,10 @@ private static ArgumentListSyntax GetPartialItemsArgumentList(TypeSyntax respons`
`429`	`429`	`)`
`430`	`430`	`),`
`431`	`431`	`Argument(`
`432`		`- SimpleLambdaExpression(`
`433`		`- Parameter(Identifier("values")),`
`434`		`- ObjectCreationExpression(responseName)`
`435`		`- .WithArgumentList(ArgumentList(SingletonSeparatedList(Argument(IdentifierName("values")))))`
	`432`	`+ MemberAccessExpression(`
	`433`	`+ SyntaxKind.SimpleMemberAccessExpression,`
	`434`	`+ responseName.EnsureNotNullable(),`
	`435`	`+ IdentifierName("From")`
`436`	`436`	`)`
`437`	`437`	`)`
`438`	`438`	`}`
`@@ -591,12 +591,15 @@ TypeSyntax capabilityName`
`591`	`591`	`itemType,`
`592`	`592`	`capabilityName`
`593`	`593`	`)`
`594`		`- .AddArgumentListArguments(`
`595`		`- GetHandlerAdapterArgument(`
`596`		`- TypeArgumentList(SeparatedList(new[] { requestName, itemType })),`
`597`		`- HandlerArgument,`
`598`		`- capabilityName,`
`599`		`- true`
	`594`	`+ .WithArgumentList(`
	`595`	`+ GetPartialResultArgumentList(`
	`596`	`+ responseType,`
	`597`	`+ GetHandlerAdapterArgument(`
	`598`	`+ TypeArgumentList(SeparatedList(new[] { requestName, itemType })),`
	`599`	`+ HandlerArgument,`
	`600`	`+ capabilityName,`
	`601`	`+ true`
	`602`	`+ )`
`600`	`603`	`)`
`601`	`604`	`)`
`602`	`605`	`)`
`@@ -633,7 +636,7 @@ public static ArrowExpressionClauseSyntax GetPartialResultHandlerExpression(`
`633`	`636`
`634`	`637`	`public static ArrowExpressionClauseSyntax GetPartialResultsCapabilityHandlerExpression(`
`635`	`638`	`ExpressionSyntax nameExpression, TypeSyntax requestName, TypeSyntax responseType,`
`636`		`- NameSyntax itemName, TypeSyntax capabilityName`
	`639`	`+ TypeSyntax itemName, TypeSyntax capabilityName`
`637`	`640`	`)`
`638`	`641`	`{`
`639`	`642`	`return ArrowExpressionClause(`
`@@ -652,12 +655,15 @@ public static ArrowExpressionClauseSyntax GetPartialResultsCapabilityHandlerExpr`
`652`	`655`	`itemName,`
`653`	`656`	`capabilityName`
`654`	`657`	`)`
`655`		`- .AddArgumentListArguments(`
`656`		`- GetHandlerAdapterArgument(`
`657`		`- TypeArgumentList(SeparatedList(new[] { requestName, itemName })),`
`658`		`- HandlerArgument,`
`659`		`- capabilityName,`
`660`		`- true`
	`658`	`+ .WithArgumentList(`
	`659`	`+ GetPartialResultArgumentList(`
	`660`	`+ responseType,`
	`661`	`+ GetHandlerAdapterArgument(`
	`662`	`+ TypeArgumentList(SeparatedList(new[] { requestName, itemName })),`
	`663`	`+ HandlerArgument,`
	`664`	`+ capabilityName,`
	`665`	`+ true`
	`666`	`+ )`
`661`	`667`	`)`
`662`	`668`	`)`
`663`	`669`	`)`
`@@ -686,7 +692,17 @@ TypeSyntax responseType`
`686`	`692`	`responseType,`
`687`	`693`	`itemName`
`688`	`694`	`)`
`689`		`- .WithArgumentList(GetPartialItemsArgumentList(responseType, HandlerArgument))`
	`695`	`+ .WithArgumentList(`
	`696`	`+ GetPartialItemsArgumentList(`
	`697`	`+ responseType,`
	`698`	`+ GetHandlerAdapterArgument(`
	`699`	`+ TypeArgumentList(SeparatedList(new[] { requestName, itemName })),`
	`700`	`+ HandlerArgument,`
	`701`	`+ null,`
	`702`	`+ true`
	`703`	`+ )`
	`704`	`+ )`
	`705`	`+ )`
`690`	`706`	`)`
`691`	`707`	`)`
`692`	`708`	`)`
Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ private static ArgumentListSyntax GetPartialResultArgumentList(`
`519`	`519`	`Argument(`
`520`	`520`	`MemberAccessExpression(`
`521`	`521`	`SyntaxKind.SimpleMemberAccessExpression,`
`522`		`- responseName is NullableTypeSyntax nts ? nts.ElementType : responseName,`
	`522`	`+ responseName.EnsureNotNullable(),`
`523`	`523`	`IdentifierName("From")`
`524`	`524`	`)`
`525`	`525`	`)`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public IEnumerable<MemberDeclarationSyntax> Apply(ExtensionMethodContext extensi`
`147`	`147`	`.WithExpressionBody(`
`148`	`148`	`GetPartialResultsCapabilityHandlerExpression(`
`149`	`149`	`GetJsonRpcMethodName(extensionMethodContext.TypeDeclaration), request.Request.Syntax, request.Response.Syntax,`
`150`		`- partialItemsSyntax, capability.Syntax`
	`150`	`+ partialItems.Syntax, capability.Syntax`
`151`	`151`	`)`
`152`	`152`	`)`
`153`	`153`	`);`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public IEnumerable<MemberDeclarationSyntax> Apply(ExtensionMethodContext extensi`
`136`	`136`	`.WithExpressionBody(`
`137`	`137`	`GetPartialResultsCapabilityHandlerExpression(`
`138`	`138`	`GetJsonRpcMethodName(extensionMethodContext.TypeDeclaration), requestType, responseType,`
`139`		`- observerType, capability.Syntax`
	`139`	`+ resolveType, capability.Syntax`
`140`	`140`	`)`
`141`	`141`	`)`
`142`	`142`	`);`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol`
`17`	`17`	`public static class AbstractHandlers`
`18`	`18`	`{`
`19`	`19`	`public abstract class Base<TRegistrationOptions, TCapability> :`
`20`		`- IRegistration<TRegistrationOptions, TCapability>`
	`20`	`+ IRegistration<TRegistrationOptions, TCapability>,`
	`21`	`+ ICapability<TCapability>`
`21`	`22`	`where TRegistrationOptions : class, new()`
`22`	`23`	`where TCapability : ICapability`
`23`	`24`	`{`
`@@ -32,6 +33,11 @@ TRegistrationOptions IRegistration<TRegistrationOptions, TCapability>.GetRegistr`
`32`	`33`	`Capability = capability;`
`33`	`34`	`return RegistrationOptions = CreateRegistrationOptions(capability, clientCapabilities);`
`34`	`35`	`}`
	`36`	`+`
	`37`	`+ void ICapability<TCapability>.SetCapability(TCapability capability, ClientCapabilities clientCapabilities)`
	`38`	`+ {`
	`39`	`+ Capability = capability;`
	`40`	`+ }`
`35`	`41`	`}`
`36`	`42`
`37`	`43`	`public abstract class BaseCapability<TCapability> :`
`@@ -40,7 +46,7 @@ public abstract class BaseCapability<TCapability> :`
`40`	`46`	`{`
`41`	`47`	`protected TCapability Capability { get; private set; } = default!;`
`42`	`48`
`43`		`- void ICapability<TCapability>.SetCapability(TCapability capability)`
	`49`	`+ void ICapability<TCapability>.SetCapability(TCapability capability, ClientCapabilities clientCapabilities)`
`44`	`50`	`{`
`45`	`51`	`Capability = capability;`
`46`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public record CodeActionContext`
`98`	`98`	`GenerateTypedData,`
`99`	`99`	`GenerateContainer`
`100`	`100`	`]`
`101`		`- [RegistrationOptions(typeof(CodeActionRegistrationOptions)), Capability(typeof(CodeActionCapability))]`
	`101`	`+ [Capability(typeof(CodeActionCapability))]`
`102`	`102`	`public partial record CodeAction : ICanBeResolved, IRequest<CodeAction>, IDoesNotParticipateInRegistration`
`103`	`103`	`{`
`104`	`104`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public partial record CodeLensParams : ITextDocumentIdentifierParams, IWorkDoneP`
`62`	`62`	`GenerateTypedData,`
`63`	`63`	`GenerateContainer`
`64`	`64`	`]`
`65`		`- [RegistrationOptions(typeof(CodeLensRegistrationOptions)), Capability(typeof(CodeLensCapability))]`
	`65`	`+ [Capability(typeof(CodeLensCapability))]`
`66`	`66`	`public partial record CodeLens : IRequest<CodeLens>, ICanBeResolved, IDoesNotParticipateInRegistration`
`67`	`67`	`{`
`68`	`68`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public partial record CompletionParams : TextDocumentPositionParams, IWorkDonePr`
`60`	`60`	`GenerateContainer("CompletionList"),`
`61`	`61`	`GenerateTypedData`
`62`	`62`	`]`
`63`		`- [RegistrationOptions(typeof(CompletionRegistrationOptions)), Capability(typeof(CompletionCapability))]`
	`63`	`+ [Capability(typeof(CompletionCapability))]`
`64`	`64`	`public partial record CompletionItem : ICanBeResolved, IRequest<CompletionItem>, IDoesNotParticipateInRegistration`
`65`	`65`	`{`
`66`	`66`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public partial record DocumentLinkParams : ITextDocumentIdentifierParams, IParti`
`59`	`59`	`GenerateTypedData,`
`60`	`60`	`GenerateContainer`
`61`	`61`	`]`
`62`		`- [RegistrationOptions(typeof(DocumentLinkRegistrationOptions)), Capability(typeof(DocumentLinkCapability))]`
	`62`	`+ [Capability(typeof(DocumentLinkCapability))]`
`63`	`63`	`public partial record DocumentLink : ICanBeResolved, IRequest<DocumentLink>, IDoesNotParticipateInRegistration`
`64`	`64`	`{`
`65`	`65`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public abstract record CallHierarchyBaseCallParams<T> : ICanBeResolved`
`149`	`149`	`GenerateHandlerMethods,`
`150`	`150`	`GenerateRequestMethods(typeof(ITextDocumentLanguageClient), typeof(ILanguageClient))`
`151`	`151`	`]`
`152`		`- [RegistrationOptions(typeof(CallHierarchyRegistrationOptions)), Capability(typeof(CallHierarchyCapability))]`
	`152`	`+ [Capability(typeof(CallHierarchyCapability))]`
`153`	`153`	`public partial record CallHierarchyIncomingCallsParams : CallHierarchyBaseCallParams, IWorkDoneProgressParams,`
`154`	`154`	`IPartialItemsRequest<Container<CallHierarchyIncomingCall>?, CallHierarchyIncomingCall>, IDoesNotParticipateInRegistration`
`155`	`155`	`{`
`@@ -201,7 +201,7 @@ public partial record CallHierarchyIncomingCall`
`201`	`201`	`GenerateHandlerMethods,`
`202`	`202`	`GenerateRequestMethods(typeof(ITextDocumentLanguageClient), typeof(ILanguageClient))`
`203`	`203`	`]`
`204`		`- [RegistrationOptions(typeof(CallHierarchyRegistrationOptions)), Capability(typeof(CallHierarchyCapability))]`
	`204`	`+ [Capability(typeof(CallHierarchyCapability))]`
`205`	`205`	`public partial record CallHierarchyOutgoingCallsParams : CallHierarchyBaseCallParams, IWorkDoneProgressParams,`
`206`	`206`	`IPartialItemsRequest<Container<CallHierarchyOutgoingCall>?, CallHierarchyOutgoingCall>, IDoesNotParticipateInRegistration`
`207`	`207`