Merge branch 'master' into fix/gh-370

Author: mergify[bot]

test/Lsp.Tests/Matchers/TextDocumentMatcherTests.cs

@@ -54,6 +54,37 @@ public void Should_Return_Empty_Descriptor()
             result.Should().BeEmpty();
         }
 
+        [Fact]
+        public void Should_Return_Did_Open_Text_Document_Handler_Descriptor_With_No_Registration_Options()
+        {
+            // Given
+            var textDocumentSyncHandler =
+                TextDocumentSyncHandlerExtensions.With(null, "csharp");
+            var textDocumentIdentifiers = new TextDocumentIdentifiers();
+            AutoSubstitute.Provide(textDocumentIdentifiers);
+            var collection = new SharedHandlerCollection(SupportedCapabilitiesFixture.AlwaysTrue, textDocumentIdentifiers, Substitute.For<IResolverContext>(),
+                                                         new LspHandlerTypeDescriptorProvider(new [] { typeof(FoundationTests).Assembly, typeof(LanguageServer).Assembly, typeof(LanguageClient).Assembly, typeof(IRegistrationManager).Assembly, typeof(LspRequestRouter).Assembly }))
+                { textDocumentSyncHandler };
+            AutoSubstitute.Provide<IHandlerCollection>(collection);
+            AutoSubstitute.Provide<IEnumerable<ILspHandlerDescriptor>>(collection);
+            var handlerMatcher = AutoSubstitute.Resolve<TextDocumentMatcher>();
+
+            // When
+            var result = handlerMatcher.FindHandler(
+                new DidOpenTextDocumentParams {
+                    TextDocument = new TextDocumentItem {
+                        Uri = new Uri("file:///abc/123/d.cs")
+                    }
+                },
+                collection.Where(x => x.Method == TextDocumentNames.DidOpen)
+            );
+
+            // Then
+            var lspHandlerDescriptors = result as ILspHandlerDescriptor[] ?? result.ToArray();
+            lspHandlerDescriptors.Should().NotBeNullOrEmpty();
+            lspHandlerDescriptors.Should().Contain(x => x.Method == TextDocumentNames.DidOpen);
+        }
+
         [Fact]
         public void Should_Return_Did_Open_Text_Document_Handler_Descriptor()
         {

test/Lsp.Tests/TextDocumentSyncHandlerExtensions.cs

@@ -8,10 +8,10 @@ namespace Lsp.Tests
 {
     internal static class TextDocumentSyncHandlerExtensions
     {
-        public static ITextDocumentSyncHandler With(DocumentSelector documentSelector, string language) =>
+        public static ITextDocumentSyncHandler With(DocumentSelector? documentSelector, string language) =>
             Substitute.For<ITextDocumentSyncHandler>().With(documentSelector, language);
 
-        public static ITextDocumentSyncHandler With(this ITextDocumentSyncHandler handler, DocumentSelector documentSelector, string language)
+        public static ITextDocumentSyncHandler With(this ITextDocumentSyncHandler handler, DocumentSelector? documentSelector, string language)
         {
             ( (IDidChangeTextDocumentHandler) handler ).GetRegistrationOptions(Arg.Any<SynchronizationCapability>(), Arg.Any<ClientCapabilities>()).Returns(new TextDocumentChangeRegistrationOptions() { DocumentSelector = documentSelector });
             ( (IDidOpenTextDocumentHandler) handler ).GetRegistrationOptions(Arg.Any<SynchronizationCapability>(), Arg.Any<ClientCapabilities>()).Returns(new TextDocumentOpenRegistrationOptions() { DocumentSelector = documentSelector });