Added tests to validate that router routes requests correctly

david-driscoll · david-driscoll · commit fed2134b2be1 · 2017-10-17T14:34:19.000-04:00
diff --git a/src/Lsp/Capabilities/Client/TextDocumentClientCapabilities.cs b/src/Lsp/Capabilities/Client/TextDocumentClientCapabilities.cs
@@ -1,4 +1,4 @@
-﻿using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client
diff --git a/src/Lsp/Capabilities/Client/WorkspaceClientCapabilites.cs b/src/Lsp/Capabilities/Client/WorkspaceClientCapabilites.cs
@@ -1,4 +1,4 @@
-﻿using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client
@@ -14,6 +14,8 @@ public class WorkspaceClientCapabilites
 
         public Supports<WorkspaceEditCapability> WorkspaceEdit { get; set; }
 
+        private bool ShouldSerializeWorkspaceEdit() => WorkspaceEdit.IsSupported;
+
         /// <summary>
         /// Capabilities specific to the `workspace/didChangeConfiguration` notification.
         /// </summary>
diff --git a/src/Lsp/Converters/SupportsConverter.cs b/src/Lsp/Converters/SupportsConverter.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Reflection;
 using Newtonsoft.Json;
 using OmniSharp.Extensions.LanguageServer.Capabilities.Client;
@@ -35,7 +35,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
             }
             else
             {
-                serializer.Serialize(writer, false);
+                serializer.Serialize(writer, null);
             }
         }
 
@@ -60,4 +60,4 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
         public override bool CanConvert(Type objectType) => objectType.GetGenericTypeDefinition() == typeof(Supports<>);
     }
-}
+}
diff --git a/src/Lsp/HandlerCollection.cs b/src/Lsp/HandlerCollection.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -48,9 +48,11 @@ public IDisposable Add(params IJsonRpcHandler[] handlers)
                     }
 
                     var key = "default";
-                    if (handler is IRegistration<TextDocumentRegistrationOptions> textDocumentRegistration)
+                    if (handler is IRegistration<TextDocumentRegistrationOptions>)
                     {
-                        var options = textDocumentRegistration.GetRegistrationOptions();
+                        var options = GetTextDocumentRegistrationOptionsMethod
+                            .MakeGenericMethod(registration)
+                            .Invoke(handler, new object[] { handler }) as TextDocumentRegistrationOptions;
                         key = options.DocumentSelector;
                     }
 
@@ -76,6 +78,15 @@ public IDisposable Add(params IJsonRpcHandler[] handlers)
             return new ImmutableDisposable(descriptors);
         }
 
+        private static readonly MethodInfo GetTextDocumentRegistrationOptionsMethod = typeof(HandlerCollection).GetTypeInfo()
+            .GetMethod(nameof(GetTextDocumentRegistrationOptions), BindingFlags.Static | BindingFlags.NonPublic);
+
+        private static TextDocumentRegistrationOptions GetTextDocumentRegistrationOptions<T>(IRegistration<T> instance)
+            where T : TextDocumentRegistrationOptions
+        {
+            return instance.GetRegistrationOptions();
+        }
+
         private Type UnwrapGenericType(Type genericType, Type type)
         {
             return type?.GetTypeInfo()
diff --git a/src/Lsp/InitializeDelegate.cs b/src/Lsp/InitializeDelegate.cs
@@ -0,0 +1,7 @@
+using System.Threading.Tasks;
+using OmniSharp.Extensions.LanguageServer.Models;
+
+namespace OmniSharp.Extensions.LanguageServer
+{
+    public delegate Task InitializeDelegate(InitializeParams request);
+}
diff --git a/src/Lsp/LanguageServer.cs b/src/Lsp/LanguageServer.cs
@@ -18,8 +18,6 @@
 
 namespace OmniSharp.Extensions.LanguageServer
 {
-    public delegate Task InitializeDelegate(InitializeParams request);
-
     public class LanguageServer : ILanguageServer, IInitializeHandler, IInitializedHandler, IDisposable, IAwaitableTermination
     {
         private readonly Connection _connection;
diff --git a/src/Lsp/LspRequestRouter.cs b/src/Lsp/LspRequestRouter.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
@@ -44,7 +44,7 @@ private string GetId(object id)
 
         private ILspHandlerDescriptor FindDescriptor(string method, JToken @params)
         {
-            var descriptor = _collection.FirstOrDefault(x => x.Method == method);
+            var descriptor = _collection.FirstOrDefault(x => x.Method.Equals(method, StringComparison.OrdinalIgnoreCase));
             if (descriptor is null) return null;
 
             if (_textDocumentSyncHandlers == null)
diff --git a/src/Lsp/Models/CodeActionParams.cs b/src/Lsp/Models/CodeActionParams.cs
@@ -1,13 +1,8 @@
-﻿using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace OmniSharp.Extensions.LanguageServer.Models
 {
-    public interface ITextDocumentIdentifierParams
-    {
-        TextDocumentIdentifier TextDocument { get; }
-    }
-
     /// <summary>
     /// Params for the CodeActionRequest
     /// </summary>
diff --git a/src/Lsp/Models/DocumentFilter.cs b/src/Lsp/Models/DocumentFilter.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using Minimatch;
 using Newtonsoft.Json;
@@ -108,5 +109,20 @@ public bool IsMatch(TextDocumentAttributes attributes)
 
             return false;
         }
+
+        public static DocumentFilter ForPattern(string wildcard)
+        {
+            return new DocumentFilter() { Pattern = wildcard };
+        }
+
+        public static DocumentFilter ForLanguage(string language)
+        {
+            return new DocumentFilter() { Language = language };
+        }
+
+        public static DocumentFilter ForScheme(string scheme)
+        {
+            return new DocumentFilter() { Scheme = scheme };
+        }
     }
 }
diff --git a/src/Lsp/Models/DocumentSelector.cs b/src/Lsp/Models/DocumentSelector.cs
@@ -1,4 +1,4 @@
-﻿using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using OmniSharp.Extensions.LanguageServer.Protocol.Document;
@@ -47,5 +47,20 @@ public bool IsMatch(TextDocumentAttributes attributes)
         {
             return this.Any(z => z.IsMatch(attributes));
         }
+
+        public static DocumentSelector ForPattern(params string[] wildcards)
+        {
+            return new DocumentSelector(wildcards.Select(DocumentFilter.ForPattern));
+        }
+
+        public static DocumentSelector ForLanguage(params string[] languages)
+        {
+            return new DocumentSelector(languages.Select(DocumentFilter.ForLanguage));
+        }
+
+        public static DocumentSelector ForScheme(params string[] schemes)
+        {
+            return new DocumentSelector(schemes.Select(DocumentFilter.ForScheme));
+        }
     }
 }
