Updated sample server with example of folding range (seems to work with the latest version)

Author: david-driscoll

sample/SampleServer/Program.cs

@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer;
+using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 using OmniSharp.Extensions.LanguageServer.Server;
 
 namespace SampleServer
@@ -29,6 +30,8 @@ static async Task MainAsync(string[] args)
                     .AddDefaultLoggingProvider()
                     .WithMinimumLogLevel(LogLevel.Trace)
                     .WithHandler<TextDocumentHandler>()
+                    .WithHandler<DidChangeWatchedFilesHandler>()
+                    .WithHandler<FoldingRangeHandler>()
                 );
 
             await server.WaitForExit;

sample/SampleServer/TextDocumentHandler.cs

@@ -18,8 +18,7 @@ class TextDocumentHandler : ITextDocumentSyncHandler
         private readonly OmniSharp.Extensions.LanguageServer.Protocol.Server.ILanguageServer _router;
 
         private readonly DocumentSelector _documentSelector = new DocumentSelector(
-            new DocumentFilter()
-            {
+            new DocumentFilter() {
                 Pattern = "**/*.cs"
             }
         );
@@ -35,8 +34,7 @@ public TextDocumentHandler(OmniSharp.Extensions.LanguageServer.Protocol.Server.I
 
         public Task<Unit> Handle(DidChangeTextDocumentParams notification, CancellationToken token)
         {
-            _router.Window.LogMessage(new LogMessageParams()
-            {
+            _router.Window.LogMessage(new LogMessageParams() {
                 Type = MessageType.Log,
                 Message = "Hello World!!!!"
             });
@@ -45,8 +43,7 @@ public Task<Unit> Handle(DidChangeTextDocumentParams notification, CancellationT
 
         TextDocumentChangeRegistrationOptions IRegistration<TextDocumentChangeRegistrationOptions>.GetRegistrationOptions()
         {
-            return new TextDocumentChangeRegistrationOptions()
-            {
+            return new TextDocumentChangeRegistrationOptions() {
                 DocumentSelector = _documentSelector,
                 SyncKind = Change
             };
@@ -60,8 +57,7 @@ public void SetCapability(SynchronizationCapability capability)
         public async Task<Unit> Handle(DidOpenTextDocumentParams notification, CancellationToken token)
         {
             await Task.Yield();
-            _router.Window.LogMessage(new LogMessageParams()
-            {
+            _router.Window.LogMessage(new LogMessageParams() {
                 Type = MessageType.Log,
                 Message = "Hello World!!!!"
             });
@@ -70,8 +66,7 @@ public async Task<Unit> Handle(DidOpenTextDocumentParams notification, Cancellat
 
         TextDocumentRegistrationOptions IRegistration<TextDocumentRegistrationOptions>.GetRegistrationOptions()
         {
-            return new TextDocumentRegistrationOptions()
-            {
+            return new TextDocumentRegistrationOptions() {
                 DocumentSelector = _documentSelector,
             };
         }
@@ -88,8 +83,7 @@ public Task<Unit> Handle(DidSaveTextDocumentParams notification, CancellationTok
 
         TextDocumentSaveRegistrationOptions IRegistration<TextDocumentSaveRegistrationOptions>.GetRegistrationOptions()
         {
-            return new TextDocumentSaveRegistrationOptions()
-            {
+            return new TextDocumentSaveRegistrationOptions() {
                 DocumentSelector = _documentSelector,
                 IncludeText = true
             };
@@ -99,4 +93,53 @@ public TextDocumentAttributes GetTextDocumentAttributes(Uri uri)
             return new TextDocumentAttributes(uri, "csharp");
         }
     }
+
+    class FoldingRangeHandler : IFoldingRangeHandler
+    {
+        private FoldingRangeCapability _capability;
+
+        public TextDocumentRegistrationOptions GetRegistrationOptions()
+        {
+            return new TextDocumentRegistrationOptions() {
+                DocumentSelector = DocumentSelector.ForLanguage("csharp")
+            };
+        }
+
+        public Task<Container<FoldingRange>> Handle(FoldingRangeRequestParam request,
+            CancellationToken cancellationToken)
+        {
+            return Task.FromResult(new Container<FoldingRange>(new FoldingRange() {
+                StartLine = 10,
+                EndLine = 20,
+                Kind = FoldingRangeKind.Region,
+                EndCharacter = 0,
+                StartCharacter = 0
+            }));
+        }
+
+        public void SetCapability(FoldingRangeCapability capability)
+        {
+            _capability = capability;
+        }
+    }
+
+    class DidChangeWatchedFilesHandler : IDidChangeWatchedFilesHandler
+    {
+        private DidChangeWatchedFilesCapability _capability;
+
+        public object GetRegistrationOptions()
+        {
+            return new object();
+        }
+
+        public Task<Unit> Handle(DidChangeWatchedFilesParams request, CancellationToken cancellationToken)
+        {
+            return Unit.Task;
+        }
+
+        public void SetCapability(DidChangeWatchedFilesCapability capability)
+        {
+            _capability = capability;
+        }
+    }
 }

src/Server/LspRequestRouter.cs

@@ -21,11 +21,11 @@ namespace OmniSharp.Extensions.LanguageServer.Server
 {
     internal class LspRequestRouter : RequestRouterBase<ILspHandlerDescriptor>, IRequestRouter<IHandlerDescriptor>
     {
-        private readonly IEnumerable<ILspHandlerDescriptor> _collection;
+        private readonly IHandlerCollection _collection;
         private readonly IEnumerable<IHandlerMatcher> _handlerMatchers;
 
         public LspRequestRouter(
-            IEnumerable<ILspHandlerDescriptor> collection,
+            IHandlerCollection collection,
             ILoggerFactory loggerFactory,
             IEnumerable<IHandlerMatcher> handlerMatchers,
             ISerializer serializer,
@@ -56,7 +56,7 @@ private ILspHandlerDescriptor FindDescriptor(string method, JToken @params)
             var descriptor = _collection.FirstOrDefault(x => x.Method == method);
             if (descriptor is null)
             {
-                _logger.LogDebug("Unable to find {Method}, methods found include {Methods}", method, string.Join(", ", _collection.Select(x => x.Method + ":" + x.HandlerType?.FullName)));
+                _logger.LogDebug("Unable to find {Method}, methods found include {Methods}", method, string.Join(", ", _collection.Select(x => x.Method + ":" + x.Handler?.GetType()?.FullName)));
                 return null;
             }
 
@@ -68,7 +68,7 @@ private ILspHandlerDescriptor FindDescriptor(string method, JToken @params)
 
             return _handlerMatchers.SelectMany(strat => strat.FindHandler(paramsValue, lspHandlerDescriptors)).FirstOrDefault() ?? descriptor;
         }
-        
+
         IHandlerDescriptor IRequestRouter<IHandlerDescriptor>.GetDescriptor(Notification notification) => GetDescriptor(notification);
         IHandlerDescriptor IRequestRouter<IHandlerDescriptor>.GetDescriptor(Request request) => GetDescriptor(request);
         Task IRequestRouter<IHandlerDescriptor>.RouteNotification(IHandlerDescriptor descriptor, Notification notification, CancellationToken token) =>