Initial support to get 3.17 features all working

Author: david-driscoll

Directory.Packages.props

@@ -35,11 +35,13 @@
     <PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageVersion Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.4" />
     <PackageVersion Include="xunit" Version="2.4.1" />
     <PackageVersion Include="FluentAssertions" Version="6.6.0" />
+      <PackageVersion Include="Verify.Xunit" Version="16.8.1" />
+      <PackageVersion Include="Verify.SourceGenerators" Version="1.5.0-beta.1" />
     <PackageVersion Include="NSubstitute" Version="4.3.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="3.1.0" />
     <PackageVersion Include="Serilog.Sinks.Observable" Version="2.0.2" />

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.200",
+    "version": "6.0.300",
     "rollForward": "latestMinor"
   }
 }

language-server-protocol.sha.txt

@@ -1,4 +1,5 @@
 -- This is the last commit we caught up with https://github.com/Microsoft/language-server-protocol/commits/gh-pages
 lastSha: bdcc0f2
 
-https://github.com/Microsoft/language-server-protocol/compare/bdcc0f2..gh-pages
+https://github.com/Microsoft/language-server-protocol/compare/ed804013dc545b0e10bcb0a57d872c414bbc1f3c..gh-pages
+

sample/SampleServer/FoldingRangeHandler.cs

@@ -10,7 +10,7 @@ internal class FoldingRangeHandler : IFoldingRangeHandler
     {
         public FoldingRangeRegistrationOptions GetRegistrationOptions() =>
             new FoldingRangeRegistrationOptions {
-                DocumentSelector = DocumentSelector.ForLanguage("csharp")
+                DocumentSelector = TextDocumentSelector.ForLanguage("csharp")
             };
 
         public Task<Container<FoldingRange>?> Handle(
@@ -30,7 +30,7 @@ CancellationToken cancellationToken
             );
 
         public FoldingRangeRegistrationOptions GetRegistrationOptions(FoldingRangeCapability capability, ClientCapabilities clientCapabilities) => new FoldingRangeRegistrationOptions {
-            DocumentSelector = DocumentSelector.ForLanguage("csharp")
+            DocumentSelector = TextDocumentSelector.ForLanguage("csharp")
         };
     }
 }

sample/SampleServer/SemanticTokensHandler.cs