diff --git a/src/Lsp/Models/ITextDocumentIdentifierParams.cs b/src/Lsp/Models/ITextDocumentIdentifierParams.cs
@@ -0,0 +1,7 @@
+﻿namespace OmniSharp.Extensions.LanguageServer.Models
+{
+    public interface ITextDocumentIdentifierParams
+    {
+        TextDocumentIdentifier TextDocument { get; }
+    }
+}
diff --git a/src/Lsp/Protocol/Document/ITextDocumentSyncHandler.cs b/src/Lsp/Protocol/Document/ITextDocumentSyncHandler.cs
@@ -1,33 +1,18 @@
-﻿using System;
+using System;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Capabilities.Server;
+using OmniSharp.Extensions.LanguageServer.Models;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Document
 {
     public interface ITextDocumentSyncHandler : IDidChangeTextDocumentHandler, IDidOpenTextDocumentHandler, IDidCloseTextDocumentHandler, IDidSaveTextDocumentHandler
     {
         TextDocumentSyncOptions Options { get; }
+        /// <summary>
+        /// Returns the attributes for the document at the given URI.  This can return null.
+        /// </summary>
+        /// <param name="uri"></param>
+        /// <returns></returns>
         TextDocumentAttributes GetTextDocumentAttributes(Uri uri);
     }
-
-    public class TextDocumentAttributes
-    {
-        public TextDocumentAttributes(Uri uri, string languageId)
-        {
-            Uri = uri;
-            Scheme = uri.Scheme;
-            LanguageId = languageId;
-        }
-
-        public TextDocumentAttributes(Uri uri, string scheme, string languageId)
-        {
-            Uri = uri;
-            Scheme = scheme;
-            LanguageId = languageId;
-        }
-
-        public Uri Uri { get; }
-        public string Scheme { get; }
-        public string LanguageId { get; }
-    }
 }
diff --git a/src/Lsp/Protocol/Document/TextDocumentAttributes.cs b/src/Lsp/Protocol/Document/TextDocumentAttributes.cs
@@ -0,0 +1,25 @@
+﻿using System;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Document
+{
+    public class TextDocumentAttributes
+    {
+        public TextDocumentAttributes(Uri uri, string languageId)
+        {
+            Uri = uri;
+            Scheme = uri.Scheme;
+            LanguageId = languageId;
+        }
+
+        public TextDocumentAttributes(Uri uri, string scheme, string languageId)
+        {
+            Uri = uri;
+            Scheme = scheme;
+            LanguageId = languageId;
+        }
+
+        public Uri Uri { get; }
+        public string Scheme { get; }
+        public string LanguageId { get; }
+    }
+}
diff --git a/test/Lsp.Tests/HandlerResolverTests.cs b/test/Lsp.Tests/HandlerResolverTests.cs
@@ -21,10 +21,6 @@ public class HandlerResolverTests
         [Theory]
         [InlineData(typeof(IInitializeHandler), "initialize", 1)]
         [InlineData(typeof(IInitializedHandler), "initialized", 1)]
