Use CodeLensHandlerBase ABC instead of interfaces

Author: andyleejordan

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

@@ -26,15 +26,12 @@ public PsesCodeActionHandler(ILoggerFactory factory, AnalysisService analysisSer
             _analysisService = analysisService;
         }
 
-        protected override CodeActionRegistrationOptions CreateRegistrationOptions(CodeActionCapability capability, ClientCapabilities clientCapabilities)
+        protected override CodeActionRegistrationOptions CreateRegistrationOptions(CodeActionCapability capability, ClientCapabilities clientCapabilities) => new()
         {
-            return new()
-            {
-                // TODO: What do we do with the arguments?
-                DocumentSelector = LspUtils.PowerShellDocumentSelector,
-                CodeActionKinds = new CodeActionKind[] { CodeActionKind.QuickFix }
-            };
-        }
+            // TODO: What do we do with the arguments?
+            DocumentSelector = LspUtils.PowerShellDocumentSelector,
+            CodeActionKinds = new CodeActionKind[] { CodeActionKind.QuickFix }
+        };
 
         // TODO: Either fix or ignore "method lacks 'await'" warning.
         public override async Task<CodeAction> Handle(CodeAction request, CancellationToken cancellationToken)

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

@@ -19,70 +19,46 @@
 
 namespace Microsoft.PowerShell.EditorServices.Handlers
 {
-    // TODO: Use ABCs.
-    internal class PsesCodeLensHandlers : ICodeLensHandler, ICodeLensResolveHandler
+    internal class PsesCodeLensHandlers : CodeLensHandlerBase
     {
         private readonly ILogger _logger;
         private readonly SymbolsService _symbolsService;
         private readonly WorkspaceService _workspaceService;
-        private CodeLensCapability _capability;
-        private readonly Guid _id = Guid.NewGuid();
-        Guid ICanBeIdentifiedHandler.Id => _id;
 
-        public PsesCodeLensHandlers(ILoggerFactory factory, SymbolsService symbolsService, WorkspaceService workspaceService, ConfigurationService configurationService)
+        public PsesCodeLensHandlers(ILoggerFactory factory, SymbolsService symbolsService, WorkspaceService workspaceService)
         {
             _logger = factory.CreateLogger<PsesCodeLensHandlers>();
             _workspaceService = workspaceService;
             _symbolsService = symbolsService;
         }
 
-        public CodeLensRegistrationOptions GetRegistrationOptions(CodeLensCapability capability, ClientCapabilities clientCapabilities) => new CodeLensRegistrationOptions
+        protected override CodeLensRegistrationOptions CreateRegistrationOptions(CodeLensCapability capability, ClientCapabilities clientCapabilities) => new()
         {
             DocumentSelector = LspUtils.PowerShellDocumentSelector,
             ResolveProvider = true
         };
 
-        public void SetCapability(CodeLensCapability capability, ClientCapabilities clientCapabilities)
-        {
-            _capability = capability;
-        }
-
-        public Task<CodeLensContainer> Handle(CodeLensParams request, CancellationToken cancellationToken)
+        public override Task<CodeLensContainer> Handle(CodeLensParams request, CancellationToken cancellationToken)
         {
             ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);
-
             CodeLens[] codeLensResults = ProvideCodeLenses(scriptFile);
-
             return Task.FromResult(new CodeLensContainer(codeLensResults));
         }
 
-        public bool CanResolve(CodeLens value)
-        {
-            CodeLensData codeLensData = value.Data.ToObject<CodeLensData>();
-            return value?.Data != null && _symbolsService.GetCodeLensProviders().Any(provider => provider.ProviderId.Equals(codeLensData.ProviderId));
-        }
-
-        public Task<CodeLens> Handle(CodeLens request, CancellationToken cancellationToken)
+        public override Task<CodeLens> Handle(CodeLens request, CancellationToken cancellationToken)
         {
             // TODO: Catch deserializtion exception on bad object
             CodeLensData codeLensData = request.Data.ToObject<CodeLensData>();
 
             ICodeLensProvider originalProvider = _symbolsService
                 .GetCodeLensProviders()
-                .FirstOrDefault(provider => provider.ProviderId.Equals(codeLensData.ProviderId));
+                .FirstOrDefault(provider => provider.ProviderId.Equals(codeLensData.ProviderId, StringComparison.Ordinal));
 
-            ScriptFile scriptFile =
-                _workspaceService.GetFile(
-                    codeLensData.Uri);
+            ScriptFile scriptFile = _workspaceService.GetFile(codeLensData.Uri);
 
             return originalProvider.ResolveCodeLens(request, scriptFile);
         }
 
-        public void SetCapability(CodeLensCapability capability)
-        {
-            _capability = capability;
-        }
-
         /// <summary>
         /// Get all the CodeLenses for a given script file.
         /// </summary>
@@ -104,30 +80,23 @@ private CodeLens[] ProvideCodeLenses(ScriptFile scriptFile)
         /// An IEnumerable containing the results of all providers
         /// that were invoked successfully.
         /// </returns>
-        private IEnumerable<TResult> InvokeProviders<TResult>(
-            Func<ICodeLensProvider, TResult> invokeFunc)
+        private IEnumerable<TResult> InvokeProviders<TResult>(Func<ICodeLensProvider, TResult> invokeFunc)
         {
-            Stopwatch invokeTimer = new Stopwatch();
-            List<TResult> providerResults = new List<TResult>();
+            Stopwatch invokeTimer = new();
+            List<TResult> providerResults = new();
 
             foreach (ICodeLensProvider provider in _symbolsService.GetCodeLensProviders())
             {
                 try
                 {
                     invokeTimer.Restart();
-
                     providerResults.Add(invokeFunc(provider));
-
                     invokeTimer.Stop();
-
-                    this._logger.LogTrace(
-                        $"Invocation of provider '{provider.GetType().Name}' completed in {invokeTimer.ElapsedMilliseconds}ms.");
+                    _logger.LogTrace($"Invocation of provider '{provider.GetType().Name}' completed in {invokeTimer.ElapsedMilliseconds}ms.");
                 }
                 catch (Exception e)
                 {
-                    this._logger.LogException(
-                        $"Exception caught while invoking provider {provider.GetType().Name}:",
-                        e);
+                    _logger.LogException($"Exception caught while invoking provider {provider.GetType().Name}:", e);
                 }
             }