Add support to properly handle custom extensions

.editorconfig

@@ -19,19 +19,20 @@ indent_style=space
 indent_size=4
 insert_final_newline=true
 
-[*.{json,xml,yml,yaml}]
+[*.{xml,yml,yaml}]
 indent_style=space
 indent_size=2
 insert_final_newline=true
 
-[*.{xml,csproj,props,targets}]
+[*.json]
 indent_style=space
+indent_size=4
+insert_final_newline=true
 
-[{*.har,*.inputactions,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,bowerrc,jest.config}]
+[*.{xml,csproj,props,targets}]
 indent_style=space
-indent_size=2
 
-[{*.yaml,*.yml}]
+[{*.har,*.inputactions,*.jsb2,*.jsb3,.babelrc,.eslintrc,.prettierrc,.stylelintrc,bowerrc,jest.config}]
 indent_style=space
 indent_size=2
 

src/Client/LanguageClient.cs

@@ -5,6 +5,7 @@
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using System.Reactive.Threading.Tasks;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using DryIoc;
@@ -42,6 +43,7 @@ public class LanguageClient : JsonRpcServerBase, ILanguageClient
  private readonly IEnumerable<IOnLanguageClientInitialize> _initializeHandlers;
  private readonly IEnumerable<OnLanguageClientInitializedDelegate> _initializedDelegates;
  private readonly IEnumerable<IOnLanguageClientInitialized> _initializedHandlers;
+ private readonly ISerializer _serializer;
  private readonly IResponseRouter _responseRouter;
  private readonly ISubject<InitializeResult> _initializeComplete = new AsyncSubject<InitializeResult>();
  private readonly CompositeDisposable _disposable = new CompositeDisposable();
@@ -140,7 +142,8 @@ internal LanguageClient(
  IRegistrationManager registrationManager,
  ILanguageClientWorkspaceFoldersManager languageClientWorkspaceFoldersManager, IEnumerable<OnLanguageClientInitializeDelegate> initializeDelegates,
  IEnumerable<IOnLanguageClientInitialize> initializeHandlers, IEnumerable<OnLanguageClientInitializedDelegate> initializedDelegates,
- IEnumerable<IOnLanguageClientInitialized> initializedHandlers
+ IEnumerable<IOnLanguageClientInitialized> initializedHandlers,
+ ISerializer serializer
  ) : base(handlerCollection, responseRouter)
  {
  _connection = connection;
@@ -167,6 +170,7 @@ IEnumerable<IOnLanguageClientInitialized> initializedHandlers
  _initializeHandlers = initializeHandlers;
  _initializedDelegates = initializedDelegates;
  _initializedHandlers = initializedHandlers;
+ _serializer = serializer;
  _concurrency = options.Value.Concurrency;
 
  // We need to at least create Window here in case any handler does loggin in their constructor
@@ -205,15 +209,43 @@ public async Task Initialize(CancellationToken token)
  {
  var @params = new InitializeParams {
  Trace = _trace,
- Capabilities = _clientCapabilities,
  ClientInfo = _clientInfo,
+ Capabilities = _clientCapabilities,
  RootUri = _rootUri,
  RootPath = _rootUri?.GetFileSystemPath(),
  WorkspaceFolders = new Container<WorkspaceFolder>(WorkspaceFoldersManager.CurrentWorkspaceFolders),
  InitializationOptions = _initializationOptions
  };
 
- RegisterCapabilities(@params.Capabilities);
+ var capabilitiesObject = new JObject();
+ foreach (var capability in _capabilities)
+ {
+ var keys = capability.GetType().GetCustomAttribute<CapabilityKeyAttribute>()?.Keys.Select(key => char.ToLower(key[0]) + key.Substring(1)).ToArray();
+ if (keys != null)
+ {
+ var value = capabilitiesObject;
+ foreach (var key in keys.Take(keys.Length - 1))
+ {
+ if (value.TryGetValue(key, out var t) && t is JObject to)
+ {
+ value = to;
+ }
+ else
+ {
+ value[key] = value = new JObject();
+ }
+ }
+ var lastKey = keys[keys.Length - 1];
+ value[lastKey] = JToken.FromObject(capability, _serializer.JsonSerializer);
+ }
+ }
+
+ using (var reader = capabilitiesObject.CreateReader())
+ {
+ _serializer.JsonSerializer.Populate(reader, _clientCapabilities);
+ }
+
+ RegisterCapabilities(_clientCapabilities);
 
  WorkDoneManager.Initialize(@params.Capabilities.Window);
 
@@ -229,7 +261,7 @@ await LanguageProtocolEventingHelper.Run(
  );
 
  _connection.Open();
- var serverParams = await this.RequestLanguageProtocolInitialize(ClientSettings, token);
+ var serverParams = await SendRequest(ClientSettings, token);
  _receiver.Initialized();
 
  ServerSettings = serverParams;
@@ -334,17 +366,17 @@ public async Task Shutdown()
  _connection.Dispose();
  }
 
- private T UseOrTryAndFindCapability<T>(Supports<T> supports)
+ private Supports<T> UseOrTryAndFindCapability<T>(Supports<T> supports) where T : class
  {
  var value = supports.IsSupported
  ? supports.Value
- : _capabilities.OfType<T>().FirstOrDefault() ?? Activator.CreateInstance<T>();
+ : _capabilities.OfType<T>().FirstOrDefault();
  if (value is IDynamicCapability dynamicCapability)
  {
  dynamicCapability.DynamicRegistration = _collection.ContainsHandler(typeof(IRegisterCapabilityHandler));
  }
 
- return value;
+ return Supports.OfValue(value);
  }
 
  public IObservable<InitializeResult> Start => _initializeComplete.AsObservable();

src/JsonRpc.Generators/GenerateHandlerMethodsGenerator.cs

@@ -75,6 +75,8 @@ public Task<RichGenerationResult> GenerateRichAsync(TransformationContext contex
  }
  );
 
