Ensure that all delegates create registraiton options as required

david-driscoll · david-driscoll · commit 9e468e067cc3 · 2019-07-11T10:47:45.000-04:00
diff --git a/src/Protocol/Document/Server/ICodeActionHandler.cs b/src/Protocol/Document/Server/ICodeActionHandler.cs
@@ -34,6 +34,7 @@ public static IDisposable OnCodeAction(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<CodeActionCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/ICodeLensHandler.cs b/src/Protocol/Document/Server/ICodeLensHandler.cs
@@ -40,11 +40,13 @@ public static IDisposable OnCodeLens(
             CodeLensRegistrationOptions registrationOptions = null,
             Action<CodeLensCapability> setCapability = null)
         {
+            var codeLensRegistrationOptions = new CodeLensRegistrationOptions();
+            codeLensRegistrationOptions.ResolveProvider = canResolve != null && resolveHandler != null;
             if (registrationOptions != null)
             {
-                registrationOptions.ResolveProvider = canResolve != null && resolveHandler != null;
+                codeLensRegistrationOptions.DocumentSelector = registrationOptions.DocumentSelector;
             }
-            return registry.AddHandlers(new DelegatingHandler(handler, resolveHandler, canResolve, setCapability, registrationOptions));
+            return registry.AddHandlers(new DelegatingHandler(handler, resolveHandler, canResolve, setCapability, codeLensRegistrationOptions));
         }
 
         class DelegatingHandler : CodeLensHandler
diff --git a/src/Protocol/Document/Server/IColorPresentationHandler.cs b/src/Protocol/Document/Server/IColorPresentationHandler.cs
@@ -35,6 +35,7 @@ public static IDisposable OnColorPresentation(
             DocumentColorRegistrationOptions registrationOptions = null,
             Action<ColorProviderCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new DocumentColorRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/ICompletionHandler.cs b/src/Protocol/Document/Server/ICompletionHandler.cs
@@ -40,10 +40,8 @@ public static IDisposable OnCompletion(
             CompletionRegistrationOptions registrationOptions = null,
             Action<CompletionCapability> setCapability = null)
         {
-            if (registrationOptions != null)
-            {
-                registrationOptions.ResolveProvider = canResolve != null && resolveHandler != null;
-            }
+            registrationOptions = registrationOptions ?? new CompletionRegistrationOptions();
+            registrationOptions.ResolveProvider = canResolve != null && resolveHandler != null;
             return registry.AddHandlers(new DelegatingHandler(handler, resolveHandler, canResolve, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IDeclarationHandler.cs b/src/Protocol/Document/Server/IDeclarationHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnDeclaration(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<DeclarationCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IDefinitionHandler.cs b/src/Protocol/Document/Server/IDefinitionHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnDefinition(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<DefinitionCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IDidChangeTextDocumentHandler.cs b/src/Protocol/Document/Server/IDidChangeTextDocumentHandler.cs
@@ -37,6 +37,7 @@ public static IDisposable OnDidChangeTextDocument(
             TextDocumentChangeRegistrationOptions registrationOptions = null,
             Action<SynchronizationCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentChangeRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IDidCloseTextDocumentHandler.cs b/src/Protocol/Document/Server/IDidCloseTextDocumentHandler.cs
@@ -34,6 +34,7 @@ public static IDisposable OnDidCloseTextDocument(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<SynchronizationCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IDidOpenTextDocumentHandler.cs b/src/Protocol/Document/Server/IDidOpenTextDocumentHandler.cs
@@ -34,6 +34,7 @@ public static IDisposable OnDidOpenTextDocument(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<SynchronizationCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IDidSaveTextDocumentHandler.cs b/src/Protocol/Document/Server/IDidSaveTextDocumentHandler.cs
@@ -34,6 +34,7 @@ public static IDisposable OnDidSaveTextDocument(
             TextDocumentSaveRegistrationOptions registrationOptions = null,
             Action<SynchronizationCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentSaveRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IDocumentColorHandler.cs b/src/Protocol/Document/Server/IDocumentColorHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnDocumentColor(
             DocumentColorRegistrationOptions registrationOptions = null,
             Action<ColorProviderCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new DocumentColorRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IDocumentFormattingHandler.cs b/src/Protocol/Document/Server/IDocumentFormattingHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnDocumentFormatting(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<DocumentFormattingCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IDocumentHighlightHandler.cs b/src/Protocol/Document/Server/IDocumentHighlightHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnDocumentHighlight(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<DocumentHighlightCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IDocumentLinkHandler.cs b/src/Protocol/Document/Server/IDocumentLinkHandler.cs
@@ -40,10 +40,8 @@ public static IDisposable OnDocumentLink(
             DocumentLinkRegistrationOptions registrationOptions = null,
             Action<DocumentLinkCapability> setCapability = null)
         {
-            if (registrationOptions != null)
-            {
-                registrationOptions.ResolveProvider = canResolve != null && resolveHandler != null;
-            }
+            registrationOptions = registrationOptions ?? new DocumentLinkRegistrationOptions();
+            registrationOptions.ResolveProvider = canResolve != null && resolveHandler != null;
             return registry.AddHandlers(new DelegatingHandler(handler, resolveHandler, canResolve, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IDocumentOnTypeFormatHandler.cs b/src/Protocol/Document/Server/IDocumentOnTypeFormatHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnDocumentOnTypeFormat(
             DocumentOnTypeFormattingRegistrationOptions registrationOptions = null,
             Action<DocumentOnTypeFormattingCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new DocumentOnTypeFormattingRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IDocumentRangeFormattingHandler.cs b/src/Protocol/Document/Server/IDocumentRangeFormattingHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnDocumentRangeFormatting(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<DocumentRangeFormattingCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IDocumentSymbolHandler.cs b/src/Protocol/Document/Server/IDocumentSymbolHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnDocumentSymbol(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<DocumentSymbolCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IFoldingRangeHandler.cs b/src/Protocol/Document/Server/IFoldingRangeHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnFoldingRange(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<FoldingRangeCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IHoverHandler.cs b/src/Protocol/Document/Server/IHoverHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnHover(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<HoverCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IImplementationHandler.cs b/src/Protocol/Document/Server/IImplementationHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnImplementation(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<ImplementationCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IPrepareRenameHandler.cs b/src/Protocol/Document/Server/IPrepareRenameHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnPrepareRename(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<RenameCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IReferencesHandler.cs b/src/Protocol/Document/Server/IReferencesHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnReferences(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<ReferencesCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IRenameHandler.cs b/src/Protocol/Document/Server/IRenameHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnRename(
             RenameRegistrationOptions registrationOptions = null,
             Action<RenameCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new RenameRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/ISignatureHelpHandler.cs b/src/Protocol/Document/Server/ISignatureHelpHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnSignatureHelp(
             SignatureHelpRegistrationOptions registrationOptions = null,
             Action<SignatureHelpCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new SignatureHelpRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/ITextDocumentSyncHandler.cs b/src/Protocol/Document/Server/ITextDocumentSyncHandler.cs
@@ -53,6 +53,7 @@ public static IDisposable OnTextDocumentSync(
             TextDocumentSaveRegistrationOptions registrationOptions = null,
             Action<SynchronizationCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentSaveRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(onOpenHandler, onCloseHandler, onChangeHandler, onSaveHandler, getTextDocumentAttributes, setCapability, registrationOptions, kind));
         }
 
diff --git a/src/Protocol/Document/Server/ITypeDefinitionHandler.cs b/src/Protocol/Document/Server/ITypeDefinitionHandler.cs
@@ -33,6 +33,7 @@ public static IDisposable OnTypeDefinition(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<TypeDefinitionCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IWillSaveTextDocumentHandler.cs b/src/Protocol/Document/Server/IWillSaveTextDocumentHandler.cs
@@ -34,6 +34,7 @@ public static IDisposable OnWillSaveTextDocument(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<SynchronizationCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/Document/Server/IWillSaveWaitUntilTextDocumentHandler.cs b/src/Protocol/Document/Server/IWillSaveWaitUntilTextDocumentHandler.cs
@@ -34,6 +34,7 @@ public static IDisposable OnWillSaveWaitUntilTextDocument(
             TextDocumentRegistrationOptions registrationOptions = null,
             Action<SynchronizationCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Protocol/IRegistration.cs b/src/Protocol/IRegistration.cs
@@ -1,6 +1,7 @@
 namespace OmniSharp.Extensions.LanguageServer.Protocol
 {
     public interface IRegistration<out TOptions>
+        where TOptions : class, new()
     {
         TOptions GetRegistrationOptions();
     }
diff --git a/src/Protocol/Workspace/Server/IExecuteCommandHandler.cs b/src/Protocol/Workspace/Server/IExecuteCommandHandler.cs
@@ -34,6 +34,7 @@ public static IDisposable OnExecuteCommand(
             ExecuteCommandRegistrationOptions registrationOptions = null,
             Action<ExecuteCommandCapability> setCapability = null)
         {
+            registrationOptions = registrationOptions ?? new ExecuteCommandRegistrationOptions();
             return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));
         }
 
diff --git a/src/Server/HandlerCollection.cs b/src/Server/HandlerCollection.cs
@@ -219,8 +219,9 @@ public bool ContainsHandler(TypeInfo typeInfo)
         }
 
         private static object GetRegistration<T>(IRegistration<T> registration)
+            where T : class, new()
         {
-            return registration.GetRegistrationOptions();
+            return registration.GetRegistrationOptions() ?? new T();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public static IDisposable OnCodeAction(`
`34`	`34`	`TextDocumentRegistrationOptions registrationOptions = null,`
`35`	`35`	`Action<CodeActionCapability> setCapability = null)`
`36`	`36`	`{`
	`37`	`+ registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();`
`37`	`38`	`return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));`
`38`	`39`	`}`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,13 @@ public static IDisposable OnCodeLens(`
`40`	`40`	`CodeLensRegistrationOptions registrationOptions = null,`
`41`	`41`	`Action<CodeLensCapability> setCapability = null)`
`42`	`42`	`{`
	`43`	`+ var codeLensRegistrationOptions = new CodeLensRegistrationOptions();`
	`44`	`+ codeLensRegistrationOptions.ResolveProvider = canResolve != null && resolveHandler != null;`
`43`	`45`	`if (registrationOptions != null)`
`44`	`46`	`{`
`45`		`- registrationOptions.ResolveProvider = canResolve != null && resolveHandler != null;`
	`47`	`+ codeLensRegistrationOptions.DocumentSelector = registrationOptions.DocumentSelector;`
`46`	`48`	`}`
`47`		`- return registry.AddHandlers(new DelegatingHandler(handler, resolveHandler, canResolve, setCapability, registrationOptions));`
	`49`	`+ return registry.AddHandlers(new DelegatingHandler(handler, resolveHandler, canResolve, setCapability, codeLensRegistrationOptions));`
`48`	`50`	`}`
`49`	`51`
`50`	`52`	`class DelegatingHandler : CodeLensHandler`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ public static IDisposable OnColorPresentation(`
`35`	`35`	`DocumentColorRegistrationOptions registrationOptions = null,`
`36`	`36`	`Action<ColorProviderCapability> setCapability = null)`
`37`	`37`	`{`
	`38`	`+ registrationOptions = registrationOptions ?? new DocumentColorRegistrationOptions();`
`38`	`39`	`return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));`
`39`	`40`	`}`
`40`	`41`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,8 @@ public static IDisposable OnCompletion(`
`40`	`40`	`CompletionRegistrationOptions registrationOptions = null,`
`41`	`41`	`Action<CompletionCapability> setCapability = null)`
`42`	`42`	`{`
`43`		`- if (registrationOptions != null)`
`44`		`- {`
`45`		`- registrationOptions.ResolveProvider = canResolve != null && resolveHandler != null;`
`46`		`- }`
	`43`	`+ registrationOptions = registrationOptions ?? new CompletionRegistrationOptions();`
	`44`	`+ registrationOptions.ResolveProvider = canResolve != null && resolveHandler != null;`
`47`	`45`	`return registry.AddHandlers(new DelegatingHandler(handler, resolveHandler, canResolve, setCapability, registrationOptions));`
`48`	`46`	`}`
`49`	`47`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public static IDisposable OnDeclaration(`
`33`	`33`	`TextDocumentRegistrationOptions registrationOptions = null,`
`34`	`34`	`Action<DeclarationCapability> setCapability = null)`
`35`	`35`	`{`
	`36`	`+ registrationOptions = registrationOptions ?? new TextDocumentRegistrationOptions();`
`36`	`37`	`return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));`
`37`	`38`	`}`
`38`	`39`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public static IDisposable OnDidChangeTextDocument(`
`37`	`37`	`TextDocumentChangeRegistrationOptions registrationOptions = null,`
`38`	`38`	`Action<SynchronizationCapability> setCapability = null)`
`39`	`39`	`{`
	`40`	`+ registrationOptions = registrationOptions ?? new TextDocumentChangeRegistrationOptions();`
`40`	`41`	`return registry.AddHandlers(new DelegatingHandler(handler, setCapability, registrationOptions));`
`41`	`42`	`}`
`42`	`43`