-        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didOpen", 4)]
-        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didChange", 4)]
-        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didClose", 4)]
-        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didSave", 4)]
         public void Should_Contain_AllDefinedMethods(Type requestHandler, string key, int count)
         {
             var handler = new HandlerCollection();
@@ -38,6 +34,21 @@ public void Should_Contain_AllDefinedMethods(Type requestHandler, string key, in
             handler._handlers.Count.Should().Be(count);
         }
 
+        [Theory]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didOpen", 4)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didChange", 4)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didClose", 4)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didSave", 4)]
+        public void Should_Contain_AllDefinedTextDocumentSyncMethods(Type requestHandler, string key, int count)
+        {
+            var handler = new HandlerCollection();
+            var sub = (IJsonRpcHandler)TextDocumentSyncHandlerExtensions.With(DocumentSelector.ForPattern("**/*.something"));
+
+            handler.Add(sub);
+            handler._handlers.Should().Contain(x => x.Method == key);
+            handler._handlers.Count.Should().Be(count);
+        }
+
         [Theory]
         [InlineData("textDocument/didOpen", 8)]
         [InlineData("textDocument/didChange", 8)]
@@ -46,21 +57,9 @@ public void Should_Contain_AllDefinedMethods(Type requestHandler, string key, in
         public void Should_Contain_AllDefinedMethods_ForDifferentKeys(string key, int count)
         {
             var handler = new HandlerCollection();
-            var sub = Substitute.For<ITextDocumentSyncHandler>();
-            if (sub is IRegistration<TextDocumentRegistrationOptions> reg)
-                reg.GetRegistrationOptions()
-                .Returns(new TextDocumentRegistrationOptions() {
-                    DocumentSelector = new DocumentSelector(new DocumentFilter() {
-                        Pattern = "**/*.cs"
-                    })
-                });
+            var sub = TextDocumentSyncHandlerExtensions.With(DocumentSelector.ForPattern("**/*.cs"));
 
-            var sub2 = Substitute.For<ITextDocumentSyncHandler>();
-            if (sub2 is IRegistration<TextDocumentRegistrationOptions> reg2)
-                reg2.GetRegistrationOptions()
-                .Returns(new TextDocumentRegistrationOptions() {
-                    DocumentSelector = new DocumentSelector(new DocumentFilter() { Pattern = "**/*.cake" })
-                });
+            var sub2 = TextDocumentSyncHandlerExtensions.With(DocumentSelector.ForPattern("**/*.cake"));
 
             handler.Add(sub);
             handler.Add(sub2);
diff --git a/test/Lsp.Tests/LspRequestRouterTests.cs b/test/Lsp.Tests/LspRequestRouterTests.cs
diff --git a/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs b/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs
diff --git a/test/Lsp.Tests/Models/InitializeParamsTests.cs b/test/Lsp.Tests/Models/InitializeParamsTests.cs
diff --git a/test/Lsp.Tests/Models/InitializeParamsTests_$SimpleTest.json b/test/Lsp.Tests/Models/InitializeParamsTests_$SimpleTest.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Newtonsoft.Json;`
	`1`	`+using Newtonsoft.Json;`
`2`	`2`	`using Newtonsoft.Json.Serialization;`
`3`	`3`
`4`	`4`	`namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Reflection;`
`3`	`3`	`using Newtonsoft.Json;`
`4`	`4`	`using OmniSharp.Extensions.LanguageServer.Capabilities.Client;`
`@@ -35,7 +35,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s`
`35`	`35`	`}`
`36`	`36`	`else`
`37`	`37`	`{`
`38`		`- serializer.Serialize(writer, false);`
	`38`	`+ serializer.Serialize(writer, null);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`@@ -60,4 +60,4 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist`
`60`	`60`
`61`	`61`	`public override bool CanConvert(Type objectType) => objectType.GetGenericTypeDefinition() == typeof(Supports<>);`
`62`	`62`	`}`
`63`		`-}`
	`63`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`
`19`	`19`	`namespace OmniSharp.Extensions.LanguageServer`
`20`	`20`	`{`
`21`		`- public delegate Task InitializeDelegate(InitializeParams request);`
`22`		`-`
`23`	`21`	`public class LanguageServer : ILanguageServer, IInitializeHandler, IInitializedHandler, IDisposable, IAwaitableTermination`
`24`	`22`	`{`
`25`	`23`	`private readonly Connection _connection;`