+ var isInternal = handlerInterface.Modifiers.Any(z => z.IsKind(SyntaxKind.InternalKeyword));
+
  return Task.FromResult(
  new RichGenerationResult {
  Usings = List(newUsings),
@@ -88,9 +90,12 @@ public Task<RichGenerationResult> GenerateRichAsync(TransformationContext contex
  .WithAttributeLists(attributes)
  .WithModifiers(
  TokenList(
- Token(SyntaxKind.PublicKeyword),
- Token(SyntaxKind.StaticKeyword),
- Token(SyntaxKind.PartialKeyword)
+ new[] { isInternal ? Token(SyntaxKind.InternalKeyword) : Token(SyntaxKind.PublicKeyword) }.Concat(
+ new[] {
+ Token(SyntaxKind.StaticKeyword),
+ Token(SyntaxKind.PartialKeyword)
+ }
+ )
  )
  )
  .WithMembers(List(methods))

src/JsonRpc.Generators/GenerateRequestMethodsGenerator.cs

@@ -95,6 +95,7 @@ public Task<RichGenerationResult> GenerateRichAsync(TransformationContext contex
  .Except(existingUsings)
  .Select(z => UsingDirective(IdentifierName(z)))
  ;
+ var isInternal = handlerInterface.Modifiers.Any(z => z.IsKind(SyntaxKind.InternalKeyword));
  return Task.FromResult(
  new RichGenerationResult {
  Usings = List(newUsings),
@@ -108,9 +109,12 @@ public Task<RichGenerationResult> GenerateRichAsync(TransformationContext contex
  .WithAttributeLists(attributes)
  .WithModifiers(
  TokenList(
- Token(SyntaxKind.PublicKeyword),
- Token(SyntaxKind.StaticKeyword),
- Token(SyntaxKind.PartialKeyword)
+ new[] { isInternal ? Token(SyntaxKind.InternalKeyword) : Token(SyntaxKind.PublicKeyword) }.Concat(
+ new[] {
+ Token(SyntaxKind.StaticKeyword),
+ Token(SyntaxKind.PartialKeyword)
+ }
+ )
  )
  )
  .WithMembers(List(methods))

src/JsonRpc/HandlerTypeDescriptorProvider.cs

@@ -125,7 +125,11 @@ internal static IEnumerable<IHandlerTypeDescriptor> GetDescriptors(IEnumerable<A
  .Select(HandlerTypeDescriptorHelper.GetMethodType)
  .Distinct()
  .ToLookup(x => MethodAttribute.From(x).Method)
- .SelectMany(x => x.Select(z => new HandlerTypeDescriptor(z) as IHandlerTypeDescriptor));
+ .SelectMany(
+ x => x
+ .Distinct()
+ .Select(z => new HandlerTypeDescriptor(z) as IHandlerTypeDescriptor)
+ );
 
  public IHandlerTypeDescriptor GetHandlerTypeDescriptor<A>() => GetHandlerTypeDescriptor(typeof(A));
 

src/Protocol/CapabilitiesBase.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol
+{
+ public abstract class CapabilitiesBase
+ {
+ [JsonExtensionData] public IDictionary<string, JToken> ExtensionData { get; set; } = new Dictionary<string, JToken>();
+ }
+}

src/Protocol/CapabilityKeyAttribute.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol
+{
+ [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface)]
+ public sealed class CapabilityKeyAttribute : Attribute
+ {
+ public IEnumerable<string> Keys { get; }
+
+ public CapabilityKeyAttribute(string key, params string[] additionalKeys)
+ {
+ Keys = new[] { key }.Concat(additionalKeys).ToArray();
+ }
+ }
+}

src/Protocol/Client/Capabilities/CallHierarchyCapability.cs

@@ -9,6 +9,7 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
  /// @since 3.16.0
  /// </summary>
  [Obsolete(Constants.Proposal)]
+ [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.CallHierarchy))]
  public class CallHierarchyCapability : DynamicCapability, ConnectedCapability<ICallHierarchyHandler>,
  ConnectedCapability<ICallHierarchyIncomingHandler>, ConnectedCapability<ICallHierarchyOutgoingHandler>
  {

src/Protocol/Client/Capabilities/ClientCapabilities.cs

@@ -3,7 +3,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
- public class ClientCapabilities
+ public class ClientCapabilities : CapabilitiesBase
  {
  /// <summary>
  /// Workspace specific client capabilities.

src/Protocol/Client/Capabilities/CodeActionCapability.cs

@@ -3,6 +3,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
+ [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.CodeAction))]
  public class CodeActionCapability : DynamicCapability, ConnectedCapability<ICodeActionHandler>
  {
  /// <summary>
@@ -12,7 +13,7 @@ public class CodeActionCapability : DynamicCapability, ConnectedCapability<ICode
  /// Since 3.8.0
  /// </summary>
  [Optional]
- public CodeActionLiteralSupportCapability CodeActionLiteralSupport { get; set; }
+ public CodeActionLiteralSupportOptions CodeActionLiteralSupport { get; set; }
 
  /// <summary>
  /// Whether code action supports the `isPreferred` property.

src/Protocol/Client/Capabilities/CodeActionKindCapability.cs → src/Protocol/Client/Capabilities/CodeActionKindCapabilityOptions.cs

@@ -2,7 +2,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
- public class CodeActionKindCapability
+ public class CodeActionKindCapabilityOptions
  {
  /// <summary>
  /// The code action kind values the client supports. When this

src/Protocol/Client/Capabilities/CodeActionLiteralSupportCapability.cs → src/Protocol/Client/Capabilities/CodeActionLiteralSupportOptions.cs

@@ -1,12 +1,12 @@
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
- public class CodeActionLiteralSupportCapability
+ public class CodeActionLiteralSupportOptions
  {
  /// <summary>
  /// The code action kind is support with the following value
  /// set.
  /// </summary>
 
- public CodeActionKindCapability CodeActionKind { get; set; }
+ public CodeActionKindCapabilityOptions CodeActionKind { get; set; }
  }
 }

src/Protocol/Client/Capabilities/CodeLensCapability.cs

@@ -2,6 +2,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
+ [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.CodeLens))]
  public class CodeLensCapability : DynamicCapability, ConnectedCapability<ICodeLensHandler>
  {
  }

src/Protocol/Client/Capabilities/ColorProviderCapability.cs

@@ -2,6 +2,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
+ [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.ColorProvider))]
  public class ColorProviderCapability : DynamicCapability, ConnectedCapability<IDocumentColorHandler>, ConnectedCapability<IColorPresentationHandler>
  {
  }

src/Protocol/Client/Capabilities/CompletionCapability.cs

@@ -3,20 +3,21 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
+ [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.Completion))]
  public class CompletionCapability : DynamicCapability, ConnectedCapability<ICompletionHandler>
  {
  /// <summary>
  /// The client supports the following `CompletionItem` specific
  /// capabilities.
  /// </summary>
  [Optional]
- public CompletionItemCapability CompletionItem { get; set; }
+ public CompletionItemCapabilityOptions CompletionItem { get; set; }
 
  /// <summary>
  /// Specific capabilities for the `CompletionItemKind` in the `textDocument/completion` request.
  /// </summary>
  [Optional]
- public CompletionItemKindCapability CompletionItemKind { get; set; }
+ public CompletionItemKindCapabilityOptions CompletionItemKind { get; set; }
 
  /// <summary>
  /// The client supports to send additional context information for a `textDocument/completion` request.

src/Protocol/Client/Capabilities/CompletionItemCapability.cs → src/Protocol/Client/Capabilities/CompletionItemCapabilityOptions.cs

@@ -3,7 +3,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
- public class CompletionItemCapability
+ public class CompletionItemCapabilityOptions
  {
  /// <summary>
  /// Client supports snippets as insert text.
@@ -50,7 +50,7 @@ public class CompletionItemCapability
  /// @since 3.15.0
  /// </summary>
  [Optional]
- public Supports<CompletionItemTagSupportCapability> TagSupport { get; set; }
+ public Supports<CompletionItemTagSupportCapabilityOptions> TagSupport { get; set; }
 
  /// <summary>
  /// Client support insert replace edit to control different behavior if a

src/Protocol/Client/Capabilities/CompletionItemKindCapability.cs → src/Protocol/Client/Capabilities/CompletionItemKindCapabilityOptions.cs

@@ -3,7 +3,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
- public class CompletionItemKindCapability
+ public class CompletionItemKindCapabilityOptions
  {
  /// <summary>
  /// The completion item kind values the client supports. When this

src/Protocol/Client/Capabilities/CompletionItemTagSupportCapability.cs → src/Protocol/Client/Capabilities/CompletionItemTagSupportCapabilityOptions.cs

@@ -2,7 +2,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
- public class CompletionItemTagSupportCapability
+ public class CompletionItemTagSupportCapabilityOptions
  {
  /// <summary>
  /// The tags supported by the client.

src/Protocol/Client/Capabilities/ConnectedCapability.cs

@@ -1,4 +1,5 @@
 using OmniSharp.Extensions.JsonRpc;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {

src/Protocol/Client/Capabilities/DeclarationCapability.cs

@@ -2,6 +2,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
+ [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.Declaration))]
  public class DeclarationCapability : LinkSupportCapability, ConnectedCapability<IDeclarationHandler>
  {
  }

src/Protocol/Client/Capabilities/DefinitionCapability.cs

@@ -2,6 +2,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
+ [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.Definition))]
  public class DefinitionCapability : LinkSupportCapability, ConnectedCapability<IDefinitionHandler>
  {
  }

src/Protocol/Client/Capabilities/DidChangeConfigurationCapability.cs

@@ -1,5 +1,6 @@
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
+ [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(WorkspaceClientCapabilities.Configuration))]
  public class DidChangeConfigurationCapability : DynamicCapability
  {
  }

src/Protocol/Client/Capabilities/DidChangeWatchedFilesCapability.cs

@@ -1,5 +1,6 @@
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
+ [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(WorkspaceClientCapabilities.DidChangeWatchedFiles))]
  public class DidChangeWatchedFilesCapability : DynamicCapability
  {
  }