simplify the settings

Author: david-driscoll

src/Protocol/Client/Capabilities/SynchronizationCapability.cs

@@ -5,7 +5,13 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
-    public class SynchronizationCapability : DynamicCapability, ConnectedCapability<IDidChangeTextDocumentHandler>
+    public class SynchronizationCapability : DynamicCapability,
+        ConnectedCapability<IDidChangeTextDocumentHandler>,
+        ConnectedCapability<IDidCloseTextDocumentHandler>,
+        ConnectedCapability<IDidOpenTextDocumentHandler>,
+        ConnectedCapability<IDidSaveTextDocumentHandler>,
+        ConnectedCapability<IWillSaveTextDocumentHandler>,
+        ConnectedCapability<IWillSaveWaitUntilTextDocumentHandler>
     {
         /// <summary>
         /// The client supports sending will save notifications.

src/Protocol/Server/Capabilities/TextDocumentSyncOptions.cs

@@ -37,28 +37,25 @@ public class TextDocumentSyncOptions : ITextDocumentSyncOptions
         [Optional]
         public SaveOptions Save { get; set; }
 
-        public static Func<IEnumerable<ITextDocumentSyncOptions>, TextDocumentSyncOptions> Of(TextDocumentSyncOptions @default)
+        public static TextDocumentSyncOptions Of(IEnumerable<ITextDocumentSyncOptions> options)
         {
-            return options =>
+            var change = TextDocumentSyncKind.None;
+            if (options.Any())
             {
-                var change = @default.Change;
-                if (@default.Change == TextDocumentSyncKind.None && options.Any())
+                change = options
+                        .Where(x => x.Change != TextDocumentSyncKind.None)
+                        .Min(z => z.Change);
+            }
+            return new TextDocumentSyncOptions()
+            {
+                OpenClose = options.Any(z => z.OpenClose),
+                Change = change,
+                WillSave = options.Any(z => z.WillSave),
+                WillSaveWaitUntil = options.Any(z => z.WillSaveWaitUntil),
+                Save = new SaveOptions()
                 {
-                    change = @default.Change > 0 ? @default.Change : options
-                            .Where(x => x.Change != TextDocumentSyncKind.None)
-                            .Min(z => z.Change);
+                    IncludeText = options.Any(z => z.Save?.IncludeText == true)
                 }
-                return new TextDocumentSyncOptions()
-                {
-                    OpenClose = @default.OpenClose || options.Any(z => z.OpenClose),
-                    Change = change,
-                    WillSave = @default.WillSave || options.Any(z => z.WillSave),
-                    WillSaveWaitUntil = @default.WillSaveWaitUntil || options.Any(z => z.WillSaveWaitUntil),
-                    Save = new SaveOptions()
-                    {
-                        IncludeText = @default.Save?.IncludeText ?? options.Any(z => z.Save?.IncludeText == true)
-                    }
-                };
             };
         }
     }

src/Server/ClientCapabilityProvider.cs

@@ -30,7 +30,7 @@ public bool HasStaticHandler<T>(Supports<T> capability)
                 .Where(x => x.GetTypeInfo().IsGenericType && x.GetTypeInfo().GetGenericTypeDefinition() == typeof(ConnectedCapability<>))
                 .Select(x => x.GetTypeInfo().GetGenericArguments()[0].GetTypeInfo());
 
-            return handlerTypes.All(_collection.ContainsHandler);
+            return handlerTypes.Any(_collection.ContainsHandler);
         }
 
         public IOptionsGetter GetStaticOptions<T>(Supports<T> capability)

src/Server/LanguageServer.cs

@@ -410,17 +410,6 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
 
             var ccp = new ClientCapabilityProvider(_collection);
 
