WIP: It builds!

Author: andyleejordan

src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeLensHandlers.cs

@@ -15,22 +15,21 @@
 using Microsoft.PowerShell.EditorServices.Services;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Utility;
-using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Document;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.PowerShell.EditorServices.Handlers
 {
+    // TODO: Use ABCs.
     internal class PsesCodeLensHandlers : ICodeLensHandler, ICodeLensResolveHandler
     {
-        private readonly Guid _id = new Guid();
         private readonly ILogger _logger;
         private readonly SymbolsService _symbolsService;
         private readonly WorkspaceService _workspaceService;
-
         private CodeLensCapability _capability;
-        public Guid Id => _id;
+        private readonly Guid _id = Guid.NewGuid();
+        Guid ICanBeIdentifiedHandler.Id => _id;
 
         public PsesCodeLensHandlers(ILoggerFactory factory, SymbolsService symbolsService, WorkspaceService workspaceService, ConfigurationService configurationService)
         {
@@ -39,13 +38,15 @@ public PsesCodeLensHandlers(ILoggerFactory factory, SymbolsService symbolsServic
             _symbolsService = symbolsService;
         }
 
-        CodeLensRegistrationOptions IRegistration<CodeLensRegistrationOptions>.GetRegistrationOptions()
+        public CodeLensRegistrationOptions GetRegistrationOptions(CodeLensCapability capability, ClientCapabilities clientCapabilities) => new CodeLensRegistrationOptions
         {
-            return new CodeLensRegistrationOptions
-            {
-                DocumentSelector = LspUtils.PowerShellDocumentSelector,
-                ResolveProvider = true
-            };
+            DocumentSelector = LspUtils.PowerShellDocumentSelector,
+            ResolveProvider = true
+        };
+
+        public void SetCapability(CodeLensCapability capability, ClientCapabilities clientCapabilities)
+        {
+            _capability = capability;
         }
 
         public Task<CodeLensContainer> Handle(CodeLensParams request, CancellationToken cancellationToken)
@@ -57,14 +58,6 @@ public Task<CodeLensContainer> Handle(CodeLensParams request, CancellationToken
             return Task.FromResult(new CodeLensContainer(codeLensResults));
         }
 
-        public TextDocumentRegistrationOptions GetRegistrationOptions()
-        {
-            return new TextDocumentRegistrationOptions
-            {
-                DocumentSelector = LspUtils.PowerShellDocumentSelector,
-            };
-        }
-
         public bool CanResolve(CodeLens value)
         {
             CodeLensData codeLensData = value.Data.ToObject<CodeLensData>();

src/PowerShellEditorServices/Services/TextDocument/Handlers/CompletionHandler.cs

@@ -21,25 +21,22 @@
 
 namespace Microsoft.PowerShell.EditorServices.Handlers
 {
+    // TODO: Use ABCs.
     internal class PsesCompletionHandler : ICompletionHandler, ICompletionResolveHandler
     {
         const int DefaultWaitTimeoutMilliseconds = 5000;
         private readonly SemaphoreSlim _completionLock = AsyncUtils.CreateSimpleLockingSemaphore();
         private readonly SemaphoreSlim _completionResolveLock = AsyncUtils.CreateSimpleLockingSemaphore();
-
         private readonly ILogger _logger;
         private readonly PowerShellContextService _powerShellContextService;
         private readonly WorkspaceService _workspaceService;
-
         private CompletionResults _mostRecentCompletions;
-
         private int _mostRecentRequestLine;
-
         private int _mostRecentRequestOffest;
-
         private string _mostRecentRequestFile;
-
         private CompletionCapability _capability;
+        private readonly Guid _id = Guid.NewGuid();
+        Guid ICanBeIdentifiedHandler.Id => _id;
 
         public PsesCompletionHandler(
             ILoggerFactory factory,
@@ -51,15 +48,12 @@ public PsesCompletionHandler(
             _workspaceService = workspaceService;
         }
 
-        public CompletionRegistrationOptions GetRegistrationOptions()
+        public CompletionRegistrationOptions GetRegistrationOptions(CompletionCapability capability, ClientCapabilities clientCapabilities) => new CompletionRegistrationOptions
         {
-            return new CompletionRegistrationOptions
-            {
-                DocumentSelector = LspUtils.PowerShellDocumentSelector,
-                ResolveProvider = true,
-                TriggerCharacters = new[] { ".", "-", ":", "\\" }
-            };
-        }
+            DocumentSelector = LspUtils.PowerShellDocumentSelector,
+            ResolveProvider = true,
+            TriggerCharacters = new[] { ".", "-", ":", "\\" }
+        };
 
         public async Task<CompletionList> Handle(CompletionParams request, CancellationToken cancellationToken)
         {
@@ -145,10 +139,10 @@ await CommandHelpers.GetCommandInfoAsync(
 
                 if (commandInfo != null)
                 {
-                    request.Documentation =
-                        await CommandHelpers.GetCommandSynopsisAsync(
-                            commandInfo,
-                            _powerShellContextService).ConfigureAwait(false);
+                    request = request with
+                    {
+                        Documentation = await CommandHelpers.GetCommandSynopsisAsync(commandInfo, _powerShellContextService).ConfigureAwait(false)
+                    };
                 }
 
                 // Send back the updated CompletionItem
@@ -160,7 +154,7 @@ await CommandHelpers.GetCommandSynopsisAsync(
             }
         }
 
-        public void SetCapability(CompletionCapability capability)
+        public void SetCapability(CompletionCapability capability, ClientCapabilities clientCapabilities)
         {
             _capability = capability;
         }

src/PowerShellEditorServices/Services/TextDocument/Handlers/FormattingHandlers.cs

@@ -17,6 +17,7 @@
 namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     // TODO: Add IDocumentOnTypeFormatHandler to support on-type formatting.
+    // TODO: Use ABCs.
     internal class PsesDocumentFormattingHandlers : IDocumentFormattingHandler, IDocumentRangeFormattingHandler
     {
         private readonly ILogger _logger;
@@ -39,21 +40,15 @@ public PsesDocumentFormattingHandlers(
             _workspaceService = workspaceService;
         }
 
-        public DocumentFormattingRegistrationOptions GetRegistrationOptions()
+        public DocumentFormattingRegistrationOptions GetRegistrationOptions(DocumentFormattingCapability capability, ClientCapabilities clientCapabilities) => new DocumentFormattingRegistrationOptions
         {
-            return new DocumentFormattingRegistrationOptions
-            {
-                DocumentSelector = LspUtils.PowerShellDocumentSelector
-            };
-        }
+            DocumentSelector = LspUtils.PowerShellDocumentSelector
+        };
 
-        DocumentRangeFormattingRegistrationOptions IRegistration<DocumentRangeFormattingRegistrationOptions>.GetRegistrationOptions()
+        public DocumentRangeFormattingRegistrationOptions GetRegistrationOptions(DocumentRangeFormattingCapability capability, ClientCapabilities clientCapabilities) => new DocumentRangeFormattingRegistrationOptions
         {
-            return new DocumentRangeFormattingRegistrationOptions
-            {
-                DocumentSelector = LspUtils.PowerShellDocumentSelector
-            };
-        }
+            DocumentSelector = LspUtils.PowerShellDocumentSelector
+        };
 
         public async Task<TextEditContainer> Handle(DocumentFormattingParams request, CancellationToken cancellationToken)
         {