@@ -95,7 +95,7 @@ protected override SemanticTokensRegistrationOptions CreateRegistrationOptions(
         {
             return new SemanticTokensRegistrationOptions
             {
-                DocumentSelector = DocumentSelector.ForLanguage("csharp"),
+                DocumentSelector = TextDocumentSelector.ForLanguage("csharp"),
                 Legend = new SemanticTokensLegend
                 {
                     TokenModifiers = capability.TokenModifiers,

sample/SampleServer/TextDocumentHandler.cs

@@ -25,8 +25,8 @@ internal class TextDocumentHandler : TextDocumentSyncHandlerBase
         private readonly ILogger<TextDocumentHandler> _logger;
         private readonly ILanguageServerConfiguration _configuration;
 
-        private readonly DocumentSelector _documentSelector = new DocumentSelector(
-            new DocumentFilter {
+        private readonly TextDocumentSelector _textDocumentSelector = new TextDocumentSelector(
+            new TextDocumentFilter {
                 Pattern = "**/*.cs"
             }
         );
@@ -69,8 +69,8 @@ public override Task<Unit> Handle(DidCloseTextDocumentParams notification, Cance
 
         public override Task<Unit> Handle(DidSaveTextDocumentParams notification, CancellationToken token) => Unit.Task;
 
-        protected override TextDocumentSyncRegistrationOptions CreateRegistrationOptions(SynchronizationCapability capability, ClientCapabilities clientCapabilities) => new TextDocumentSyncRegistrationOptions() {
-            DocumentSelector = _documentSelector,
+        protected override TextDocumentSyncRegistrationOptions CreateRegistrationOptions(TextSynchronizationCapability capability, ClientCapabilities clientCapabilities) => new TextDocumentSyncRegistrationOptions() {
+            DocumentSelector = _textDocumentSelector,
             Change = Change,
             Save = new SaveOptions() { IncludeText = true }
         };
@@ -129,7 +129,7 @@ CancellationToken cancellationToken
         }
 
         public DocumentSymbolRegistrationOptions GetRegistrationOptions(DocumentSymbolCapability capability, ClientCapabilities clientCapabilities) => new DocumentSymbolRegistrationOptions {
-            DocumentSelector = DocumentSelector.ForLanguage("csharp")
+            DocumentSelector = TextDocumentSelector.ForLanguage("csharp")
         };
     }
 

src/Client/DefaultLanguageClientFacade.cs

@@ -13,6 +13,7 @@ namespace OmniSharp.Extensions.LanguageServer.Client
     internal class DefaultLanguageClientFacade : LanguageProtocolProxy, ILanguageClientFacade, IOnLanguageClientStarted
     {
         private readonly Lazy<ITextDocumentLanguageClient> _textDocument;
+        private readonly Lazy<INotebookDocumentLanguageClient> _notebookDocument;
         private readonly Lazy<IClientLanguageClient> _client;
         private readonly Lazy<IGeneralLanguageClient> _general;
         private readonly Lazy<IWindowLanguageClient> _window;
@@ -28,6 +29,7 @@ public DefaultLanguageClientFacade(
             IProgressManager progressManager,
             ILanguageProtocolSettings languageProtocolSettings,
             Lazy<ITextDocumentLanguageClient> textDocument,
+            Lazy<INotebookDocumentLanguageClient> notebookDocument,
             Lazy<IClientLanguageClient> client,
             Lazy<IGeneralLanguageClient> general,
             Lazy<IWindowLanguageClient> window,
@@ -38,6 +40,7 @@ IInsanceHasStarted instanceHasStarted
         ) : base(requestRouter, resolverContext, progressManager, languageProtocolSettings)
         {
             _textDocument = textDocument;
+            _notebookDocument = notebookDocument;
             _client = client;
             _general = general;
             _window = window;
@@ -48,6 +51,7 @@ IInsanceHasStarted instanceHasStarted
         }
 
         public ITextDocumentLanguageClient TextDocument => _textDocument.Value;
+        public INotebookDocumentLanguageClient NotebookDocument => _notebookDocument.Value;
         public IClientLanguageClient Client => _client.Value;
         public IGeneralLanguageClient General => _general.Value;
         public IWindowLanguageClient Window => _window.Value;

src/Client/LanguageClient.cs

@@ -177,6 +177,7 @@ internal LanguageClient(
             IEnumerable<OnLanguageClientStartedDelegate> startedDelegates,
             IEnumerable<IOnLanguageClientStarted> startedHandlers,
             ITextDocumentLanguageClient textDocumentLanguageClient,
+            INotebookDocumentLanguageClient notebookDocumentLanguageClient,
             IClientLanguageClient clientLanguageClient,
             IGeneralLanguageClient generalLanguageClient,
             IWindowLanguageClient windowLanguageClient,
@@ -228,13 +229,15 @@ IScheduler scheduler
 
             // We need to at least create Window here in case any handler does loggin in their constructor
             TextDocument = textDocumentLanguageClient;
+            NotebookDocument = notebookDocumentLanguageClient;
             Client = clientLanguageClient;
             General = generalLanguageClient;
             Window = windowLanguageClient;
             Workspace = workspaceLanguageClient;
         }
 
         public ITextDocumentLanguageClient TextDocument { get; }
+        public INotebookDocumentLanguageClient NotebookDocument { get; }
         public IClientLanguageClient Client { get; }
         public IGeneralLanguageClient General { get; }
         public IWindowLanguageClient Window { get; }

src/Client/LanguageClientRegistrationManager.cs

@@ -180,14 +180,14 @@ public IObservable<IEnumerable<Registration>> Registrations
 
         public IEnumerable<Registration> GetRegistrationsForMethod(string method) => _registrations.Select(z => z.Value).Where(x => x.Method == method);
 
-        public IEnumerable<Registration> GetRegistrationsMatchingSelector(DocumentSelector documentSelector) =>
+        public IEnumerable<Registration> GetRegistrationsMatchingSelector(TextDocumentSelector textDocumentSelector) =>
             _registrations
                .Select(z => z.Value)
                .Where(
                     x => x.RegisterOptions is ITextDocumentRegistrationOptions { DocumentSelector: { } } ro &&
                          ro.DocumentSelector
                            .Join(
-                                documentSelector,
+                                textDocumentSelector,
                                 z => z.HasLanguage ? z.Language :
                                     z.HasScheme ? z.Scheme :
                                     z.HasPattern ? z.Pattern : string.Empty,

src/Client/LanguageClientServiceCollectionExtensions.cs

@@ -44,6 +44,9 @@ internal static IContainer AddLanguageClientInternals(this IContainer container,
             container.RegisterMany<TextDocumentLanguageClient>(
                 serviceTypeCondition: type => type.Name.Contains(nameof(TextDocumentLanguageClient)), reuse: Reuse.Singleton
             );
+            container.RegisterMany<NotebookDocumentLanguageClient>(
+                serviceTypeCondition: type => type.Name.Contains(nameof(NotebookDocumentLanguageClient)), reuse: Reuse.Singleton
+            );
             container.RegisterMany<ClientLanguageClient>(
                 serviceTypeCondition: type => type.Name.Contains(nameof(ClientLanguageClient)), reuse: Reuse.Singleton
             );