-            var defaultTextDocumentSyncOptions = new TextDocumentSyncOptions()
-            {
-                Change = TextDocumentSyncKind.None,
-                OpenClose = _collection.ContainsHandler(typeof(IDidOpenTextDocumentHandler)) || _collection.ContainsHandler(typeof(IDidCloseTextDocumentHandler)),
-                Save = _collection.ContainsHandler(typeof(IDidSaveTextDocumentHandler)) ?
-                            new SaveOptions() { IncludeText = true /* TODO: Make configurable */ } :
-                            null,
-                WillSave = _collection.ContainsHandler(typeof(IWillSaveTextDocumentHandler)),
-                WillSaveWaitUntil = _collection.ContainsHandler(typeof(IWillSaveWaitUntilTextDocumentHandler))
-            };
-
             var serverCapabilities = new ServerCapabilities()
             {
                 CodeActionProvider = ccp.GetStaticOptions(textDocumentCapabilities.CodeAction).Get<ICodeActionOptions, CodeActionOptions>(CodeActionOptions.Of),
@@ -434,7 +423,7 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
                 DocumentRangeFormattingProvider = ccp.HasStaticHandler(textDocumentCapabilities.RangeFormatting),
                 DocumentSymbolProvider = ccp.HasStaticHandler(textDocumentCapabilities.DocumentSymbol),
                 ExecuteCommandProvider = ccp.GetStaticOptions(workspaceCapabilities.ExecuteCommand).Reduce<IExecuteCommandOptions, ExecuteCommandOptions>(ExecuteCommandOptions.Of),
-                TextDocumentSync = ccp.GetStaticOptions(textDocumentCapabilities.Synchronization).Reduce<ITextDocumentSyncOptions, TextDocumentSyncOptions>(TextDocumentSyncOptions.Of(defaultTextDocumentSyncOptions)),
+                TextDocumentSync = ccp.GetStaticOptions(textDocumentCapabilities.Synchronization).Reduce<ITextDocumentSyncOptions, TextDocumentSyncOptions>(TextDocumentSyncOptions.Of),
                 HoverProvider = ccp.HasStaticHandler(textDocumentCapabilities.Hover),
                 ReferencesProvider = ccp.HasStaticHandler(textDocumentCapabilities.References),
                 RenameProvider = ccp.GetStaticOptions(textDocumentCapabilities.Rename).Get<IRenameOptions, RenameOptions>(RenameOptions.Of),
@@ -446,10 +435,6 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
                 FoldingRangeProvider = ccp.GetStaticOptions(textDocumentCapabilities.FoldingRange).Get<IFoldingRangeOptions, FoldingRangeOptions>(FoldingRangeOptions.Of),
                 DeclarationProvider = ccp.GetStaticOptions(textDocumentCapabilities.Declaration).Get<IDeclarationOptions, DeclarationOptions>(DeclarationOptions.Of),
             };
-            if (serverCapabilities.TextDocumentSync.HasOptions)
-            {
-                defaultTextDocumentSyncOptions = serverCapabilities.TextDocumentSync.Options;
-            }
 
             if (_collection.ContainsHandler(typeof(IDidChangeWorkspaceFoldersHandler)))
             {
@@ -486,7 +471,16 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
                 }
                 else
                 {
-                    defaultTextDocumentSyncOptions.Change = textDocumentSyncKind;
+                    serverCapabilities.TextDocumentSync = new TextDocumentSyncOptions()
+                    {
+                        Change = TextDocumentSyncKind.None,
+                        OpenClose = (_collection.ContainsHandler(typeof(IDidOpenTextDocumentHandler)) || _collection.ContainsHandler(typeof(IDidCloseTextDocumentHandler))),
+                        Save = _collection.ContainsHandler(typeof(IDidSaveTextDocumentHandler)) ?
+                            new SaveOptions() { IncludeText = true /* TODO: Make configurable */ } :
+                            null,
+                        WillSave = _collection.ContainsHandler(typeof(IWillSaveTextDocumentHandler)),
+                        WillSaveWaitUntil = _collection.ContainsHandler(typeof(IWillSaveWaitUntilTextDocumentHandler))
+                    };
                 }
             }